Package consolidation and cleanup