make_package: Cleanup