clean up and consolidation