diff --git a/.github/workflows/feature_branch_sync.yml b/.github/workflows/feature_branch_sync.yml
deleted file mode 100644
index 87521f141c..0000000000
--- a/.github/workflows/feature_branch_sync.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: Rebase release_4.6-next and stable-2.6
-
-on:
-  push:
-    branches:
-      - release_4.6
-  workflow_dispatch:
-    # Allows manual triggering of the workflow from the GitHub UI
-
-jobs:
-  rebase:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - name: Checkout stable-2.6 branch
-        uses: actions/checkout@v4
-        with:
-          ref: stable-2.6
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Fetch release_4.6 branch for rebase
-        run: git fetch origin release_4.6:release_4.6
-
-      - name: Attempt Rebase release_4.6 into stable-2.6
-        id: rebase_attempt
-        run: |
-          git config user.name "GitHub Actions"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          git checkout stable-2.6
-          git rebase release_4.6
-
-      - name: Force Push Rebased stable-2.6 Branch
-        run: |
-          git push --force origin stable-2.6
diff --git a/awx/main/models/rbac.py b/awx/main/models/rbac.py
index 9fd9e5de74..12c104f54f 100644
--- a/awx/main/models/rbac.py
+++ b/awx/main/models/rbac.py
@@ -596,12 +596,6 @@ def get_role_from_object_role(object_role):
         model_name, role_name, _ = rd.name.split()
         role_name = role_name.lower()
         role_name += '_role'
-    elif rd.name.startswith('Controller') and rd.name.endswith(' Admin'):
-        # Controller Organization Admin and Controller Team Admin
-        role_name = 'admin_role'
-    elif rd.name.startswith('Controller') and rd.name.endswith(' Member'):
-        # Controller Organization Member and Controller Team Member
-        role_name = 'member_role'
     elif rd.name.endswith(' Admin') and rd.name.count(' ') == 2:
         # cases like "Organization Project Admin"
         model_name, target_model_name, role_name = rd.name.split()
@@ -751,7 +745,6 @@ def sync_parents_to_new_rbac(instance, action, model, pk_set, reverse, **kwargs)
 
 ROLE_DEFINITION_TO_ROLE_FIELD = {
     'Organization Member': 'member_role',
-    'Controller Organization Member': 'member_role',
     'WorkflowJobTemplate Admin': 'admin_role',
     'Organization WorkflowJobTemplate Admin': 'workflow_admin_role',
     'WorkflowJobTemplate Execute': 'execute_role',
@@ -776,11 +769,8 @@ ROLE_DEFINITION_TO_ROLE_FIELD = {
     'Organization Credential Admin': 'credential_admin_role',
     'Credential Use': 'use_role',
     'Team Admin': 'admin_role',
-    'Controller Team Admin': 'admin_role',
     'Team Member': 'member_role',
-    'Controller Team Member': 'member_role',
     'Organization Admin': 'admin_role',
-    'Controller Organization Admin': 'admin_role',
     'Organization Audit': 'auditor_role',
     'Organization Execute': 'execute_role',
     'Organization Approval': 'approval_role',