diff --git a/.changeset/catalog-graph-nfs-page.md b/.changeset/catalog-graph-nfs-page.md
index ff43ffaf25..3b7a999b54 100644
--- a/.changeset/catalog-graph-nfs-page.md
+++ b/.changeset/catalog-graph-nfs-page.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-catalog-graph': patch
 ---
 
-The new frontend plugin entry now exposes a display title and icon for navigation, and the catalog graph page uses the Backstage UI header when rendered in the new frontend system. A new `NfsCatalogGraphPage` export is available for the same layout without the legacy `Page` shell.
+The new frontend plugin entry now exposes a display title and icon for navigation, and the catalog graph page uses the Backstage UI header when rendered in the new frontend system.
diff --git a/plugins/catalog-graph/report-alpha.api.md b/plugins/catalog-graph/report-alpha.api.md
index 8bfbe17e9b..e40a82698a 100644
--- a/plugins/catalog-graph/report-alpha.api.md
+++ b/plugins/catalog-graph/report-alpha.api.md
@@ -167,8 +167,8 @@ const _default: OverridableFrontendPlugin<
         direction?: 'TB' | 'BT' | 'LR' | 'RL' | undefined;
         zoom?: 'disabled' | 'enabled' | 'enable-on-click' | undefined;
         relations?: string[] | undefined;
-        maxDepth?: number | undefined;
         rootEntityRefs?: string[] | undefined;
+        maxDepth?: number | undefined;
         kinds?: string[] | undefined;
         mergeRelations?: boolean | undefined;
         relationPairs?: [string, string][] | undefined;
diff --git a/plugins/catalog-graph/src/alpha.tsx b/plugins/catalog-graph/src/alpha.tsx
index e1e60f77a0..a71189c7ab 100644
--- a/plugins/catalog-graph/src/alpha.tsx
+++ b/plugins/catalog-graph/src/alpha.tsx
@@ -80,7 +80,7 @@ const CatalogGraphPage = PageBlueprint.makeWithOverrides({
       path: '/catalog-graph',
       routeRef: catalogGraphRouteRef,
       loader: () =>
-        import('./components/CatalogGraphPage').then(m => (
+        import('./components/CatalogGraphPage/CatalogGraphPage').then(m => (
           <m.NfsCatalogGraphPage {...config} />
         )),
     });
diff --git a/plugins/catalog-graph/src/components/CatalogGraphPage/index.ts b/plugins/catalog-graph/src/components/CatalogGraphPage/index.ts
index cdf8bc9430..496e79aab4 100644
--- a/plugins/catalog-graph/src/components/CatalogGraphPage/index.ts
+++ b/plugins/catalog-graph/src/components/CatalogGraphPage/index.ts
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { CatalogGraphPage, NfsCatalogGraphPage } from './CatalogGraphPage';
+export { CatalogGraphPage } from './CatalogGraphPage';
 export type { CatalogGraphPageClassKey } from './CatalogGraphPage';
 export type { MaxDepthFilterClassKey } from './MaxDepthFilter';
 export type { SelectedKindsFilterClassKey } from './SelectedKindsFilter';
diff --git a/plugins/catalog-import/report-alpha.api.md b/plugins/catalog-import/report-alpha.api.md
index b4847f06f1..d00d4634a2 100644
--- a/plugins/catalog-import/report-alpha.api.md
+++ b/plugins/catalog-import/report-alpha.api.md
@@ -11,8 +11,7 @@ import { ExtensionBlueprintParams } from '@backstage/frontend-plugin-api';
 import { ExtensionDataRef } from '@backstage/frontend-plugin-api';
 import { ExtensionInput } from '@backstage/frontend-plugin-api';
 import { IconElement } from '@backstage/frontend-plugin-api';
-import { JSX as JSX_2 } from 'react/jsx-runtime';
-import { JSX as JSX_3 } from 'react';
+import { JSX as JSX_2 } from 'react';
 import { OverridableExtensionDefinition } from '@backstage/frontend-plugin-api';
 import { OverridableFrontendPlugin } from '@backstage/frontend-plugin-api';
 import { RouteRef } from '@backstage/core-plugin-api';
@@ -134,7 +133,7 @@ const _default: OverridableFrontendPlugin<
               optional: true;
             }
           >
-        | ExtensionDataRef<JSX_3.Element, 'core.reactElement', {}>
+        | ExtensionDataRef<JSX_2.Element, 'core.reactElement', {}>
         | ExtensionDataRef<
             string,
             'core.title',
@@ -151,7 +150,7 @@ const _default: OverridableFrontendPlugin<
           >;
       inputs: {
         pages: ExtensionInput<
-          | ConfigurableExtensionDataRef<JSX_3.Element, 'core.reactElement', {}>
+          | ConfigurableExtensionDataRef<JSX_2.Element, 'core.reactElement', {}>
           | ConfigurableExtensionDataRef<string, 'core.routing.path', {}>
           | ConfigurableExtensionDataRef<
               RouteRef_2<AnyRouteRefParams>,
@@ -185,7 +184,7 @@ const _default: OverridableFrontendPlugin<
         path: string;
         title?: string;
         icon?: IconElement;
-        loader?: () => Promise<JSX_3.Element>;
+        loader?: () => Promise<JSX_2.Element>;
         routeRef?: RouteRef_2;
         noHeader?: boolean;
       };
@@ -194,8 +193,5 @@ const _default: OverridableFrontendPlugin<
 >;
 export default _default;
 
-// @alpha (undocumented)
-export const DefaultImportPage: () => JSX_2.Element;
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-import/src/alpha.tsx b/plugins/catalog-import/src/alpha.tsx
index 52b7f9cfe1..315bbc36e6 100644
--- a/plugins/catalog-import/src/alpha.tsx
+++ b/plugins/catalog-import/src/alpha.tsx
@@ -44,8 +44,6 @@ import { catalogImportTranslationRef as _catalogImportTranslationRef } from './t
  */
 export const catalogImportTranslationRef = _catalogImportTranslationRef;
 
-export { NfsDefaultImportPage as DefaultImportPage } from './components/DefaultImportPage/DefaultImportPage';
-
 // TODO: It's currently possible to override the import page with a custom one. We need to decide
 //       whether this type of override is typically done with an input or by overriding the entire extension.
 const catalogImportPage = PageBlueprint.make({
diff --git a/plugins/catalog-import/src/components/DefaultImportPage/DefaultImportPage.tsx b/plugins/catalog-import/src/components/DefaultImportPage/DefaultImportPage.tsx
index 5861a141e3..9989bbd9b6 100644
--- a/plugins/catalog-import/src/components/DefaultImportPage/DefaultImportPage.tsx
+++ b/plugins/catalog-import/src/components/DefaultImportPage/DefaultImportPage.tsx
@@ -81,9 +81,6 @@ export const DefaultImportPage = () => {
   );
 };
 
-/**
- * @alpha
- */
 export const NfsDefaultImportPage = () => {
   const { t } = useTranslationRef(catalogImportTranslationRef);
   const configApi = useApi(configApiRef);