Packaging Script Cleanup