More language cleanup & consolidation