Cleanup of build system