build system cleanup and adjustments