diff --git a/plugins/cad/src/components/ResourceEditorDialog/components/FirstClassEditors/CapacityEditor/CapacityEditor.tsx b/plugins/cad/src/components/ResourceEditorDialog/components/FirstClassEditors/CapacityEditor/CapacityEditor.tsx
deleted file mode 100644
index 468fe667..00000000
--- a/plugins/cad/src/components/ResourceEditorDialog/components/FirstClassEditors/CapacityEditor/CapacityEditor.tsx
+++ /dev/null
@@ -1,143 +0,0 @@
-/**
- * Copyright 2024 The Nephio Authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { TextField } from '@material-ui/core';
-import React, { useState } from 'react';
-import { useSetStateAndCall } from '../../../../../hooks/useSetStateAndCall';
-import { getNumber } from '../../../../../utils/string';
-import {
-  Capacity,
-  CapacityMetadata,
-  CapacitySpec,
-} from '../../../../../types/Capacity';
-import { dumpYaml, loadYaml } from '../../../../../utils/yaml';
-import { EditorAccordion, ResourceMetadataAccordion } from '../Controls';
-import { useEditorStyles } from '../styles';
-
-type OnUpdatedYamlFn = (yaml: string) => void;
-
-type ResourceEditorProps = {
-  yaml: string;
-  onUpdatedYaml: OnUpdatedYamlFn;
-};
-
-type State = {
-  metadata: CapacityMetadata;
-  spec: CapacitySpec;
-};
-
-export const CapacityEditor = ({
-  yaml,
-  onUpdatedYaml,
-}: ResourceEditorProps) => {
-  const classes = useEditorStyles();
-  const resourceYaml = loadYaml(yaml) as Capacity;
-
-  const createResourceState = (): State => ({
-    metadata: resourceYaml.metadata,
-    spec: resourceYaml.spec,
-  });
-
-  const [state, setState] = useState<State>(createResourceState());
-  const [expanded, setExpanded] = useState<string>();
-
-  const setStateAndCall = useSetStateAndCall([state, setState], newState => {
-    onUpdatedYaml(dumpYaml({ ...resourceYaml, ...newState }));
-  });
-
-  return (
-    <div className={classes.root}>
-      <ResourceMetadataAccordion
-        id="metadata"
-        state={[expanded, setExpanded]}
-        value={state.metadata}
-        onUpdate={metadata => setStateAndCall(s => ({ ...s, metadata }))}
-      />
-
-      <EditorAccordion
-        id="spec"
-        title="Capacity"
-        state={[expanded, setExpanded]}
-      >
-        {/* TODO Consider adding regex-based validation of both throughput values. */}
-        <TextField
-          label="Max Uplink Throughput"
-          variant="outlined"
-          value={state.spec.maxUplinkThroughput ?? ''}
-          onChange={e => {
-            setStateAndCall(s => ({
-              ...s,
-              spec: { ...s.spec, maxUplinkThroughput: e.target.value },
-            }));
-          }}
-          fullWidth
-        />
-
-        <TextField
-          label="Max Downlink Throughput"
-          variant="outlined"
-          value={state.spec.maxDownlinkThroughput ?? ''}
-          onChange={e => {
-            setStateAndCall(s => ({
-              ...s,
-              spec: { ...s.spec, maxDownlinkThroughput: e.target.value },
-            }));
-          }}
-          fullWidth
-        />
-
-        <TextField
-          label="Max NF Connections"
-          variant="outlined"
-          value={state.spec.maxNFConnections ?? ''}
-          onChange={e => {
-            setStateAndCall(s => ({
-              ...s,
-              spec: { ...s.spec, maxNFConnections: getNumber(e.target.value) },
-            }));
-          }}
-          fullWidth
-        />
-
-        <TextField
-          label="Max Sessions"
-          variant="outlined"
-          value={state.spec.maxSessions ?? ''}
-          onChange={e => {
-            setStateAndCall(s => ({
-              ...s,
-              spec: { ...s.spec, maxSessions: getNumber(e.target.value) },
-            }));
-          }}
-          fullWidth
-        />
-
-        <TextField
-          label="Max Subscribers"
-          variant="outlined"
-          value={state.spec.maxSubscribers ?? ''}
-          onChange={e => {
-            setStateAndCall(s => ({
-              ...s,
-              spec: { ...s.spec, maxSubscribers: getNumber(e.target.value) },
-            }));
-          }}
-          fullWidth
-        />
-      </EditorAccordion>
-    </div>
-  );
-};
diff --git a/plugins/cad/src/components/ResourceEditorDialog/components/FirstClassEditors/CapacityEditor/index.ts b/plugins/cad/src/components/ResourceEditorDialog/components/FirstClassEditors/CapacityEditor/index.ts
deleted file mode 100644
index 6be676e5..00000000
--- a/plugins/cad/src/components/ResourceEditorDialog/components/FirstClassEditors/CapacityEditor/index.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright 2024 The Nephio Authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-export { CapacityEditor } from './CapacityEditor';
diff --git a/plugins/cad/src/components/ResourceEditorDialog/components/FirstClassEditors/NephioTokenEditor/NephioTokenEditor.tsx b/plugins/cad/src/components/ResourceEditorDialog/components/FirstClassEditors/NephioTokenEditor/NephioTokenEditor.tsx
deleted file mode 100644
index 92a5b4a4..00000000
--- a/plugins/cad/src/components/ResourceEditorDialog/components/FirstClassEditors/NephioTokenEditor/NephioTokenEditor.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * Copyright 2024 The Nephio Authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { SelectItem } from '@backstage/core-components';
-import React, { useState } from 'react';
-import { Select } from '../../../../Controls';
-import { useSetStateAndCall } from '../../../../../hooks/useSetStateAndCall';
-import { dumpYaml, loadYaml } from '../../../../../utils/yaml';
-import {
-  NephioToken,
-  NephioTokenMetadata,
-  NephioTokenSpec,
-} from '../../../../../types/Token';
-import { EditorAccordion, ResourceMetadataAccordion } from '../Controls';
-import { useEditorStyles } from '../styles';
-
-const DELETION_POLICY_DEFAULT = 'default';
-const DELETION_POLICY_SELECT_ITEMS: SelectItem[] = [
-  { value: DELETION_POLICY_DEFAULT, label: 'Default' },
-  { value: 'delete', label: 'Delete' },
-  { value: 'orphan', label: 'Orphan' },
-];
-
-type OnUpdatedYamlFn = (yaml: string) => void;
-
-type ResourceEditorProps = {
-  yaml: string;
-  onUpdatedYaml: OnUpdatedYamlFn;
-};
-
-type State = {
-  metadata: NephioTokenMetadata;
-  spec: NephioTokenSpec;
-};
-
-const getNephioTokenDescription = (spec: NephioTokenSpec) =>
-  `Deletion policy: ${
-    spec.lifecycle?.deletionPolicy ?? DELETION_POLICY_DEFAULT
-  }`;
-
-export const NephioTokenEditor = ({
-  yaml,
-  onUpdatedYaml,
-}: ResourceEditorProps) => {
-  const classes = useEditorStyles();
-  const resourceYaml = loadYaml(yaml) as NephioToken;
-
-  const createResourceState = (): State => ({
-    metadata: resourceYaml.metadata,
-    spec: resourceYaml.spec,
-  });
-
-  const [state, setState] = useState<State>(createResourceState());
-  const [expanded, setExpanded] = useState<string>();
-
-  const setStateAndCall = useSetStateAndCall([state, setState], newState => {
-    onUpdatedYaml(dumpYaml({ ...resourceYaml, ...newState }));
-  });
-
-  return (
-    <div className={classes.root}>
-      <ResourceMetadataAccordion
-        id="metadata"
-        state={[expanded, setExpanded]}
-        value={state.metadata}
-        onUpdate={metadata => setStateAndCall(s => ({ ...s, metadata }))}
-      />
-
-      <EditorAccordion
-        id="lifecycle"
-        title="Lifecycle"
-        state={[expanded, setExpanded]}
-        description={getNephioTokenDescription(state.spec)}
-      >
-        <Select
-          label="Deletion policy"
-          items={DELETION_POLICY_SELECT_ITEMS}
-          selected={
-            state.spec.lifecycle?.deletionPolicy ?? DELETION_POLICY_DEFAULT
-          }
-          onChange={value => {
-            setStateAndCall(s => ({
-              ...s,
-              spec:
-                value !== DELETION_POLICY_DEFAULT
-                  ? { lifecycle: { deletionPolicy: value } }
-                  : {},
-            }));
-          }}
-        />
-      </EditorAccordion>
-    </div>
-  );
-};
diff --git a/plugins/cad/src/components/ResourceEditorDialog/components/FirstClassEditors/NephioTokenEditor/index.ts b/plugins/cad/src/components/ResourceEditorDialog/components/FirstClassEditors/NephioTokenEditor/index.ts
deleted file mode 100644
index d00009fb..00000000
--- a/plugins/cad/src/components/ResourceEditorDialog/components/FirstClassEditors/NephioTokenEditor/index.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright 2024 The Nephio Authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-export { NephioTokenEditor } from './NephioTokenEditor';
diff --git a/plugins/cad/src/components/ResourceEditorDialog/components/FirstClassEditors/WorkloadClusterEditor/WorkloadClusterEditor.tsx b/plugins/cad/src/components/ResourceEditorDialog/components/FirstClassEditors/WorkloadClusterEditor/WorkloadClusterEditor.tsx
deleted file mode 100644
index 2ebe35e9..00000000
--- a/plugins/cad/src/components/ResourceEditorDialog/components/FirstClassEditors/WorkloadClusterEditor/WorkloadClusterEditor.tsx
+++ /dev/null
@@ -1,135 +0,0 @@
-/**
- * Copyright 2024 The Nephio Authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { TextField } from '@material-ui/core';
-import { useSetStateAndCall } from '../../../../../hooks/useSetStateAndCall';
-import { dumpYaml, loadYaml } from '../../../../../utils/yaml';
-import {
-  WorkloadCluster,
-  WorkloadClusterMetadata,
-  WorkloadClusterSpec,
-} from '../../../../../types/WorkloadCluster';
-import React, { Fragment, useState } from 'react';
-import {
-  EditorAccordion,
-  ResourceMetadataAccordion,
-  ValueListEditorAccordion,
-} from '../Controls';
-import { useEditorStyles } from '../styles';
-
-type OnUpdatedYamlFn = (yaml: string) => void;
-
-type ResourceEditorProps = {
-  yaml: string;
-  onUpdatedYaml: OnUpdatedYamlFn;
-};
-
-type State = {
-  metadata: WorkloadClusterMetadata;
-  spec: WorkloadClusterSpec;
-};
-
-const getWorkloadClusterConfigurationDescription = (
-  spec: WorkloadClusterSpec,
-) =>
-  [
-    `Name: ${spec.clusterName}`,
-    spec.masterInterface ? `master interface: ${spec.masterInterface}` : null,
-  ]
-    .filter(Boolean)
-    .join(', ');
-
-export const WorkloadClusterEditor = ({
-  yaml,
-  onUpdatedYaml,
-}: ResourceEditorProps) => {
-  const classes = useEditorStyles();
-  const resourceYaml = loadYaml(yaml) as WorkloadCluster;
-
-  const createResourceState = (): State => ({
-    metadata: resourceYaml.metadata,
-    spec: resourceYaml.spec,
-  });
-
-  const [state, setState] = useState<State>(createResourceState());
-  const [expanded, setExpanded] = useState<string>();
-
-  const setStateAndCall = useSetStateAndCall([state, setState], newState => {
-    onUpdatedYaml(dumpYaml({ ...resourceYaml, ...newState }));
-  });
-
-  return (
-    <div className={classes.root}>
-      <ResourceMetadataAccordion
-        id="metadata"
-        state={[expanded, setExpanded]}
-        value={state.metadata}
-        onUpdate={metadata => setStateAndCall(s => ({ ...s, metadata }))}
-      />
-
-      <EditorAccordion
-        id="configuration"
-        title="Configuration"
-        state={[expanded, setExpanded]}
-        description={getWorkloadClusterConfigurationDescription(state.spec)}
-      >
-        <Fragment>
-          <TextField
-            label="Cluster name"
-            variant="outlined"
-            value={state.spec.clusterName}
-            onChange={e => {
-              setStateAndCall(s => ({
-                ...s,
-                spec: { ...s.spec, clusterName: e.target.value },
-              }));
-            }}
-            fullWidth
-          />
-
-          <TextField
-            label="Master interface"
-            variant="outlined"
-            value={state.spec.masterInterface}
-            onChange={e => {
-              setStateAndCall(s => ({
-                ...s,
-                spec: {
-                  ...s.spec,
-                  masterInterface: e.target.value || undefined,
-                },
-              }));
-            }}
-            fullWidth
-          />
-        </Fragment>
-      </EditorAccordion>
-
-      <ValueListEditorAccordion
-        id="cnis"
-        title="CNIs"
-        state={[expanded, setExpanded]}
-        valueList={state.spec.cnis ?? []}
-        onUpdatedValueList={cnis => {
-          setStateAndCall(s => ({
-            ...s,
-            spec: { ...s.spec, cnis: cnis.length > 0 ? cnis : undefined },
-          }));
-        }}
-      />
-    </div>
-  );
-};
diff --git a/plugins/cad/src/components/ResourceEditorDialog/components/FirstClassEditors/WorkloadClusterEditor/index.ts b/plugins/cad/src/components/ResourceEditorDialog/components/FirstClassEditors/WorkloadClusterEditor/index.ts
deleted file mode 100644
index 6b341dc7..00000000
--- a/plugins/cad/src/components/ResourceEditorDialog/components/FirstClassEditors/WorkloadClusterEditor/index.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright 2024 The Nephio Authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-export { WorkloadClusterEditor } from './WorkloadClusterEditor';
diff --git a/plugins/cad/src/components/ResourceEditorDialog/components/ParametricFirstClassEditors/NephioTokenParametricEditor.tsx b/plugins/cad/src/components/ResourceEditorDialog/components/ParametricFirstClassEditors/NephioTokenParametricEditor.tsx
index 3b6d7055..1fea68fd 100644
--- a/plugins/cad/src/components/ResourceEditorDialog/components/ParametricFirstClassEditors/NephioTokenParametricEditor.tsx
+++ b/plugins/cad/src/components/ResourceEditorDialog/components/ParametricFirstClassEditors/NephioTokenParametricEditor.tsx
@@ -21,6 +21,12 @@ import { metadataEditorSection } from './partial/metadataEditorSection';
 
 const { section, selectValue } = PxeConfigurationFactory;
 
+const DELETION_POLICY_OPTIONS = [
+  { value: undefined, label: 'Default' },
+  { value: 'delete', label: 'Delete' },
+  { value: 'orphan', label: 'Orphan' },
+];
+
 export const NephioTokenParametricEditor = createEditorFromConfiguration({
   topLevelProperties: ['metadata', 'spec'],
   entries: [
@@ -31,11 +37,7 @@ export const NephioTokenParametricEditor = createEditorFromConfiguration({
         path: 'spec.lifecycle.deletionPolicy',
         type: PxeValueType.String,
         isRequired: false,
-        options: [
-          { value: undefined, label: 'Default' },
-          { value: 'delete', label: 'Delete' },
-          { value: 'orphan', label: 'Orphan' },
-        ],
+        options: DELETION_POLICY_OPTIONS,
       }),
     ),
   ],