Build system fixes
Remove some unused cruft