build system cleanup