build: reducing overbuilds