cleaned up build system