diff --git a/x-pack/legacy/plugins/upgrade_assistant/index.ts b/x-pack/legacy/plugins/upgrade_assistant/index.ts
index ce59f24a4db2f..4012cdb5a1dd4 100644
--- a/x-pack/legacy/plugins/upgrade_assistant/index.ts
+++ b/x-pack/legacy/plugins/upgrade_assistant/index.ts
@@ -44,11 +44,16 @@ export function upgradeAssistant(kibana: any) {
       const instance = plugin({} as any);
       instance.setup({} as any, {
         __LEGACY: {
-          route: server.route.bind(server),
+          // Legacy objects
+          events: server.events,
+          usage: server.usage,
           savedObjects: server.savedObjects,
+
+          // Legacy functions
           log: server.log.bind(server),
-          events: server.events.bind(server),
+          route: server.route.bind(server),
 
+          // Legacy plugins
           plugins: {
             elasticsearch: server.plugins.elasticsearch,
             xpack_main: server.plugins.xpack_main,
diff --git a/x-pack/legacy/plugins/upgrade_assistant/public/np_ready/application/components/tabs/overview/steps.tsx b/x-pack/legacy/plugins/upgrade_assistant/public/np_ready/application/components/tabs/overview/steps.tsx
index 42ad05ae661d9..510b37f2554a6 100644
--- a/x-pack/legacy/plugins/upgrade_assistant/public/np_ready/application/components/tabs/overview/steps.tsx
+++ b/x-pack/legacy/plugins/upgrade_assistant/public/np_ready/application/components/tabs/overview/steps.tsx
@@ -95,8 +95,6 @@ const START_UPGRADE_STEP = (isCloudEnabled: boolean) => ({
 export const StepsUI: StatelessComponent<
   UpgradeAssistantTabProps & ReactIntl.InjectedIntlProps
 > = ({ checkupData, setSelectedTabIndex, intl }) => {
-  // Uncomment when START_UPGRADE_STEP is in use!
-  // const { isCloudEnabled } = useAppContext();
   const checkupDataTyped = (checkupData! as unknown) as { [checkupType: string]: any[] };
   const countByType = Object.keys(checkupDataTyped).reduce(
     (counts, checkupType) => {
@@ -106,7 +104,8 @@ export const StepsUI: StatelessComponent<
     {} as { [checkupType: string]: number }
   );
 
-  const { http, XSRF } = useAppContext();
+  // Uncomment when START_UPGRADE_STEP is in use!
+  const { http, XSRF /* , isCloudEnabled */ } = useAppContext();
 
   return (
     <EuiSteps
@@ -272,6 +271,7 @@ export const StepsUI: StatelessComponent<
 
         // Swap in START_UPGRADE_STEP on the last minor release.
         WAIT_FOR_RELEASE_STEP,
+        // START_UPGRADE_STEP(isCloudEnabled),
       ]}
     />
   );
diff --git a/x-pack/legacy/plugins/upgrade_assistant/server/np_ready/plugin.ts b/x-pack/legacy/plugins/upgrade_assistant/server/np_ready/plugin.ts
index 4409670362703..efd5ea23301a9 100644
--- a/x-pack/legacy/plugins/upgrade_assistant/server/np_ready/plugin.ts
+++ b/x-pack/legacy/plugins/upgrade_assistant/server/np_ready/plugin.ts
@@ -5,7 +5,6 @@
  */
 import { Plugin, CoreSetup, CoreStart } from 'src/core/server';
 import { ServerShim } from './types';
-import { UpgradeAssistantTelemetryServer } from '../../common/types';
 import { credentialStoreFactory } from './lib/reindexing/credential_store';
 import { makeUpgradeAssistantUsageCollector } from './lib/telemetry';
 import { registerClusterCheckupRoutes } from './routes/cluster_checkup';