[build] moar cleanups