diff --git a/x-pack/plugins/apm/server/lib/settings/apm_indices/get_apm_indices.ts b/x-pack/plugins/apm/server/lib/settings/apm_indices/get_apm_indices.ts
index 342d49a85d81b..2e75aec69a3fb 100644
--- a/x-pack/plugins/apm/server/lib/settings/apm_indices/get_apm_indices.ts
+++ b/x-pack/plugins/apm/server/lib/settings/apm_indices/get_apm_indices.ts
@@ -87,7 +87,7 @@ export async function getApmIndexSettings({
   >;
 
   return apmIndices.map((configurationName) => ({
-    configurationName: configurationName,
+    configurationName,
     defaultValue: apmIndicesConfig[configurationName], // value defined in kibana[.dev].yml
     savedValue: apmIndicesSavedObject[configurationName], // value saved via Saved Objects service
   }));
diff --git a/x-pack/plugins/apm/server/plugin.ts b/x-pack/plugins/apm/server/plugin.ts
index cec4f1138ece4..d2d8dbf602364 100644
--- a/x-pack/plugins/apm/server/plugin.ts
+++ b/x-pack/plugins/apm/server/plugin.ts
@@ -18,8 +18,7 @@ import { isEmpty, mapValues } from 'lodash';
 import { SavedObjectsClient } from '../../../../src/core/server';
 import { mappingFromFieldMap } from '../../rule_registry/common/mapping_from_field_map';
 import { Dataset } from '../../rule_registry/server';
-import { /*APMConfig,*/ APMConfig, APM_SERVER_FEATURE_ID } from '.';
-// import { getFullPathConfigs } from './index';
+import { APMConfig, APM_SERVER_FEATURE_ID } from '.';
 import { UI_SETTINGS } from '../../../../src/plugins/data/common';
 import { APM_FEATURE, registerFeaturesUsage } from './feature';
 import { registerApmAlerts } from './lib/alerts/register_apm_alerts';
@@ -73,18 +72,11 @@ export class APMPlugin
   ) {
     this.logger = this.initContext.logger.get();
     const config$ = this.initContext.config.create<APMConfig>();
-    // const mergedConfig$ = config$.pipe(
-    //   map((apmConfig) => getFullPathConfigs(apmConfig))
-    // );
 
     core.savedObjects.registerType(apmIndices);
     core.savedObjects.registerType(apmTelemetry);
     core.savedObjects.registerType(apmServerSettings);
 
-    // const currentConfig = getFullPathConfigs(
-    //   this.initContext.config.get<APMConfig>()
-    // );
-    // this.currentConfig = currentConfig;
     const currentConfig = this.initContext.config.get<APMConfig>();
     this.currentConfig = currentConfig;
 
@@ -92,11 +84,9 @@ export class APMPlugin
       plugins.taskManager &&
       plugins.usageCollection &&
       currentConfig.telemetryCollectionEnabled
-      // currentConfig['xpack.apm.telemetryCollectionEnabled']
     ) {
       createApmTelemetry({
         core,
-        // config$: mergedConfig$,
         config$,
         usageCollector: plugins.usageCollection,
         taskManager: plugins.taskManager,