Migrated all remaining configs & some clean-up.