Packaging cleanup for make