Cleanup packager code