more consolidation and cleanup