Cleaned up build system