Further cleanup of the build system