Package cleaning - Phase 2