build system cleanup for packaging