Further cleaning of the build system