build system clean up