Cleanup

Build improvements.