Cleaned up the build code.