build: some clean ups