file cleanup and consolidation