Additional config cleanup and consolidation to repos