Cleaned up the build system.