consolidation / cleanup