diff --git a/app/templates/AdHocAttributes/fields-nav.inc b/app/templates/AdHocAttributes/fields-nav.inc
deleted file mode 100644
index 9b42482f4..000000000
--- a/app/templates/AdHocAttributes/fields-nav.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * COmanage Registry Ad Hoc Attributes Edit Navigation
- *
- * Portions licensed to the University Corporation for Advanced Internet
- * Development, Inc. ("UCAID") under one or more contributor license agreements.
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * UCAID licenses this file to you 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.
- *
- * @link          https://www.internet2.edu/comanage COmanage Project
- * @package       registry
- * @since         COmanage Registry v5.0.0
- * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- */
-
-// XXX: if CFM-218 (Make fields.inc configuration only) is accepted, move the contents of this file into fields.inc
-$topLinks = [];
-
-$subnav = [
-  'name' => 'person',
-  'active' => 'person',
-  'subActive' => 'ad_hoc_attributes'
-];
\ No newline at end of file
diff --git a/app/templates/Addresses/fields-nav.inc b/app/templates/Addresses/fields-nav.inc
deleted file mode 100644
index 86686fdf9..000000000
--- a/app/templates/Addresses/fields-nav.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * COmanage Registry Addresses Edit Navigation
- *
- * Portions licensed to the University Corporation for Advanced Internet
- * Development, Inc. ("UCAID") under one or more contributor license agreements.
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * UCAID licenses this file to you 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.
- *
- * @link          https://www.internet2.edu/comanage COmanage Project
- * @package       registry
- * @since         COmanage Registry v5.0.0
- * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- */
-
-// XXX: if CFM-218 (Make fields.inc configuration only) is accepted, move the contents of this file into fields.inc
-$topLinks = [];
-
-$subnav = [
-  'name' => 'person',
-  'active' => 'person',
-  'subActive' => 'addresses'
-];
\ No newline at end of file
diff --git a/app/templates/EmailAddresses/fields-nav.inc b/app/templates/EmailAddresses/fields-nav.inc
index e0fb603e1..5f5666aef 100644
--- a/app/templates/EmailAddresses/fields-nav.inc
+++ b/app/templates/EmailAddresses/fields-nav.inc
@@ -26,26 +26,15 @@
  */
 
 // XXX: if CFM-218 (Make fields.inc configuration only) is accepted, move the contents of this file into fields.inc
