Fix package-cleanup