#3067 (Support api config source without cluster names) introduced a deprecation notice for v1.7.0. This issue tracks source code cleanup.