-$topLinks = [];
-
-$subnav = [
-  'name' => 'person',
-  'active' => 'person', // default for person. 'external identities' are special cased
-  'subActive' => 'email_addresses'
-];
-  
-if($vv_action != 'add') {
-  $topLinks = [
-    [
-      'icon' => 'verified_user',
-      'order' => 'Default',
-      'label' => __d('operation', 'EmailAddresses.verify.force'),
-      'if' => 'notVerified',
-      'link' => [
-        'action' => 'forceVerify',
-        $vv_obj->id
-      ],
-      'class' => ''
+$topLinks = [
+  [
+    'icon' => 'verified_user',
+    'order' => 'Default',
+    'label' => __d('operation', 'EmailAddresses.verify.force'),
+    'if' => 'notVerified',
+    'link' => [
+      'action' => 'forceVerify',
+      $vv_obj->id
     ],
   ];
-}
\ No newline at end of file
+];
\ No newline at end of file
diff --git a/app/templates/Identifiers/fields-nav.inc b/app/templates/Identifiers/fields-nav.inc
deleted file mode 100644
index 17db0dc99..000000000
--- a/app/templates/Identifiers/fields-nav.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * COmanage Registry Names Edit Navigation
- *
- * Portions licensed to the University Corporation for Advanced Internet
- * Development, Inc. ("UCAID") under one or more contributor license agreements.
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * UCAID licenses this file to you 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.
- *
- * @link          https://www.internet2.edu/comanage COmanage Project
- * @package       registry
- * @since         COmanage Registry v5.0.0
- * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- */
-
-// XXX: if CFM-218 (Make fields.inc configuration only) is accepted, move the contents of this file into fields.inc
-$topLinks = [];
-
-$subnav = [
-  'name' => 'person',
-  'active' => 'person',
-  'subActive' => 'identifiers'
-];
\ No newline at end of file
diff --git a/app/templates/Names/fields-nav.inc b/app/templates/Names/fields-nav.inc
deleted file mode 100644
index 955afd929..000000000
--- a/app/templates/Names/fields-nav.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * COmanage Registry Names Edit Navigation
- *
- * Portions licensed to the University Corporation for Advanced Internet
- * Development, Inc. ("UCAID") under one or more contributor license agreements.
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * UCAID licenses this file to you 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.
- *
- * @link          https://www.internet2.edu/comanage COmanage Project
- * @package       registry
- * @since         COmanage Registry v5.0.0
- * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- */
-
-// XXX: if CFM-218 (Make fields.inc configuration only) is accepted, move the contents of this file into fields.inc
-$topLinks = [];
-
-$subnav = [
-  'name' => 'person',
-  'active' => 'person',
-  'subActive' => 'names'
-];
\ No newline at end of file
diff --git a/app/templates/Pronouns/fields-nav.inc b/app/templates/Pronouns/fields-nav.inc
deleted file mode 100644
index 2ea808589..000000000
--- a/app/templates/Pronouns/fields-nav.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * COmanage Registry Pronouns Edit Navigation
- *
- * Portions licensed to the University Corporation for Advanced Internet
- * Development, Inc. ("UCAID") under one or more contributor license agreements.
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * UCAID licenses this file to you 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.
- *
- * @link          https://www.internet2.edu/comanage COmanage Project
- * @package       registry
- * @since         COmanage Registry v5.0.0
- * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- */
-
-// XXX: if CFM-218 (Make fields.inc configuration only) is accepted, move the contents of this file into fields.inc
-$topLinks = [];
-
-$subnav = [
-  'name' => 'person',
-  'active' => 'person',
-  'subActive' => 'pronouns'
-];
\ No newline at end of file
diff --git a/app/templates/TelephoneNumbers/fields-nav.inc b/app/templates/TelephoneNumbers/fields-nav.inc
deleted file mode 100644
index e6f2507e6..000000000
--- a/app/templates/TelephoneNumbers/fields-nav.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * COmanage Registry Telephone Numbers Edit Navigation
- *
- * Portions licensed to the University Corporation for Advanced Internet
- * Development, Inc. ("UCAID") under one or more contributor license agreements.
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * UCAID licenses this file to you 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.
- *
- * @link          https://www.internet2.edu/comanage COmanage Project
- * @package       registry
- * @since         COmanage Registry v5.0.0
- * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- */
-
-// XXX: if CFM-218 (Make fields.inc configuration only) is accepted, move the contents of this file into fields.inc
-$topLinks = [];
-
-$subnav = [
-  'name' => 'person',
-  'active' => 'person',
-  'subActive' => 'telephone_numbers'
-];
\ No newline at end of file
diff --git a/app/templates/Urls/fields-nav.inc b/app/templates/Urls/fields-nav.inc
deleted file mode 100644
index 8e0c5364f..000000000
--- a/app/templates/Urls/fields-nav.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * COmanage Registry URLs Edit Navigation
- *
- * Portions licensed to the University Corporation for Advanced Internet
- * Development, Inc. ("UCAID") under one or more contributor license agreements.
- * See the NOTICE file distributed with this work for additional information
- * regarding copyright ownership.
- *
- * UCAID licenses this file to you 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.
- *
- * @link          https://www.internet2.edu/comanage COmanage Project
- * @package       registry
- * @since         COmanage Registry v5.0.0
- * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- */
-
-// XXX: if CFM-218 (Make fields.inc configuration only) is accepted, move the contents of this file into fields.inc
-$topLinks = [];
-
-$subnav = [
-  'name' => 'person',
-  'active' => 'person',
-  'subActive' => 'names'
-];
\ No newline at end of file
diff --git a/app/webroot/js/comanage/components/common/actions.js b/app/webroot/js/comanage/components/common/actions.js
index 066039742..b027168b6 100644
--- a/app/webroot/js/comanage/components/common/actions.js
+++ b/app/webroot/js/comanage/components/common/actions.js
@@ -24,7 +24,6 @@
  * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
  */
 
-<<<<<<< HEAD:app/webroot/js/comanage/components/common/actions.js
 import {
   constructLanguageString
 } from '../utils/helpers.js';
@@ -59,7 +58,3 @@ export default {
     </div>
   `
 }
-=======
-// XXX: if CFM-218 (Make fields.inc configuration only) is accepted, move the contents of this file into fields.inc
-$topLinks = [];
->>>>>>> 9a427e22 (feature-cfm31-subnavigation (#217)):app/templates/GroupNestings/fields-nav.inc