Package cleaning - phase 1.1