Some build cleanups.

Cleans up a few things, and removes some redundant config.