Removed more build system cruft