diff --git a/app/src/Controller/EnrollmentFlowsController.php b/app/src/Controller/EnrollmentFlowsController.php
index 9a2afb8fa..95c4a4ad2 100644
--- a/app/src/Controller/EnrollmentFlowsController.php
+++ b/app/src/Controller/EnrollmentFlowsController.php
@@ -75,6 +75,9 @@ public function calculatePermission(): bool {
         case EnrollmentAuthzEnum::CoAdmin:
           $authorized = $this->RegistryAuth->isCoAdmin($flow->co_id);
           break;
+// CFM-31 implement these (and enable in EnrollmentAuthzEnum, and possibly start() below
+//        and fields.inc)
+/*
         case EnrollmentAuthzEnum::CoOrCouAdmin:
 // XXX
           break;
@@ -93,7 +96,7 @@ public function calculatePermission(): bool {
         case EnrollmentAuthzEnum::None:
 // XXX willHandleAuth needs to check for this mode and then return 'open' if set
           $authorized = true;
-          break;
+          break;*/
       }
     }
 
@@ -142,10 +145,11 @@ public function start(string $id) {
 
     $isEnrollee = in_array($flow->authz_type, [
       EnrollmentAuthzEnum::AuthUser,
-      EnrollmentAuthzEnum::CouPerson,
-      EnrollmentAuthzEnum::GroupMember,
-      EnrollmentAuthzEnum::Person,
-      EnrollmentAuthzEnum::None
+// XXX not yet implemented
+      // EnrollmentAuthzEnum::CouPerson,
+      // EnrollmentAuthzEnum::GroupMember,
+      // EnrollmentAuthzEnum::Person,
+      // EnrollmentAuthzEnum::None
     ]);
 
     $actor = $this->getCurrentActor();
diff --git a/app/src/Lib/Enum/EnrollmentAuthzEnum.php b/app/src/Lib/Enum/EnrollmentAuthzEnum.php
index f44e025a9..d56a6344a 100644
--- a/app/src/Lib/Enum/EnrollmentAuthzEnum.php
+++ b/app/src/Lib/Enum/EnrollmentAuthzEnum.php
@@ -34,10 +34,11 @@
 class EnrollmentAuthzEnum extends StandardEnum {
   const AuthUser      = 'AU';
   const CoAdmin       = 'CA';
+/* CFM-31 not yet implemented
   const CoOrCouAdmin  = 'A';
   const CouAdmin      = 'UA';
   const CouPerson     = 'UP';
   const GroupMember   = 'GM';
   const Person        = 'CP';
-  const None          = 'N';
+  const None          = 'N';*/
 }
\ No newline at end of file
diff --git a/app/templates/EnrollmentFlows/fields.inc b/app/templates/EnrollmentFlows/fields.inc
index afaf26d8b..2b6018ace 100644
--- a/app/templates/EnrollmentFlows/fields.inc
+++ b/app/templates/EnrollmentFlows/fields.inc
@@ -36,16 +36,19 @@ declare(strict_types = 1);
     var authz = document.getElementById('authz-type').value;
 
     // Handle page interaction
-    if(authz == '<?= \App\Lib\Enum\EnrollmentAuthzEnum::CouAdmin ?>'
-       || authz == '<?= \App\Lib\Enum\EnrollmentAuthzEnum::CouPerson ?>') {
+/* CFM-31 not yet implemented
+    if(authz == '<?php // \App\Lib\Enum\EnrollmentAuthzEnum::CouAdmin ?>'
+       || authz == '<?php // \App\Lib\Enum\EnrollmentAuthzEnum::CouPerson ?>') {
       hideFields(['authz-group-id'], isPageLoad);
       showFields(['authz-cou-id'], isPageLoad);
-    } else if(authz == '<?= \App\Lib\Enum\EnrollmentAuthzEnum::GroupMember ?>') {
+    } else if(authz == '<?php // \App\Lib\Enum\EnrollmentAuthzEnum::GroupMember ?>') {
       hideFields(['authz-cou-id'], isPageLoad);
       showFields(['authz-group-id'], isPageLoad);
     } else {
       hideFields(['authz-cou-id', 'authz-group-id'], isPageLoad);
-    }
+    }*/
+
+    hideFields(['authz-cou-id', 'authz-group-id'], isPageLoad);
   }
 
   function jsLocalOnLoad() {