diff --git a/Controller/GrouperGroupsController.php b/Controller/GrouperGroupsController.php
index d7bb129..68b8ed5 100644
--- a/Controller/GrouperGroupsController.php
+++ b/Controller/GrouperGroupsController.php
@@ -106,18 +106,7 @@ public function beforeFilter()
                                              HttpStatusCodesEnum::HTTP_BAD_REQUEST);
     }
 
-    $this->Security->unlockedActions = array(
-      'removeSubscriber',
-      'addSubscriber',
-      'joinGroup',
-      'leaveGroup',
-      'groupMember',
-      'groupOptin',
-      'groupOwner'
-    );
-
     if ($this->request->is('ajax')) {
-      $this->response->disableCache();
       $this->RequestHandler->addInputType('json', array('json_decode', true));
     }
 
diff --git a/Lib/GrouperApiAccess.php b/Lib/GrouperApiAccess.php
index c1750fd..3eb5c40 100644
--- a/Lib/GrouperApiAccess.php
+++ b/Lib/GrouperApiAccess.php
@@ -371,6 +371,8 @@ public function getGroupInfo(string $groupName): array
   /**
    * Returns all the groups the active user is a member of, that they are allowed to see.
    *
+   * THIS REQUEST TARGETS THE GROUPS ENDPOINT
+   *
    * Note: Params added at end make sure that the groups returned can only be viewed by the member logged into
    * Grouper Lite
    *
@@ -381,7 +383,7 @@ public function getGroupInfo(string $groupName): array
    *
    * @throws GrouperLiteWidgetException
    */
-  public function getUserGroupMemberships(string $actorUserId, string $userId): array
+  public function getUserGroups(string $actorUserId, string $userId): array
   {
     if(empty($userId)) {
       return [];
@@ -404,6 +406,8 @@ public function getUserGroupMemberships(string $actorUserId, string $userId): ar
    * Returns either the groups the user is able to Opt into or can manage the memberships of.
    * Used for requests made to Membership endpoint in Grouper WS
    *
+   * THIS REQUEST TARGETS THE MEMBERSHIP ENDPOINT
+   *
    * @param   string  $userId
    * @param   string  $actAsUserId
    * @param   string  $groupType
@@ -439,7 +443,7 @@ public function getUserGroupMemberships(string $actorUserId, string $userId): ar
    *    }
    * }
    */
-  public function getGrouperUserMemberships(string $userId, string $actAsUserId, string $groupType): array
+  public function getUserMemberships(string $userId, string $actAsUserId, string $groupType): array
   {
     if(!in_array($groupType, [
       GrouperGroupTypeEnum::OPTINS,
diff --git a/Model/GrouperGroup.php b/Model/GrouperGroup.php
index 97c22de..5420743 100644
--- a/Model/GrouperGroup.php
+++ b/Model/GrouperGroup.php
@@ -79,8 +79,8 @@ public function isUserGroupOwner(string $userId, array $cfg): bool
     }
 
     try {
-      $resultsAdmin = $this->grouperAPI->getGrouperUserMemberships($userId, $userId, GrouperGroupTypeEnum::ADMIN);
-      $resultsUpdate = $this->grouperAPI->getGrouperUserMemberships($userId, $userId, GrouperGroupTypeEnum::UPDATE);
+      $resultsAdmin = $this->grouperAPI->getUserMemberships($userId, $userId, GrouperGroupTypeEnum::ADMIN);
+      $resultsUpdate = $this->grouperAPI->getUserMemberships($userId, $userId, GrouperGroupTypeEnum::UPDATE);
     } catch (Exception $e) {
       CakeLog::write('error', __METHOD__ . ': An error occurred');
       throw $e;
@@ -144,7 +144,7 @@ public function filteredMemberOfGroups(string $userId, array $cfg): array
     try {
       $memberOfGroups = $this->memberOfGroups($userId, $userId, $cfg);
       // Determine which groups can be left by user, if wanted.
-      $optOutGroups = $this->grouperAPI->getGrouperUserMemberships($userId, $userId, GrouperGroupTypeEnum::OPTOUTS);
+      $optOutGroups = $this->grouperAPI->getUserMemberships($userId, $userId, GrouperGroupTypeEnum::OPTOUTS);
       $optOutGroupsNames = Hash::combine($optOutGroups, '{n}.name', '{n}.displayExtension');
 
       foreach ($memberOfGroups as &$memberOfGroup) {
@@ -282,7 +282,7 @@ private function memberOfGroups(string $actorUserId, string $userId, array $cfg)
     $this->initApi($cfg);
 
     try {
-      return $this->grouperAPI->getUserGroupMemberships($actorUserId, $userId);
+      return $this->grouperAPI->getUserGroups($actorUserId, $userId);
     } catch (Exception $e) {
       CakeLog::write('error', __METHOD__ . ': An error occurred');
       throw $e;
@@ -308,8 +308,8 @@ public function getOwnedGroups(string $userId, array $cfg): array
     $this->initApi($cfg);
 
     try {
-      $resultsAdmin = $this->grouperAPI->getGrouperUserMemberships($userId, $userId, GrouperGroupTypeEnum::ADMIN);
-      $resultsUpdate = $this->grouperAPI->getGrouperUserMemberships($userId, $userId, GrouperGroupTypeEnum::UPDATE);
+      $resultsAdmin = $this->grouperAPI->getUserMemberships($userId, $userId, GrouperGroupTypeEnum::ADMIN);
+      $resultsUpdate = $this->grouperAPI->getUserMemberships($userId, $userId, GrouperGroupTypeEnum::UPDATE);
     } catch (Exception $e) {
       CakeLog::write('error', __METHOD__ . ': An error occurred');
       throw $e;
@@ -331,7 +331,7 @@ public function getOwnedGroups(string $userId, array $cfg): array
   public function getOwnedStems(string $userId): array
   {
     try {
-      return $this->grouperAPI->getGrouperUserMemberships($userId, $userId, GrouperGroupTypeEnum::ADMIN);
+      return $this->grouperAPI->getUserMemberships($userId, $userId, GrouperGroupTypeEnum::ADMIN);
     } catch (Exception $e) {
       CakeLog::write('error', __METHOD__ . ': An error occurred');
       throw $e;
@@ -439,9 +439,9 @@ public function optinGroups(string $userId, array $cfg): array
 
     try {
       // Groups the user can join or leave
-      $joinOrLeave = $this->grouperAPI->getGrouperUserMemberships($userId,
-                                                                  $userId,
-                                                                  GrouperGroupTypeEnum::OPTINS);
+      $joinOrLeave = $this->grouperAPI->getUserMemberships($userId,
+                                                           $userId,
+                                                           GrouperGroupTypeEnum::OPTINS);
     } catch (Exception $e) {
       CakeLog::write('error', __METHOD__ . ': An error occurred');
       throw $e;
@@ -449,7 +449,7 @@ public function optinGroups(string $userId, array $cfg): array
 
     try {
       // Groups the user is a member of
-      $userGroups = $this->grouperAPI->getUserGroupMemberships($userId, $userId);
+      $userGroups = $this->grouperAPI->getUserGroups($userId, $userId);
     } catch (Exception $e) {
       CakeLog::write('error', __METHOD__ . ': An error occurred');
       throw $e;
diff --git a/PlantUML/1.puml b/PlantUML/1.puml
deleted file mode 100644
index 86c136e..0000000
--- a/PlantUML/1.puml
+++ /dev/null
@@ -1,75 +0,0 @@
-# Data from API call to get all Groups belong to
-@startjson
-#highlight "WsGetGroupsLiteResult" / "wsGroups"
-#highlight "WsGetGroupsLiteResult" / "wsGroups" / "0" / "name"
-#highlight "WsGetGroupsLiteResult" / "wsGroups" / "0" / "displayName"
-#highlight "WsGetGroupsLiteResult" / "wsGroups" / "0" / "description"
-#highlight "WsGetGroupsLiteResult" / "wsGroups" / "1" / "name"
-#highlight "WsGetGroupsLiteResult" / "wsGroups" / "1" / "displayName"
-#highlight "WsGetGroupsLiteResult" / "wsGroups" / "1" / "description"
-#highlight "WsGetGroupsLiteResult" / "wsGroups" / "2" / "name"
-#highlight "WsGetGroupsLiteResult" / "wsGroups" / "2" / "displayName"
-#highlight "WsGetGroupsLiteResult" / "wsGroups" / "2" / "description"
-#highlight "WsGetGroupsLiteResult" / "wsGroups" / "3" / "name"
-#highlight "WsGetGroupsLiteResult" / "wsGroups" / "3" / "displayName"
-#highlight "WsGetGroupsLiteResult" / "wsGroups" / "3" / "description"
-{
-    "WsGetGroupsLiteResult": {
-        "resultMetadata": {
-            "success": "T",
-            "resultCode": "SUCCESS"
-        },
-        "wsSubject": {
-            "...": "..."
-        },
-        "responseMetadata": {
-            "...": "..."
-        },
-        "wsGroups": [
-            {
-                "extension": "CO_members_active",
-                "displayName": "app:comanage-provision:CO_members_active",
-                "description": "Internet2 Collaborations Active Members",
-                "uuid": "f5dae468b9d9429993992781712c2f83",
-                "enabled": "T",
-                "displayExtension": "CO_members_active",
-                "name": "app:comanage-provision:CO_members_active",
-                "typeOfGroup": "group",
-                "idIndex": "11104"
-            },
-            {
-                "extension": "grouperUiUserData",
-                "displayName": "etc:grouperUi:grouperUiUserData",
-                "description": "Internal group for grouper which has ...",
-                "uuid": "2748e23e51174145a4dc4d9e115c59da",
-                "enabled": "T",
-                "displayExtension": "grouperUiUserData",
-                "name": "etc:grouperUi:grouperUiUserData",
-                "typeOfGroup": "group",
-                "idIndex": "10015"
-            },
-            {
-                "extension": "AdministeredByUniconFolks",
-                "displayName": "sandbox:UniconTest:Administered By Unicon Folks",
-                "description": "Description goes here",
-                "uuid": "0b26aa411a99405b9440be3d0b18dafa",
-                "enabled": "T",
-                "displayExtension": "Administered By Unicon Folks",
-                "name": "sandbox:UniconTest:AdministeredByUniconFolks",
-                "typeOfGroup": "group",
-                "idIndex": "18451"
-            },
-            {
-                "extension": "MembersFromUniconAZ",
-                "displayName": "sandbox:UniconTest:Members At Unicon in AZ",
-                "uuid": "7a9f3b9837024a56b12a2a6259d520e0",
-                "enabled": "T",
-                "displayExtension": "Members At Unicon in AZ",
-                "name": "sandbox:UniconTest:MembersFromUniconAZ",
-                "typeOfGroup": "group",
-                "idIndex": "18447"
-            }
-        ]
-    }
-}
-@endjson
\ No newline at end of file
diff --git a/PlantUML/2.puml b/PlantUML/2.puml
deleted file mode 100644
index 2cfc608..0000000
--- a/PlantUML/2.puml
+++ /dev/null
@@ -1,25 +0,0 @@
-@startuml
-skinparam titleBorderRoundCorner 15
-skinparam titleBorderThickness 2
-skinparam titleBorderColor red
-skinparam titleBackgroundColor Aqua-CadetBlue
-
-title Mapping of //My Membership// page to API results
-
-map "** API Grouper (with example data)  => My Membership Page **" as CC {
- extension = CO_members_active => NA
- displayName = app:comanage-provision:CO_members_active => <b>Name</b>
- description = Internet2 Collaborations Active Members => Description
- uuid = f5dae468b9d9429993992781712c2f83 => NA
- enabled = T => NA
- displayExtension = CO_members_active => NA
- name = app:comanage-provision:CO_members_active => <b>Name</b>
- typeOfGroup = group => NA
- idIndex = 11104 => NA
-}
-
-note right of CC
-    Name Fields are used to determine Friendly Name
-end note
-
-@enduml
\ No newline at end of file
diff --git a/PlantUML/3.puml b/PlantUML/3.puml
deleted file mode 100644
index 16c8503..0000000
--- a/PlantUML/3.puml
+++ /dev/null
@@ -1,46 +0,0 @@
-@startuml
-skinparam titleBorderRoundCorner 15
-skinparam titleBorderThickness 2
-skinparam titleBorderColor red
-skinparam titleBackgroundColor Aqua-CadetBlue
-
-title Current Friendly name process for\nNon Working Groups
-
-start
-:GET "Groups Member Of";
-:Group 1
-{
-    "extension": "UniconMemberGroup",
-    "displayName": "sandbox:UniconTest:Unicon Members Group",
-    "uuid": "35c1ae4d9529492aac8cb2acb970279b",
-    "enabled": "T",
-    "displayExtension": "Unicon Members Group",
-    "name": "sandbox:UniconTest:UniconMemberGroup",
-    "typeOfGroup": "group",
-    "idIndex": "18446"
-};
-partition "Compare Displayname and Name Params for Group 1" {
-:Data:
-**displayName** = "sandbox:UniconTest:Unicon Members Group"
-**name** = "sandbox:UniconTest:UniconMemberGroup";
-:**Logic: Compare each Stem section**;
-
-if (Does "sandbox" == "sandbox"?) then (yes)
-    if (Does "UniconTest" == "UniconTest"?) then (yes)
-            if (Does "Unicon Members Group" == "UniconMemberGroup"?) then (yes)
-                :**FriendlyName** = "sandbox:UniconTest:UniconMemberGroup"
-                <i>(No variance between **name** and **displayName**)</i>;
-            else (no)
-                :**FriendlyName** = "Unicon Members Group";
-            endif
-    else (no)
-        #red:**FriendlyName** = "Unicon Members Group";
-        note right: Not possible
-    endif
-else (no)
-  #red:**FriendlyName** = "UniconTest:Unicon Members Group";
-  note: Not possible
-endif
-stop
-}
-@enduml
\ No newline at end of file
diff --git a/PlantUML/4.puml b/PlantUML/4.puml
deleted file mode 100644
index 37a5912..0000000
--- a/PlantUML/4.puml
+++ /dev/null
@@ -1,64 +0,0 @@
-# Current Friendly name process for Working Groups that is broken
-@startuml
-skinparam titleBorderRoundCorner 15
-skinparam titleBorderThickness 2
-skinparam titleBorderColor red
-skinparam titleBackgroundColor Aqua-CadetBlue
-
-title Current Friendly name process for\na Working Groups that is broken
-
-start
-:GET "Groups Member Of";
-fork
-:Group 1
-{
-    "extension": "admins",
-    "displayName": "app:confluence:Axel Working Group:admins",
-    "description": "Admins of confluence space for working group.  Axel's working group for testing",
-    "uuid": "35eaa34fd2d443e5a66a0a355505f69e",
-    "enabled": "T",
-    "displayExtension": "admins",
-    "name": "app:confluence:AxelWorkingGroup:admins",
-    "typeOfGroup": "group",
-    "idIndex": "19010"
-};
-fork again
-:Group 2
-{
-    "extension": "users",
-    "displayName": "app:confluence:Axel Working Group:users",
-    "description": "Users of confluence space for working group.  Axel's working group for testing",
-    "uuid": "163dc892fa8e484a9262e6e9fa619791",
-    "enabled": "T",
-    "displayExtension": "users",
-    "name": "app:confluence:AxelWorkingGroup:users",
-    "typeOfGroup": "group",
-    "idIndex": "19011"
-};
-end fork
-partition "Compare Displayname and Name Params from Group 2" {
-:Group 2 Data:
-**displayName** = "app:confluence:Axel Working Group:users"
-**name** = "app:confluence:AxelWorkingGroup:users";
-:**Logic: Compare each Stem section**;
-
-if (Does "app" == "app"?) then (yes)
-    if (Does "confluence" == "confluence"?) then (yes)
-            if (Does "Axel Working Group" == "AxelWorkingGroup"?) then (yes)
-                :**FriendlyName** = "app:confluence:AxelWorkingGroup:users"
-                <i>(No variance between **name** and **displayName**)</i>;
-            else (no)
-                #red:**FriendlyName** = "Axel Working Group";
-                note right: Missing **:users**
-            endif
-    else (no)
-        #red:**FriendlyName** = "Axel Working Group:users";
-        note right: Not possible
-    endif
-else (no)
-  #red:**FriendlyName** = "confluence:Axel Working Group:users";
-  note: Not possible
-endif
-stop
-}
-@enduml
\ No newline at end of file
diff --git a/PlantUML/5.puml b/PlantUML/5.puml
deleted file mode 100644
index 3856ac4..0000000
--- a/PlantUML/5.puml
+++ /dev/null
@@ -1,121 +0,0 @@
-# Removed "enabled"", "typeOfGroup", ""uuid"" and "idIndex" from returned records for brevity
-@startjson
-{
-"wsGroups": [
-            {
-                "extension": "CO_members_active",
-                "displayName": "app:comanage-provision:CO_members_active",
-                "description": "Internet2 Collaborations Active Members",
-                "displayExtension": "CO_members_active",
-                "name": "app:comanage-provision:CO_members_active",
-                "typeOfGroup": "group",
-                "idIndex": "11104"
-            },
-            {
-                "extension": "admins",
-                "displayName": "app:confluence:Axel Working Group:admins",
-                "description": "Admins of confluence space for working group.  Axel's working group for testing",
-                "displayExtension": "admins",
-                "name": "app:confluence:AxelWorkingGroup:admins"
-            },
-            {
-                "extension": "users",
-                "displayName": "app:confluence:Axel Working Group:users",
-                "description": "Users of confluence space for working group.  Axel's working group for testing",
-                "displayExtension": "users",
-                "name": "app:confluence:AxelWorkingGroup:users"
-            },
-            {
-                "extension": "admins",
-                "displayName": "app:confluence:NewWorkingGroupTest1155:admins",
-                "description": "Admins of confluence space for working group.  NewWorkingGroupTest1155",
-                "displayExtension": "admins",
-                "name": "app:confluence:NewWorkingGroupTest1155:admins"
-            },
-            {
-                "extension": "admins",
-                "displayName": "app:jira:AxelWorkingGroup:admins",
-                "description": "Users of jira project for working group.  Axel's working group for testing",
-                "displayExtension": "admins",
-                "name": "app:jira:AxelWorkingGroup:admins"
-            },
-            {
-                "extension": "users",
-                "displayName": "app:jira:AxelWorkingGroup:users",
-                "description": "Subscribers list receives working group emails.  Axel's working group for testing",
-                "displayExtension": "users",
-                "name": "app:jira:AxelWorkingGroup:users"
-            },
-            {
-                "extension": "admins",
-                "displayName": "app:jira:NewWorkingGroupTest1155:admins",
-                "description": "Users of jira project for working group.  NewWorkingGroupTest1155",
-                "displayExtension": "admins",
-                "name": "app:jira:NewWorkingGroupTest1155:admins"
-            },
-            {
-                "extension": "owners",
-                "displayName": "app:sympa:internet2:AxelWorkingGroup:owners",
-                "description": "Owners list manages the email list for the working group.  Axel's working group for testing",
-                "displayExtension": "owners",
-                "name": "app:sympa:internet2:AxelWorkingGroup:owners"
-            },
-            {
-                "extension": "subscribers",
-                "displayName": "app:sympa:internet2:AxelWorkingGroup:subscribers",
-                "description": "Subscribers list receives working group emails.  Axel's working group for testing",
-                "displayExtension": "subscribers",
-                "name": "app:sympa:internet2:AxelWorkingGroup:subscribers"
-            },
-            {
-                "extension": "owners",
-                "displayName": "app:sympa:internet2:NewWorkingGroupTest1155:owners",
-                "description": "Owners list manages the email list for the working group.  NewWorkingGroupTest1155",
-                "displayExtension": "owners",
-                "name": "app:sympa:internet2:NewWorkingGroupTest1155:owners"
-            },
-            {
-                "extension": "grouperUiUserData",
-                "displayName": "etc:grouperUi:grouperUiUserData",
-                "description": "Internal group for grouper which has user data stored ...",
-                "displayExtension": "grouperUiUserData",
-                "name": "etc:grouperUi:grouperUiUserData"
-            },
-            {
-                "extension": "sysadmingroup",
-                "displayName": "etc:sysadmingroup",
-                "description": "system administrators with all privileges",
-                "displayExtension": "sysadmingroup",
-                "name": "etc:sysadmingroup"
-            },
-            {
-                "extension": "admins",
-                "displayName": "ref:InCommon-collab:AxelWorkingGroup:AxelWorkingGroup admins",
-                "description": "Admins role means can manage / attest the working group.  Axel's working group for testing",
-                "displayExtension": "AxelWorkingGroup admins",
-                "name": "ref:incommon-collab:AxelWorkingGroup:admins"
-            },
-            {
-                "extension": "users",
-                "displayName": "ref:InCommon-collab:AxelWorkingGroup:AxelWorkingGroup users",
-                "description": "Users role means members of the working group with access to collaboration tools.  Axel's working group for testing",
-                "displayExtension": "AxelWorkingGroup users",
-                "name": "ref:incommon-collab:AxelWorkingGroup:users"
-            },
-            {
-                "extension": "admins",
-                "displayName": "ref:InCommon-collab:NewWorkingGroupTest1155:NewWorkingGroupTest1155 admins",
-                "description": "Admins role means can manage / attest the working group.  NewWorkingGroupTest1155",
-                "displayExtension": "NewWorkingGroupTest1155 admins",
-                "name": "ref:incommon-collab:NewWorkingGroupTest1155:admins"
-            },
-            {
-                "extension": "workinggroupadmins",
-                "displayName": "ref:workinggroupadmins",
-                "description": "Being a member of this group enables you to create collaboration groups under ...",
-                "displayExtension": "workinggroupadmins",
-                "name": "ref:workinggroupadmins"
-            }
-        ]
-}
-@endjson
\ No newline at end of file
diff --git a/PlantUML/6.puml b/PlantUML/6.puml
deleted file mode 100644
index 0999820..0000000
--- a/PlantUML/6.puml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Info taken from https://spaces.at.internet2.edu/display/Grouper/Grouper+custom+template+via+GSH+Internet2+example
-@startuml
-skinparam titleBorderRoundCorner 15
-skinparam titleBorderThickness 2
-skinparam titleBorderColor red
-skinparam titleBackgroundColor Aqua-CadetBlue
-
-title Process groups to verify if part of\na Working Group
-
-start
-:Working Group Stems:
-----
-* "app:jira"
-* "app:confluence"
-* "app:sympa:internet2"
-* "app:sympa:incommon"
-* "ref:InCommon-collab";
-
-partition "For Each Group" {
-if (Does "app:jira:AxelWorkingGroup:users" start with any **Working Group Stem**?) then (yes)
-        :Hold as part of a Working Group;
-else (no)
-  :Next record";
-endif
-}
-stop
-@enduml
\ No newline at end of file
diff --git a/PlantUML/7.puml b/PlantUML/7.puml
deleted file mode 100644
index 24616f8..0000000
--- a/PlantUML/7.puml
+++ /dev/null
@@ -1,63 +0,0 @@
-@startuml
-skinparam titleBorderRoundCorner 15
-skinparam titleBorderThickness 2
-skinparam titleBorderColor red
-skinparam titleBackgroundColor Aqua-CadetBlue
-
-title With records held as part of\na Working Group
-
-start
-:GET "Groups Member Of";
-fork
-:Group 1
-{
-    "extension": "admins",
-    "displayName": "app:confluence:Bill Working Group:admins",
-    "description": "Admins of confluence space for working group."
-    "displayExtension": "admins",
-    "name": "app:confluence:BillWorkingGroup:admins"
-};
-fork again
-:Group 2
-{
-    "extension": "users",
-    "displayName": "app:confluence:Axel Working Group:users",
-    "description": "Users of confluence space for working group."
-    "displayExtension": "users",
-    "name": "app:confluence:AxelWorkingGroup:users"
-};
-fork again
-:Group 3
-{
-    "extension": "admins",
-    "displayName": "app:jira:AxelWorkingGroup:admins",
-    "description": "Users of jira project for working group."
-    "displayExtension": "admins",
-    "name": "app:jira:AxelWorkingGroup:admins"
-};
-end fork
-partition "Compare Each Group to see if same Working Group" {
-:Compare Group 1 and Group 2
-**Group 1 name** = "app:confluence:BillWorkingGroup:admins"
-**Group 2 name** = "app:confluence:AxelWorkingGroup:users";
-:Assumption = Last section of name value is **ALWAYS** Members (users, admins) , therefore second to last section is Working Group Name;
-if (Does "BillWorkingGroup" == "AxelWorkingGroup"?) then (yes)
-        :Save to BillWorkingGroup;
-endif
-:Compare Group 2 and Group 3;
-if (Does "AxelWorkingGroup" == "AxelWorkingGroup"?) then (yes)
-        :Save to AxelWorkingGroup;
-endif
-}
-stop
-
-:=//My Membership://
-----
-**BillWorkingGroup:**
-* Confluence Admins
-----
-**Axel Working Group:**
-* Confluence Users
-* Jira Admins;
-
-@enduml
\ No newline at end of file
diff --git a/PlantUML/GroupsBelongTo.puml b/PlantUML/GroupsBelongTo.puml
deleted file mode 100644
index b8c4fc9..0000000
--- a/PlantUML/GroupsBelongTo.puml
+++ /dev/null
@@ -1,219 +0,0 @@
-
-# Removed "enabled"", "typeOfGroup", ""uuid"" and "idIndex" from returned records for brevity
-@startjson
-{
-"wsGroups": [
-            {
-                "extension": "CO_members_active",
-                "displayName": "app:comanage-provision:CO_members_active",
-                "description": "Internet2 Collaborations Active Members",
-                "displayExtension": "CO_members_active",
-                "name": "app:comanage-provision:CO_members_active",
-                "typeOfGroup": "group",
-                "idIndex": "11104"
-            },
-            {
-                "extension": "admins",
-                "displayName": "app:confluence:Axel Working Group:admins",
-                "description": "Admins of confluence space for working group.  Axel's working group for testing",
-                "displayExtension": "admins",
-                "name": "app:confluence:ExampleWGName:admins"
-            },
-            {
-                "extension": "users",
-                "displayName": "app:confluence:Axel Working Group:users",
-                "description": "Users of confluence space for working group.  Axel's working group for testing",
-                "displayExtension": "users",
-                "name": "app:confluence:ExampleWGName:users"
-            },
-            {
-                "extension": "admins",
-                "displayName": "app:confluence:NewWorkingGroupTest1155:admins",
-                "description": "Admins of confluence space for working group.  NewWorkingGroupTest1155",
-                "displayExtension": "admins",
-                "name": "app:confluence:NewWorkingGroupTest1155:admins"
-            },
-            {
-                "extension": "admins",
-                "displayName": "app:jira:ExampleWGName:admins",
-                "description": "Users of jira project for working group.  Axel's working group for testing",
-                "displayExtension": "admins",
-                "name": "app:jira:ExampleWGName:admins"
-            },
-            {
-                "extension": "users",
-                "displayName": "app:jira:ExampleWGName:users",
-                "description": "Subscribers list receives working group emails.  Axel's working group for testing",
-                "displayExtension": "users",
-                "name": "app:jira:ExampleWGName:users"
-            },
-            {
-                "extension": "admins",
-                "displayName": "app:jira:NewWorkingGroupTest1155:admins",
-                "description": "Users of jira project for working group.  NewWorkingGroupTest1155",
-                "displayExtension": "admins",
-                "name": "app:jira:NewWorkingGroupTest1155:admins"
-            },
-            {
-                "extension": "owners",
-                "displayName": "app:sympa:internet2:ExampleWGName:owners",
-                "description": "Owners list manages the email list for the working group.  Axel's working group for testing",
-                "displayExtension": "owners",
-                "name": "app:sympa:internet2:ExampleWGName:owners"
-            },
-            {
-                "extension": "subscribers",
-                "displayName": "app:sympa:internet2:ExampleWGName:subscribers",
-                "description": "Subscribers list receives working group emails.  Axel's working group for testing",
-                "displayExtension": "subscribers",
-                "name": "app:sympa:internet2:ExampleWGName:subscribers"
-            },
-            {
-                "extension": "owners",
-                "displayName": "app:sympa:internet2:NewWorkingGroupTest1155:owners",
-                "description": "Owners list manages the email list for the working group.  NewWorkingGroupTest1155",
-                "displayExtension": "owners",
-                "name": "app:sympa:internet2:NewWorkingGroupTest1155:owners"
-            },
-            {
-                "extension": "grouperUiUserData",
-                "displayName": "etc:grouperUi:grouperUiUserData",
-                "description": "Internal group for grouper which has user data stored ...",
-                "displayExtension": "grouperUiUserData",
-                "name": "etc:grouperUi:grouperUiUserData"
-            },
-            {
-                "extension": "sysadmingroup",
-                "displayName": "etc:sysadmingroup",
-                "description": "system administrators with all privileges",
-                "displayExtension": "sysadmingroup",
-                "name": "etc:sysadmingroup"
-            },
-            {
-                "extension": "admins",
-                "displayName": "ref:InCommon-collab:ExampleWGName:ExampleWGName admins",
-                "description": "Admins role means can manage / attest the working group.  Axel's working group for testing",
-                "displayExtension": "ExampleWGName admins",
-                "name": "ref:incommon-collab:ExampleWGName:admins"
-            },
-            {
-                "extension": "users",
-                "displayName": "ref:InCommon-collab:ExampleWGName:ExampleWGName users",
-                "description": "Users role means members of the working group with access to collaboration tools.  Axel's working group for testing",
-                "displayExtension": "ExampleWGName users",
-                "name": "ref:incommon-collab:ExampleWGName:users"
-            },
-            {
-                "extension": "admins",
-                "displayName": "ref:InCommon-collab:NewWorkingGroupTest1155:NewWorkingGroupTest1155 admins",
-                "description": "Admins role means can manage / attest the working group.  NewWorkingGroupTest1155",
-                "displayExtension": "NewWorkingGroupTest1155 admins",
-                "name": "ref:incommon-collab:NewWorkingGroupTest1155:admins"
-            },
-            {
-                "extension": "workinggroupadmins",
-                "displayName": "ref:workinggroupadmins",
-                "description": "Being a member of this group enables you to create collaboration groups under ...",
-                "displayExtension": "workinggroupadmins",
-                "name": "ref:workinggroupadmins"
-            }
-        ]
-}
-@endjson
-
-
-=============================================================
-
-# Info taken from https://spaces.at.internet2.edu/display/Grouper/Grouper+custom+template+via+GSH+Internet2+example
-@startuml
-skinparam titleBorderRoundCorner 15
-skinparam titleBorderThickness 2
-skinparam titleBorderColor red
-skinparam titleBackgroundColor Aqua-CadetBlue
-
-title Process groups to verify if part of\na Working Group
-
-start
-:Working Group Stems:
-----
-* "app:jira"
-* "app:confluence"
-* "app:sympa:internet2"
-* "app:sympa:incommon"
-* "ref:InCommon-collab";
-
-partition "For Each Group" {
-if (Does "app:jira:ExampleWGName:users" start with any **Working Group Stem**?) then (yes)
-        :Hold as part of a Working Group;
-else (no)
-  :Next record";
-endif
-}
-stop
-@enduml
-
-=============================================================
-
-@startuml
-skinparam titleBorderRoundCorner 15
-skinparam titleBorderThickness 2
-skinparam titleBorderColor red
-skinparam titleBackgroundColor Aqua-CadetBlue
-
-title With records held as part of\na Working Group
-
-start
-:GET "Groups Member Of";
-fork
-:Group 1
-{
-    "extension": "admins",
-    "displayName": "app:confluence:Bill Working Group:admins",
-    "description": "Admins of confluence space for working group."
-    "displayExtension": "admins",
-    "name": "app:confluence:BillWorkingGroup:admins"
-};
-fork again
-:Group 2
-{
-    "extension": "users",
-    "displayName": "app:confluence:Axel Working Group:users",
-    "description": "Users of confluence space for working group."
-    "displayExtension": "users",
-    "name": "app:confluence:ExampleWGName:users"
-};
-fork again
-:Group 3
-{
-    "extension": "admins",
-    "displayName": "app:jira:ExampleWGName:admins",
-    "description": "Users of jira project for working group."
-    "displayExtension": "admins",
-    "name": "app:jira:ExampleWGName:admins"
-};
-end fork
-partition "Compare Each Group to see if same Working Group" {
-:Compare Group 1 and Group 2
-**Group 1 name** = "app:confluence:BillWorkingGroup:admins"
-**Group 2 name** = "app:confluence:ExampleWGName:users";
-:Assumption = Last section of name value is **ALWAYS** Members (users, admins) , therefore second to last section is Working Group Name;
-if (Does "BillWorkingGroup" == "ExampleWGName"?) then (yes)
-        :Save to BillWorkingGroup;
-endif
-:Compare Group 2 and Group 3;
-if (Does "ExampleWGName" == "ExampleWGName"?) then (yes)
-        :Save to ExampleWGName;
-endif
-}
-stop
-
-:=//My Membership://
-----
-**BillWorkingGroup:**
-* Confluence Admins
-----
-**Axel Working Group:**
-* Confluence Users
-* Jira Admins;
-
-@enduml
\ No newline at end of file
diff --git a/PlantUML/MyMemberProcess.puml b/PlantUML/MyMemberProcess.puml
deleted file mode 100644
index 211ce24..0000000
--- a/PlantUML/MyMemberProcess.puml
+++ /dev/null
@@ -1,219 +0,0 @@
-# Data from API call to get all Groups belong to
-@startjson
-#highlight "WsGetGroupsLiteResult" / "wsGroups"
-#highlight "WsGetGroupsLiteResult" / "wsGroups" / "0" / "name"
-#highlight "WsGetGroupsLiteResult" / "wsGroups" / "0" / "displayName"
-#highlight "WsGetGroupsLiteResult" / "wsGroups" / "0" / "description"
-#highlight "WsGetGroupsLiteResult" / "wsGroups" / "1" / "name"
-#highlight "WsGetGroupsLiteResult" / "wsGroups" / "1" / "displayName"
-#highlight "WsGetGroupsLiteResult" / "wsGroups" / "1" / "description"
-#highlight "WsGetGroupsLiteResult" / "wsGroups" / "2" / "name"
-#highlight "WsGetGroupsLiteResult" / "wsGroups" / "2" / "displayName"
-#highlight "WsGetGroupsLiteResult" / "wsGroups" / "2" / "description"
-#highlight "WsGetGroupsLiteResult" / "wsGroups" / "3" / "name"
-#highlight "WsGetGroupsLiteResult" / "wsGroups" / "3" / "displayName"
-#highlight "WsGetGroupsLiteResult" / "wsGroups" / "3" / "description"
-{
-    "WsGetGroupsLiteResult": {
-        "resultMetadata": {
-            "success": "T",
-            "resultCode": "SUCCESS"
-        },
-        "wsSubject": {
-            "...": "..."
-        },
-        "responseMetadata": {
-            "...": "..."
-        },
-        "wsGroups": [
-            {
-                "extension": "CO_members_active",
-                "displayName": "app:comanage-provision:CO_members_active",
-                "description": "Internet2 Collaborations Active Members",
-                "uuid": "f5dae468b9d9429993992781712c2f83",
-                "enabled": "T",
-                "displayExtension": "CO_members_active",
-                "name": "app:comanage-provision:CO_members_active",
-                "typeOfGroup": "group",
-                "idIndex": "11104"
-            },
-            {
-                "extension": "grouperUiUserData",
-                "displayName": "etc:grouperUi:grouperUiUserData",
-                "description": "Internal group for grouper which has ...",
-                "uuid": "2748e23e51174145a4dc4d9e115c59da",
-                "enabled": "T",
-                "displayExtension": "grouperUiUserData",
-                "name": "etc:grouperUi:grouperUiUserData",
-                "typeOfGroup": "group",
-                "idIndex": "10015"
-            },
-            {
-                "extension": "AdministeredByUniconFolks",
-                "displayName": "sandbox:UniconTest:Administered By Unicon Folks",
-                "description": "Description goes here",
-                "uuid": "0b26aa411a99405b9440be3d0b18dafa",
-                "enabled": "T",
-                "displayExtension": "Administered By Unicon Folks",
-                "name": "sandbox:UniconTest:AdministeredByUniconFolks",
-                "typeOfGroup": "group",
-                "idIndex": "18451"
-            },
-            {
-                "extension": "MembersFromUniconAZ",
-                "displayName": "sandbox:UniconTest:Members At Unicon in AZ",
-                "uuid": "7a9f3b9837024a56b12a2a6259d520e0",
-                "enabled": "T",
-                "displayExtension": "Members At Unicon in AZ",
-                "name": "sandbox:UniconTest:MembersFromUniconAZ",
-                "typeOfGroup": "group",
-                "idIndex": "18447"
-            }
-        ]
-    }
-}
-@endjson
-
-=============================================================
-
-@startuml
-skinparam titleBorderRoundCorner 15
-skinparam titleBorderThickness 2
-skinparam titleBorderColor red
-skinparam titleBackgroundColor Aqua-CadetBlue
-
-title Mapping of //My Membership// page to API results
-
-map "** API Grouper (with example data)  => My Membership Page **" as CC {
- extension = CO_members_active => NA
- displayName = app:comanage-provision:CO_members_active => <b>Name</b>
- description = Internet2 Collaborations Active Members => Description
- uuid = f5dae468b9d9429993992781712c2f83 => NA
- enabled = T => NA
- displayExtension = CO_members_active => NA
- name = app:comanage-provision:CO_members_active => <b>Name</b>
- typeOfGroup = group => NA
- idIndex = 11104 => NA
-}
-
-note right of CC
-    Name Fields are used to determine Friendly Name
-end note
-
-@enduml
-
-=============================================================
-
-@startuml
-skinparam titleBorderRoundCorner 15
-skinparam titleBorderThickness 2
-skinparam titleBorderColor red
-skinparam titleBackgroundColor Aqua-CadetBlue
-
-title Current Friendly name process for\nNon Working Groups
-
-start
-:GET "Groups Member Of";
-:Group 1
-{
-    "extension": "UniconMemberGroup",
-    "displayName": "sandbox:UniconTest:Unicon Members Group",
-    "uuid": "35c1ae4d9529492aac8cb2acb970279b",
-    "enabled": "T",
-    "displayExtension": "Unicon Members Group",
-    "name": "sandbox:UniconTest:UniconMemberGroup",
-    "typeOfGroup": "group",
-    "idIndex": "18446"
-};
-partition "Compare Displayname and Name Params for Group 1" {
-:Data:
-**displayName** = "sandbox:UniconTest:Unicon Members Group"
-**name** = "sandbox:UniconTest:UniconMemberGroup";
-:**Logic: Compare each Stem section**;
-
-if (Does "sandbox" == "sandbox"?) then (yes)
-    if (Does "UniconTest" == "UniconTest"?) then (yes)
-            if (Does "Unicon Members Group" == "UniconMemberGroup"?) then (yes)
-                :**FriendlyName** = "sandbox:UniconTest:UniconMemberGroup"
-                <i>(No variance between **name** and **displayName**)</i>;
-            else (no)
-                :**FriendlyName** = "Unicon Members Group";
-            endif
-    else (no)
-        #red:**FriendlyName** = "Unicon Members Group";
-        note right: Not possible
-    endif
-else (no)
-  #red:**FriendlyName** = "UniconTest:Unicon Members Group";
-  note: Not possible
-endif
-stop
-}
-@enduml
-
-=============================================================
-
-# Current Friendly name process for Working Groups that is broken
-@startuml
-skinparam titleBorderRoundCorner 15
-skinparam titleBorderThickness 2
-skinparam titleBorderColor red
-skinparam titleBackgroundColor Aqua-CadetBlue
-
-title Current Friendly name process for\na Working Groups that is broken
-
-start
-:GET "Groups Member Of";
-fork
-:Group 1
-{
-    "extension": "admins",
-    "displayName": "app:confluence:Axel Working Group:admins",
-    "description": "Admins of confluence space for working group.  Axel's working group for testing",
-    "uuid": "35eaa34fd2d443e5a66a0a355505f69e",
-    "enabled": "T",
-    "displayExtension": "admins",
-    "name": "app:confluence:AxelWorkingGroup:admins",
-    "typeOfGroup": "group",
-    "idIndex": "19010"
-};
-fork again
-:Group 2
-{
-    "extension": "users",
-    "displayName": "app:confluence:Axel Working Group:users",
-    "description": "Users of confluence space for working group.  Axel's working group for testing",
-    "uuid": "163dc892fa8e484a9262e6e9fa619791",
-    "enabled": "T",
-    "displayExtension": "users",
-    "name": "app:confluence:AxelWorkingGroup:users",
-    "typeOfGroup": "group",
-    "idIndex": "19011"
-};
-end fork
-partition "Compare Displayname and Name Params from Group 2" {
-:Group 2 Data:
-**displayName** = "app:confluence:Axel Working Group:users"
-**name** = "app:confluence:AxelWorkingGroup:users";
-:**Logic: Compare each Stem section**;
-
-if (Does "app" == "app"?) then (yes)
-    if (Does "confluence" == "confluence"?) then (yes)
-            if (Does "Axel Working Group" == "AxelWorkingGroup"?) then (yes)
-                :**FriendlyName** = "app:confluence:AxelWorkingGroup:users"
-                <i>(No variance between **name** and **displayName**)</i>;
-            else (no)
-                #red:**FriendlyName** = "Axel Working Group";
-                note right: Missing **:users**
-            endif
-    else (no)
-        #red:**FriendlyName** = "Axel Working Group:users";
-        note right: Not possible
-    endif
-else (no)
-  #red:**FriendlyName** = "confluence:Axel Working Group:users";
-  note: Not possible
-endif
-stop
-}
-@enduml
diff --git a/View/Elements/Components/groupattributes.ctp b/View/Elements/Components/groupattributes.ctp
deleted file mode 100644
index 787ad81..0000000
--- a/View/Elements/Components/groupattributes.ctp
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php if (count($attributes) > 0) : ?>
-    <table class="table table-striped w-100">
-        <thead>
-            <tr>
-                <th class="attr"><?php echo _txt('pl.grouperlite.table.attribute-name'); ?></th>
-                <th class="attr definition"><?php echo _txt('pl.grouperlite.table.attribute-description'); ?></th>
-                <th class="attr action"><?php echo _txt('pl.grouperlite.table.action'); ?></th>
-            </tr>
-        </thead>
-        <tbody>
-            <?php foreach ($attributes as $attr) : ?>
-                <tr>
-                    <td><?php echo $attr['attributeDefNameName']; ?></td>
-                    <td><?php echo $attr['attributeDefName'] ?></td>
-                    <td>
-                        <a href="<?php echo $baseUrl . $attr['attributeDefNameId']; ?>" class="btn btn-grouper btn btn-primary btn btn-raised btn btn-block" target="_blank" role="button">
-                            <?php echo _txt('pl.grouperlite.action.view'); ?> <em class="material-icons mt-0 ml-1" aria-hidden="true">link</em>
-                        </a>
-                    </td>
-                </tr>
-            <?php endforeach; ?>
-        </tbody>
-    </table>
-<?php endif; ?>
-<?php if (count($attributes) < 1) : ?>
-    <div class="alert alert-info">
-        <p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.attributes.zero-state'); ?></p>
-    </div>
-<?php endif; ?>
\ No newline at end of file
diff --git a/View/Elements/Components/groupproperties.ctp b/View/Elements/Components/groupproperties.ctp
deleted file mode 100644
index c21099a..0000000
--- a/View/Elements/Components/groupproperties.ctp
+++ /dev/null
@@ -1,42 +0,0 @@
-<div class="row no-gutters bg-lighter align-items-center p-2">
-    <div class="col-sm-3 font-weight-bold"><?php echo _txt('pl.grouperlite.table.display-name'); ?></div>
-    <div class="col-sm-9 form-control-plaintext">
-        <?php echo $group['displayName']; ?>
-    </div>
-</div>
-<div class="row no-gutters bg-light align-items-center p-2">
-    <div class="col-sm-3 font-weight-bold"><?php echo _txt('pl.grouperlite.table.grouper-name'); ?></div>
-    <div class="col-sm-9 form-control-plaintext">
-        <?php echo $group['name']; ?>
-    </div>
-</div>
-<div class="row no-gutters bg-lighter align-items-center p-2">
-    <div class="col-sm-3 font-weight-bold"><?php echo _txt('pl.grouperlite.table.display-extension'); ?></div>
-    <div class="col-sm-9 form-control-plaintext">
-        <?php echo $group['displayExtension']; ?>
-    </div>
-</div>
-<div class="row no-gutters bg-light align-items-center p-2">
-    <div class="col-sm-3 font-weight-bold"><?php echo _txt('pl.grouperlite.table.extension'); ?></div>
-    <div class="col-sm-9 form-control-plaintext">
-        <?php echo $group['extension']; ?>
-    </div>
-</div>
-<div class="row no-gutters bg-lighter align-items-center p-2">
-    <div class="col-sm-3 font-weight-bold"><?php echo _txt('pl.grouperlite.table.enabled'); ?></div>
-    <div class="col-sm-9 form-control-plaintext">
-        <?php echo $group['enabled']; ?>
-    </div>
-</div>
-<div class="row no-gutters bg-light align-items-center p-2">
-    <div class="col-sm-3 font-weight-bold"><?php echo _txt('pl.grouperlite.table.type-of-group'); ?></div>
-    <div class="col-sm-9 form-control-plaintext">
-        <?php echo $group['typeOfGroup']; ?>
-    </div>
-</div>
-<div class="row no-gutters bg-lighter align-items-center p-2">
-    <div class="col-sm-3 font-weight-bold"><?php echo _txt('pl.grouperlite.table.uuid'); ?></div>
-    <div class="col-sm-9 form-control-plaintext">
-        <?php echo $group['uuid']; ?>
-    </div>
-</div>
\ No newline at end of file
diff --git a/View/Elements/Components/navigation-emaillists.ctp b/View/Elements/Components/navigation-emaillists.ctp
deleted file mode 100644
index c4b796c..0000000
--- a/View/Elements/Components/navigation-emaillists.ctp
+++ /dev/null
@@ -1,78 +0,0 @@
-<nav id="grouper-plugin-tabs" class="nav nav-tabs mb-4 justify-content-start">
-    <div class="d-flex nav-tab-group">
-        <div class="nav-item">
-            <?php
-            print $this->Html->link(
-                _txt('pl.grouperlite.nav.emaillists-member'),
-                array(
-                    'controller' => 'grouper_groups',
-                    'action' => 'emaillistsmember',
-                    'co' => $vv_coid,
-                    'glid' => $vv_config['CoGrouperLiteWidget']['id'],
-                ),
-                array('class' => array('nav-link', $active == 'emaillistsmember' ? 'active' : ''))
-            )
-            ?>
-        </div>
-        <div class="nav-item">
-            <?php
-            print $this->Html->link(
-                _txt('pl.grouperlite.nav.emaillists-join'),
-                array(
-                    'controller' => 'grouper_groups',
-                    'action' => 'emaillistsoptin',
-                    'co' => $vv_coid,
-                    'glid' => $vv_config['CoGrouperLiteWidget']['id'],
-                ),
-                array('class' => array('nav-link', $active == 'emaillistsoptin' ? 'active' : ''))
-            )
-            ?>
-        </div>
-        <div class="nav-item">
-            <?php
-            print $this->Html->link(
-                _txt('pl.grouperlite.nav.emaillists-manage'),
-                array(
-                    'controller' => 'grouper_groups',
-                    'action' => 'emaillistsmanage',
-                    'co' => $vv_coid,
-                    'glid' => $vv_config['CoGrouperLiteWidget']['id'],
-                ),
-                array('class' => array('nav-link', $active == 'emaillistsmanage' ? 'active' : ''))
-            )
-            ?>
-        </div>
-    </div>
-    <?php if ($isTemplateUser === 'T') { ?>
-        <div class="align-self-center">
-            <?php
-            $createTemplateGroupUrl = $this->Html->url(
-                array(
-                    'controller' => 'grouper_groups',
-                    'action' => 'groupcreatetemplate',
-                    'co' => $vv_coid,
-                    'glid' => $vv_config['CoGrouperLiteWidget']['id'],
-                )
-            );
-            ?>
-            <a href="<?php echo $createTemplateGroupUrl; ?>" class="btn btn-grouper btn btn-link px-3 py-2">
-                <i class="fa fa-plus-circle"></i>&nbsp; <?php echo _txt('pl.grouperlite.nav.create-working-group'); ?>
-            </a>
-        </div>
-    <?php } ?>
-    <div class="align-self-center ml-auto">
-        <?php
-        $gotoGroupsUrl = $this->Html->url(
-            array(
-                'controller' => 'grouper_groups',
-                'action' => 'groupmember',
-                'co' => $vv_coid,
-                'glid' => $vv_config['CoGrouperLiteWidget']['id'],
-            )
-        );
-        ?>
-        <a href="<?php echo $gotoGroupsUrl; ?>" class="btn btn-grouper btn btn-link px-3 py-2">
-            <i class="fa fa-users"></i>&nbsp; <?php echo _txt('pl.grouperlite.nav.groups'); ?>
-        </a>
-    </div>
-</nav>
\ No newline at end of file
diff --git a/View/Elements/Components/navigation-groups.ctp b/View/Elements/Components/navigation-groups.ctp
deleted file mode 100644
index 4b0edd1..0000000
--- a/View/Elements/Components/navigation-groups.ctp
+++ /dev/null
@@ -1,110 +0,0 @@
-<nav id="grouper-plugin-tabs" class="nav nav-tabs mb-4 justify-content-start">
-    <div class="d-flex nav-tab-group">
-        <div class="nav-item">
-            <?php
-            print $this->Html->link(
-                _txt('pl.grouperlite.nav.memberships'),
-                array(
-                    'controller' => 'grouper_groups',
-                    'action' => 'groupmember',
-                    'co' => $vv_coid,
-                    'glid' => $vv_config['CoGrouperLiteWidget']['id'],
-                ),
-                array('class' => array('nav-link', $active == 'groupmember' ? 'active' : ''))
-            )
-            ?>
-        </div>
-        <div class="nav-item">
-            <?php
-            print $this->Html->link(
-                _txt('pl.grouperlite.nav.groups-can-join'),
-                array(
-                    'controller' => 'grouper_groups',
-                    'action' => 'groupoptin',
-                    'co' => $vv_coid,
-                    'glid' => $vv_config['CoGrouperLiteWidget']['id'],
-                ),
-                array('class' => array('nav-link', $active == 'groupoptin' ? 'active' : ''))
-            )
-            ?>
-        </div>
-        <div class="nav-item">
-            <?php
-            print $this->Html->link(
-                _txt('pl.grouperlite.nav.groups-presided'),
-                array(
-                    'controller' => 'grouper_groups',
-                    'action' => 'groupowner',
-                    'co' => $vv_coid,
-                    'glid' => $vv_config['CoGrouperLiteWidget']['id'],
-                ),
-                array('class' => array('nav-link', $active == 'groupowner' ? 'active' : ''))
-            )
-            ?>
-        </div>
-        <div class="nav-item">
-          <?php
-          print $this->Html->link(
-            _txt('pl.grouperlite.nav.users-presided'),
-            array(
-              'controller' => 'grouper_groups',
-              'action' => 'userowner',
-              'co' => $vv_coid,
-              'glid' => $vv_config['CoGrouperLiteWidget']['id'],
-            ),
-            array('class' => array('nav-link', $active == 'groupowner' ? 'active' : ''))
-          )
-          ?>
-        </div>
-    </div>
-    <?php /* if ($isuserowner === 'T') { ?>
-        <div class="align-self-center">
-            <?php
-            $createGroupUrl = $this->Html->url(
-                array(
-                    'controller' => 'grouper_groups',
-                    'action' => 'groupcreate',
-                     'co' => $vv_coid,
-                    'glid' => $vv_config['CoGrouperLiteWidget']['id'],
-                )
-            );
-            $createGroupUrl = '#';
-            ?>
-            <a href="<?php echo $createGroupUrl; ?>" class="btn btn-grouper btn btn-link px-3 py-2 text-muted" disabled>
-                <i class="fa fa-plus-circle"></i>&nbsp; <?php echo _txt('pl.grouperlite.nav.create-group'); ?>
-            </a>
-        </div>
-    <?php } */ ?>
-    <?php if ($isTemplateUser === 'T') { ?>
-        <div class="align-self-center">
-            <?php
-            $createTemplateGroupUrl = $this->Html->url(
-                array(
-                    'controller' => 'grouper_groups',
-                    'action' => 'groupcreatetemplate',
-                    'co' => $vv_coid,
-                    'glid' => $vv_config['CoGrouperLiteWidget']['id'],
-                )
-            );
-            ?>
-            <a href="<?php echo $createTemplateGroupUrl; ?>" class="btn btn-grouper btn btn-link px-3 py-2">
-                <em class="material-icons text-grouper" aria-hidden="true">add_circle</em>&nbsp; <?php echo _txt('pl.grouperlite.nav.create-working-group'); ?>
-            </a>
-        </div>
-    <?php } ?>
-    <?php /*
-    <div class="align-self-center ml-auto">
-        <?php
-        $gotoEmailListsUrl = $this->Html->url(
-            array(
-                'controller' => 'grouper_groups',
-                'action' => 'emaillistsmember'
-            )
-        );
-        ?>
-        <a href="<?php echo $gotoEmailListsUrl; ?>" class="btn btn-grouper btn btn-link px-3 py-2">
-            <i class="fa fa-envelope"></i>&nbsp; <?php echo _txt('pl.grouperlite.nav.emaillists'); ?>
-        </a>
-    </div>
-    */ ?>
-</nav>
\ No newline at end of file
diff --git a/View/Elements/Components/optAction.ctp b/View/Elements/Components/optAction.ctp
deleted file mode 100644
index aa46a82..0000000
--- a/View/Elements/Components/optAction.ctp
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php echo $this->Form->create(false, array(
-  'url' => array('controller' => 'grouper_groups', 'action' => $action),
-  'class' => 'd-flex justify-content-center',
-  'id' => 'join-group.' . $idx
-)); ?>
-<?php print $this->Form->hidden('GroupName', array('default' => $group, 'id' => 'groupName.' . $idx)); ?>
-<?php print $this->Form->hidden('GroupDisplayName', array('default' => $groupDisplay, 'id' => 'groupDisplayName.' . $idx)); ?>
-<button class="btn btn-sm btn-<?php echo $member ? 'danger' : 'success'; ?> btn-block text-nowrap m-1" type="submit">
-  <?php echo $member ? _txt('pl.grouperlite.action.leave') : _txt('pl.grouperlite.action.join') ?> &nbsp;
-  <em class="material-icons mt-0 ml-1" aria-hidden="true"><?php echo $member ? 'person_off' : 'person'; ?></em>
-</button>
-<?php echo $this->Form->end(); ?>
\ No newline at end of file
diff --git a/View/Elements/Components/search.ctp b/View/Elements/Components/search.ctp
deleted file mode 100644
index ab982b6..0000000
--- a/View/Elements/Components/search.ctp
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php echo $this->Form->create(false, array(
-    'url' => array('controller' => 'grouper_groups', 'action' => $active),
-    'class' => 'search mb-4'
-)); ?>
-<div id="search-grouper-form">
-    <div class="d-flex">
-        <label class="sr-only" for="search"><?php echo _txt('pl.grouperlite.search.tags.text'); ?></label>
-        <div class="input-group input-group-search">
-
-            <!--<input type="text" name="search" class="form-control" value="<?php echo isset($searchcriteria) ? $searchcriteria : ''; ?>" /> -->
-            <div class="input-group-prepend">
-
-                <button class="btn btn-grouper btn-primary px-4" type="submit" value="Submit">
-                    <em class="material-icons" aria-hidden="true">search</em>
-                    <span class="ml-2 text-sml"><?php echo _txt('pl.grouperlite.action.search'); ?></span>
-                </button>
-            </div>
-            <?php echo $this->Form->input("search", array('label' => false, 'class' => 'form-control', 'value' => isset($searchcriteria) ? $searchcriteria : '')) ?>
-            <?php if (isset($searchcriteria) && $searchcriteria !== '') { ?>
-                <div class="input-group-append">
-                    <button class="btn btn-grouper btn-outline-secondary shadow-none" type="button" value="Clear" id="reset-search" aria-label="<?php echo _txt("pl.grouperlite.action.clear"); ?>">
-                        <em class="material-icons lg" aria-hidden="true">close</em>
-                        <span class="sr-only"><?php echo _txt("pl.grouperlite.action.clear"); ?></span>
-                    </button>
-                </div>
-            <?php } ?>
-        </div>
-    </div>
-    <script>
-        $(function() {
-            $('#reset-search').on('click', function() {
-                $('input#search').val('');
-                $('#groupoptinForm').submit();
-            });
-        });
-    </script>
-</div>
-<?php echo $this->Form->end(); ?>
\ No newline at end of file
diff --git a/View/Elements/Components/subscriberList.ctp b/View/Elements/Components/subscriberList.ctp
deleted file mode 100644
index 451f07d..0000000
--- a/View/Elements/Components/subscriberList.ctp
+++ /dev/null
@@ -1,300 +0,0 @@
-<div id="subscriber-picker" class="ui-front">
-    <div class="modal modal-members modal-primary fade" tabindex="-1" id="subscribers" aria-labelledby="modal-title">
-        <div class="modal-dialog modal-dialog-scrollable modal-lg">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h3 class="modal-title h5" id="modal-title">
-                        <?php echo _txt('pl.grouperlite.group.info.members-heading'); ?>:
-                        <span id="model-title-group-name"></span>
-                    </h3>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true">&times;</span>
-                        <span class="sr-only">Close</span>
-                    </button>
-                </div>
-                <div class="modal-body loader text-center">
-                    <svg id="grouper-loader" class="fade-out-half" role="status" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 300 100">
-                        <circle r="20%" cx="15%" cy="50%" color="#000" />
-                        <circle r="20%" cx="50%" cy="50%" color="#000" />
-                        <circle r="20%" cx="85%" cy="50%" color="#000" />
-                    </svg>
-
-                    <p class="sr-only">Loading...</p>
-                </div>
-                <div class="modal-body msg">
-                    <p>You do not have access to view memberships.</p>
-                </div>
-                <div class="modal-body subs">
-                    <?php if ($addSubscribers) : ?>
-                        <div class="d-flex mb-4">
-                            <?php echo $this->Form->create(false, array(
-                                'url' => array('controller' => 'grouper_groups', 'action' => 'groupSubscribers'),
-                                'class' => 'add-user-form w-100',
-                                'id' => 'add-user-form',
-                            )); ?>
-                            <label class="sr-only" for="addUser"><?php echo _txt('pl.grouperlite.search.tags.text'); ?></label>
-                            <div class="input-group">
-                                <?php echo $this->Form->input("addUser", array('label' => false, 'class' => 'form-control', 'value' => isset($searchcriteria) ? $searchcriteria : '')) ?>
-                                <div class="input-group-append">
-                                    <button id="addUserbutton" class=" btn btn-grouper btn-primary px-4" type="submit" value="Submit">
-                                        <em class="material-icons lg" aria-hidden="true">add</em>
-                                        <span class="ml-2"><?php echo _txt('pl.grouperlite.action.add-user'); ?></span>
-                                    </button>
-                                </div>
-
-                            </div>
-                            <?php echo $this->Form->end(); ?>
-                        </div>
-                        <div>
-                            <p class="alert alert-danger error"></p>
-                        </div>
-                    <?php endif; ?>
-                    <table class="table table-striped">
-                        <tbody id="sub-body"></tbody>
-                    </table>
-                </div>
-                <div class="modal-footer d-flex justify-content-end">
-                    <button type="button" class="btn btn-grouper btn-link" data-dismiss="modal"><?php echo _txt('pl.grouperlite.action.close'); ?></button>
-                </div>
-            </div>
-        </div>
-    </div>
-    <script>
-        (function($) {
-
-            var test = [{
-                "value": "8",
-                "label": "Susan S. Singularity",
-                "email": "ssingularity@another.org 1",
-                "emailLabel": "Email (official): ",
-                "identifier": "",
-                "identifierLabel": ""
-            }, {
-                "value": "4",
-                "label": "Susan S. Susanity",
-                "email": "ssusanity@newbie.org 1",
-                "emailLabel": "Email (official): ",
-                "identifier": "",
-                "identifierLabel": ""
-            }];
-
-            var load, modal, group;
-            var loadUrl = '<?php print $this->Html->url(
-                                array(
-                                    'plugin' => 'grouper_lite',
-                                    'controller' => 'grouper_groups',
-                                    'action' => 'groupSubscribers',
-                                    'co' => $vv_coid,
-                                    'glid' => $vv_config['CoGrouperLiteWidget']['id'],
-                                )
-                            ); ?>';
-
-            var removeUrl = '<?php print $this->Html->url(
-                                    array(
-                                        'plugin' => "grouper_lite",
-                                        'controller' => 'grouper_groups',
-                                        'action' => 'removeSubscriber',
-                                        'co' => $vv_coid,
-                                        'glid' => $vv_config['CoGrouperLiteWidget']['id'],
-                                    )
-                                ); ?>';
-
-            var addUrl = '<?php print $this->Html->url(
-                                array(
-                                    'plugin' => "grouper_lite",
-                                    'controller' => 'grouper_groups',
-                                    'action' => 'addSubscriber',
-                                    'co' => $vv_coid,
-                                    'glid' => $vv_config['CoGrouperLiteWidget']['id'],
-                                )
-                            ); ?>';
-            $('.members-btn').click(function(ev) {
-                var $this = $(this);
-                group = $this.data('id');
-                name = $this.data('name');
-                modal = $('#subscribers');
-                modal.modal('toggle').on('hide.bs.modal', function() {
-                    modal.find('#add-user-form').off('submit', onAddUserSubmit);
-                });
-
-                modal.find('#add-user-form').on('submit', onAddUserSubmit);
-
-                load = loadModalData(group, name);
-                load();
-
-                attachAutoComplete();
-            });
-
-            function attachAutoComplete() {
-                $("#addUser").autocomplete({
-                    source: [].concat(test, test, test, test, test, test, test, test, test, test, test, test, test, test, test, test, test, test, test),
-                    minLength: 3,
-                    select: function(event, ui) {
-                        // $("#group-add-member").hide();
-                        // $("#group-add-member-name").text(ui.item.label).show();
-                        $("#addUser").val(ui.item.identifier);
-                        // $("#CoGroupMemberCoPersonLabel").val(ui.item.label);
-                        $("#addUserbutton").prop('disabled', false).focus();
-                        return false;
-                    },
-                    focus: function(event, ui) {
-                        event.preventDefault();
-                        $("#group-add-member").val(ui.item.label + " (" + ui.item.value + ")");
-                    },
-                }).autocomplete("instance")._renderItem = formatCoPersonAutoselectItem;
-            }
-
-            function onAddUserSubmit(ev) {
-                ev.preventDefault();
-                ev.stopPropagation();
-                var form = $(ev.target);
-                var field = form.find('#addUser');
-                var user = field.val();
-                var token = form.find('[name="data[_Token][key]"]').val();
-
-                var data = form.serializeArray().reduce((o, kv) => ({
-                    ...o,
-                    [kv.name]: kv.value
-                }), {});
-
-                onAddUser(user, group, field, data);
-            }
-
-            function onRemoveUserSubmit(ev) {
-                ev.preventDefault();
-                ev.stopPropagation();
-                var form = $(ev.target);
-                var button = form.find('button');
-                var user = button.data('user');
-                var data = form.serializeArray().reduce((o, kv) => ({
-                    ...o,
-                    [kv.name]: kv.value
-                }), {});
-                onRemoveUser(user, group, button, data);
-            }
-
-            function loadModalData(id, name) {
-                $('#model-title-group-name').text(name);
-                modal.removeClass('error');
-                return function() {
-                    modal.addClass('loading');
-                    clean();
-                    $.ajax({
-                        method: 'GET',
-                        url: loadUrl + '?groupname=' + id,
-                        dataType: 'json',
-                        success: function(data) {
-                            createModalContent(data);
-                        },
-                        error: function(xhr) {
-                            if (xhr.status === 403) {
-                                $('#model-title-group-name').text(name + ' (no access)');
-                            }
-                            modal.addClass('error');
-                        },
-                        complete: function() {
-                            modal.removeClass('loading');
-                        }
-                    });
-                }
-            }
-
-            function createModalContent(data) {
-                $('#sub-body').html(data.reduce(function(table, item) {
-                    var row = [
-                        '<tr>',
-                        '<td>',
-                        item.name,
-                        '</td>',
-                        '<td>',
-                        item.id,
-                        '</td>',
-                        '<td>',
-                        '<?php echo $this->Form->create(false, array(
-                                "url" => array(
-                                    "controller" => "grouper_groups",
-                                    "action" => "removeSubscriber"
-                                ),
-                                "class" => "remove-user-form",
-                                "id" => "remove-user-form"
-                            )); ?>',
-                        <?php if ($addSubscribers) : ?> '<button data-user="' + item.id + '" class="btn btn-grouper btn-block btn-primary btn-sm m-1 text-nowrap member-del-btn">',
-                            '<?php echo _txt('pl.grouperlite.action.remove-user'); ?>',
-                            '</button>',
-                        <?php endif; ?> '<?php echo $this->Form->end(); ?>',
-                        '</td>',
-                        '</tr>'
-                    ].join('');
-
-                    table += row;
-                    return table;
-                }, ''));
-
-                $('.remove-user-form').on('submit', onRemoveUserSubmit);
-            }
-
-            function clean() {
-                $('#subscribers .error').hide();
-                $('#add-user-form #addUser').val('');
-                $('.member-del-btn').off('click', onRemoveUser);
-                // $('#add-user-form').off('submit', onAddUserSubmit);
-            }
-
-            function onRemoveUser(user, group, button, data) {
-                $('#subscribers .error').hide();
-                $.ajax({
-                    method: 'DELETE',
-                    url: removeUrl + '?group=' + group + '&userId=' + user,
-                    dataType: 'json',
-                    data: data,
-                    success: function(data) {
-                        load();
-                    },
-                    error: function() {
-                        $(button).attr('disabled', 'disabled');
-                        var err = $('#subscribers .error');
-                        err.text('<?php echo _txt('pl.grouperlite.message.user-not-removed-error'); ?>').show();
-                    }
-                });
-            }
-
-            function showButtonSpinner() {
-                $('#btn-icon').removeClass('fa-plus').addClass('fa-spinner fa-pulse');
-                $('#addUserbutton').attr('disabled', true);
-            }
-
-            function hideButtonSpinner() {
-                $('#btn-icon').removeClass('fa-spinner fa-pulse').addClass('fa-plus');
-                $('#addUserbutton').attr('disabled', false);
-            }
-
-            function onAddUser(user, group, field, data) {
-                $('#subscribers .error').hide();
-                showButtonSpinner();
-                $.ajax({
-                    method: 'POST',
-                    url: addUrl + '?group=' + group + '&userId=' + user,
-                    dataType: 'json',
-                    data: data,
-                    success: function(data) {
-                        load();
-                        hideButtonSpinner();
-                    },
-                    error: function(ev) {
-                        var msg = ev.status === 404 ?
-                            '<?php echo _txt('pl.grouperlite.message.user-not-found-error'); ?>' :
-                            ev.status === 401 ?
-                            '<?php echo _txt('pl.grouperlite.message.user-authorization-error'); ?>' :
-                            '<?php echo _txt('pl.grouperlite.message.user-not-added-error'); ?>';
-
-                        var err = $('#subscribers .error');
-                        err.text(msg).show();
-
-                        hideButtonSpinner();
-                    }
-                });
-            }
-
-        })(jQuery);
-    </script>
-</div>
\ No newline at end of file
diff --git a/View/Elements/Components/vue-table.ctp b/View/Elements/Components/vue-table.ctp
deleted file mode 100644
index d06c04c..0000000
--- a/View/Elements/Components/vue-table.ctp
+++ /dev/null
@@ -1,137 +0,0 @@
-<script type="module">
-    <?php if(Configure::read('debug') > 0): ?>
-    import GrouperGroupsView from '<?= $this->webroot ?>grouper_lite_widget/js/grouper-groups-view.js?time=<?php print time()?>';
-    <?php else: ?>
-    import GrouperGroupsView from '<?= $this->webroot ?>grouper_lite_widget/js/grouper-groups-view.js';
-    <?php endif; ?>
-
-    const app = Vue.createApp({
-        data() {
-            return {
-                groups: <?= $groupData ?>,
-                columns: <?= $columns ?>,
-                config: {
-                    adhocHeading: "<?= $vv_config['CoGrouperLiteWidget']['adhoc_heading'] ?: 'Ad-hoc groups' ?>",
-                    wgHeading: "<?= $vv_config['CoGrouperLiteWidget']['wg_heading'] ?: 'Working groups' ?>",
-                    collapsed: <?= $vv_config['CoGrouperLiteWidget']['default_collapse'] == 'collapsed' ? 'true' : 'false' ?>,
-                    optAction: "<?= $optAction ?? 'none' ?>",
-                    members: <?= isset($members) && $members ? 'true' : 'false' ?>,
-                    add: <?= isset($addSubscribers) && $addSubscribers ? 'true' : 'false' ?>
-                },
-                owner: <?= $treatAsOwner ? 'true' : 'false' ?>,
-                url: "<?= $actionUrl ?? 'null' ?>",
-            }
-        },
-        provide: {
-            txt: {
-                groups: "<?= _txt('pl.grouperlite.dashboard.heading.groups'); ?>",
-                leave: "<?= _txt('pl.grouperlite.action.leave') ?>",
-                descrZeroState: "<?= _txt('pl.grouperlite.value.descr.zerostate') ?>",
-                members: "<?= _txt('pl.grouperlite.action.members') ?>",
-                email: "<?= _txt('pl.grouperlite.value.email') ?>",
-                close: "<?= _txt('pl.grouperlite.action.close') ?>",
-                remove: "<?= _txt('pl.grouperlite.action.remove-user') ?>",
-                addUser: "<?= _txt('pl.grouperlite.action.add-user') ?>",
-                search: "<?= _txt('pl.grouperlite.search.tags.text') ?>",
-                noaccess: "<?= _txt('pl.grouperlite.members.noaccess') ?>",
-                empty: "<?= _txt('pl.grouperlite.members.empty') ?>",
-                join: "<?= _txt('pl.grouperlite.action.join') ?>"
-            },
-            api: {
-                co: <?= $vv_coid ?>,
-                mode: "<?= PeoplePickerModeEnum::All ?>",
-                base: "<?= $this->webroot ?>grouper_lite_widget/grouper_groups",
-                find: "<?= $this->Html->url(
-                  array(
-                    'controller' => 'grouper_groups',
-                    'action'     => 'findSubscriber',
-                    'co' => $vv_coid,
-                    'glid' => $vv_config['CoGrouperLiteWidget']['id'],
-                  )
-                ) ?>",
-                remove: "<?= $this->webroot ?>grouper_lite_widget/grouper_groups/removeSubscriber/co:<?= $vv_coid ?>/glid:<?= $vv_config['CoGrouperLiteWidget']['id'] ?>",
-                add: "<?= $this->webroot ?>grouper_lite_widget/grouper_groups/addSubscriber/co:<?= $vv_coid ?>/glid:<?= $vv_config['CoGrouperLiteWidget']['id'] ?>",
-                group: "<?= $this->webroot ?>grouper_lite_widget/grouper_groups/groupSubscribers/co:<?= $vv_coid ?>/glid:<?= $vv_config['CoGrouperLiteWidget']['id'] ?>",
-            },
-            tabs: [
-                {
-                    order: 1,
-                    label: "<?= _txt('pl.grouperlite.nav.memberships') ?>",
-                    id: 'memberships'
-                },
-                {
-                    order: 2,
-                    label: "<?= _txt('pl.grouperlite.nav.groups-can-join') ?>",
-                    id: 'join'
-                },
-                {
-                    order: 3,
-                    label: "<?= _txt('pl.grouperlite.nav.groups-presided') ?>",
-                    id: 'manage'
-                },
-            ]
-        },
-        mounted() {
-            if (!this.owner) {
-                this.columns = this.columns.filter(c => c.value !== 'role');
-            }
-        },
-        components: {
-            GrouperGroupsView
-        }
-    }).mount('#grouper-lite-widget');
-</script>
-
-<style>
-.ui-autocomplete {
-    max-height: 240px;
-    overflow-y: auto;
-    overflow-x: hidden;
-    padding-right: 20px;
-}
-</style>
-
-<div class="grouper-table">
-    <?php print $this->element('pagination', array(
-        'goto' => false,
-        'limit' => false,
-        'numbers' => false,
-        'counter' => true,
-        'class' => 'counter'
-    )); ?>
-    <div id="grouper-lite-widget">
-        <grouper-groups-view
-                :groups="groups"
-                :columns="columns"
-                :config="config"
-                :owner="owner"
-                :action="config.optAction"
-                :url="url"
-            >
-            <template v-slot:actionform="actionform">
-                <?= $this->Form->create(false, array(
-                    'url' => array('controller' => 'grouper_groups', 'action' => isset($optAction) ? $optAction : ''),
-                    'class' => 'd-flex justify-content-center',
-                    'id' => 'group-action'
-                )); ?>
-                <input type="hidden" name="data[GroupName]" :value="actionform.groupname" />
-                <input type="hidden" name="data[GroupDisplayName]" :value="actionform.groupdisplayname" />
-                <button
-                    :class="actionform.actiontype"
-                    class="btn btn-sm btn-block text-nowrap m-1 btn-success" type="submit">
-                    {{ actionform.actionlabel }}
-                    &nbsp;
-                    <em class="material-icons mt-0 ml-1" aria-hidden="true">{{ actionform.actionicon }}</em>
-                </button>
-                <?= $this->Form->end(null); ?>
-            </template>
-        </grouper-groups-view>
-    </div>
-        
-    <?php print $this->element("pagination", array(
-        'goto' => false,
-        'limit' => true,
-        'numbers' => true,
-        'counter' => false
-    )); ?>
-</div>
diff --git a/View/Elements/pagination.ctp b/View/Elements/pagination.ctp
deleted file mode 100644
index a182dbd..0000000
--- a/View/Elements/pagination.ctp
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-
-/**
- * COmanage Registry Pagination
- *
- * 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          http://www.internet2.edu/comanage COmanage Project
- * @package       registry
- * @since         COmanage Registry v0.9.4
- * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- */
-?>
-
-<?php
-
-$includeCounter = isset($counter) ? $counter : true;
-$includeNumbers = isset($numbers) ? $numbers : true;
-$includeLimit = isset($limit) ? $limit : true;
-$includeGoto = isset($goto) ? $goto : true;
-
-?>
-
-<div class="<?php echo isset($class) ? $class : 'pagination' ?> d-flex justify-content-start align-items-center rounded-0">
-    <?php if ($includeCounter) : ?>
-        <div class="pagination-element pagination-counter muted">
-            <?php
-            // pagination information
-            print $this->Paginator->counter(array(
-                'format' => _txt(is_string($counter) ? $counter : 'pl.grouperlite.pagination.counter')
-            ));
-            ?>
-        </div>
-    <?php endif; ?>
-
-    <?php if ($includeNumbers && $this->Paginator->hasPage(2)) : ?>
-        <div class="pagination-element pagination-numbers d-flex align-items-center">
-            <div class="pagination-first pagination-numbers-link"><?php print $this->Paginator->first(_txt('op.first')); ?></div>
-            <div class="pagination-prev pagination-numbers-link">
-                <?php
-                // Shows the previous link
-                print $this->Paginator->prev(
-                    _txt('op.previous'),
-                    null,
-                    null,
-                    array('class' => 'disabled')
-                );
-                ?>
-            </div>
-            <div class="pagination-numbers-list">
-                <?php
-                // Shows the page numbers
-                print $this->Paginator->numbers(array(
-                    'separator' => '',
-                    'class' => 'pagination-numbers-item'
-                ));
-                ?>
-            </div>
-            <div class="pagination-next pagination-numbers-link">
-                <?php
-                // Shows the next link
-                print $this->Paginator->next(
-                    _txt('op.next'),
-                    null,
-                    null,
-                    array('class' => 'disabled')
-                );
-                ?>
-            </div>
-            <div class="pagination-last pagination-numbers-link ">
-                <?php
-                // Shows the last link
-                print $this->Paginator->last(_txt('op.last'));
-                ?>
-            </div>
-        </div>
-    <?php endif; ?>
-
-    <?php if ($includeGoto && $this->Paginator->hasPage(2)) : ?>
-        <?php
-        // show the Goto page form if there is more than 1 page
-        ?>
-        <form id="goto-page" class="pagination-form pagination-element pagination-goto" method="get" onsubmit="gotoPage(this.pageNum.value,
-            <?php print $this->Paginator->counter('{:pages}'); ?>,
-            '<?php print _txt('er.pagenum.nan'); ?>',
-            '<?php print _txt('er.pagenum.exceeded', array($this->Paginator->counter('{:pages}'))); ?>');
-            return false;">
-            <label for="pageNum"><?php print _txt('fd.page.goto'); ?></label>
-            <input type="text" size="3" name="pageNum" id="pageNum" />
-            <input type="submit" value="<?php print _txt('op.go'); ?>" />
-        </form>
-    <?php endif; ?>
-
-    <?php
-    // Provide a form for setting the page limit.
-    // Default is 25 records, current maximum is 100.
-    // For now we will simply hard-code the options from 25 - 100.
-    ?>
-    <?php if ($includeLimit !== false) : ?>
-        <script type="text/javascript">
-            var recordCount = '<?php print $this->Paginator->params()['count']; ?>';
-            var currentPage = '<?php print $this->Paginator->params()['page']; ?>';
-            var currentLimit = '<?php print $this->Paginator->params()['limit']; ?>';
-            var currentPath = '<?php print filter_var($this->request->here, FILTER_SANITIZE_SPECIAL_CHARS); ?>';
-            var currentAction = '<?php print filter_var($this->request->action, FILTER_SANITIZE_SPECIAL_CHARS); ?>';
-        </script>
-        <form id="limit-page" class="pagination-form pagination-element pagination-limit d-flex align-items-center" method="get" onsubmit="limitPage(this.pageLimit.value,recordCount,currentPage,currentPath,currentAction); return false;">
-            <label for="pageLimit"><?php print _txt('fd.page.limit.display'); ?></label>
-            <select name="pageLimit" id="pageLimit">
-                <option value="20">20</option>
-                <option value="50">50</option>
-                <option value="<?php echo $this->Paginator->params()['count'] ?>">All</option>
-            </select>
-            <p class=""><?php print _txt('fd.page.limit.records'); ?></p>
-            <input type="submit" value="<?php print _txt('op.go'); ?>" class="btn btn-primary-light" />
-            <script type="text/javascript">
-                $(function() {
-                    // Check if the currentLimit holds an appropriate value on first load, and set the select option
-                    if (currentLimit != '' && (currentLimit == '20' || currentLimit == '50' || currentLimit == '<?php echo $this->Paginator->params()['count'] ?>')) {
-                        $("#pageLimit").val(currentLimit);
-                    }
-                });
-            </script>
-        </form>
-    <?php endif; ?>
-</div>
\ No newline at end of file
diff --git a/View/GrouperGroups/groupinfo.ctp b/View/GrouperGroups/groupinfo.ctp
deleted file mode 100644
index 7aed583..0000000
--- a/View/GrouperGroups/groupinfo.ctp
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--nocache-->
-<?php $this->extend('/GrouperGroups/base'); ?>
-<?php $this->Html->addCrumb(_txt('pl.grouperlite.title.groupinfo')); ?>
-<?php
-$baseUrl = $grouperbaseurl;
-$path = '/grouper/grouperUi/app/UiV2Main.index';
-$groupOperation = '?operation=UiV2Group.viewGroup&groupId=';
-$groupUrlBase = $baseUrl . $path . $groupOperation;
-$attrOperation = '?operation=UiV2AttributeDefName.viewAttributeDefName&attributeDefNameId=';
-$attrUrlBase = $baseUrl . $path . $attrOperation;
-?>
-
-<div>
-    <div class="border-bottom py-4 mb-4 d-flex justify-content-between">
-        <h2><strong><?php echo _txt('pl.grouperlite.group.info.page-heading'); ?></strong> <?php echo $groupergroupsdetail['displayExtension']; ?></h2>
-        <div class="d-flex align-items-center">
-
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-xl-6 col-xs-12 group-details mb-4">
-            <div class="d-flex align-items-center mb-3">
-                <h3 class="mb-1"><?php echo _txt('pl.grouperlite.group.info.properties-heading'); ?></h3>
-                <?php /* if ($isuserowner === 'T') : ?>
-                    <button class="btn btn-grouper btn btn-primary btn btn-sm ml-4">
-                        <?php echo _txt('pl.grouperlite.action.edit'); ?>
-                        <em class="material-icons mt-0 ml-1" aria-hidden="true">edit</em>
-                    </button>
-                <?php endif; */ ?>
-            </div>
-            <?php echo $this->element('Components/groupproperties', array(
-                'group' => $groupergroupsdetail
-            )); ?>
-        </div>
-        <div class="col-xl-6 col-xs-12">
-            <div class="table-responsive">
-                <h3><?php echo _txt('pl.grouperlite.group.info.attributes-heading'); ?></h3>
-                <?php echo $this->element('Components/groupattributes', array(
-                    'attributes' => $groupergroupsdetail['attributes'],
-                    'baseUrl' => $attrUrlBase
-                )); ?>
-            </div>
-        </div>
-    </div>
-</div>
-<!--/nocache-->
\ No newline at end of file
diff --git a/View/GrouperGroups/groupmember.ctp b/View/GrouperGroups/groupmember.ctp
deleted file mode 100644
index 82428f8..0000000
--- a/View/GrouperGroups/groupmember.ctp
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--nocache-->
-<?php $this->extend('/GrouperGroups/base'); ?>
-<?php $this->Html->addCrumb(_txt('pl.grouperlite.nav.memberships')); ?>
-
-<?php echo $this->element('GrouperLiteWidget.Components/vue-table', array(
-    'groupData' => json_encode(array(
-        'adhoc' => $groupmemberships,
-        'working' => $wgmemberships
-    )),
-    'treatAsOwner' => $isuserowner === 'T' ? 'true' : 'false',
-    'columns' => json_encode(array(
-        array('value' => 'name', 'label' => _txt('pl.grouperlite.table.name')),
-        array('value' => 'role', 'label' => _txt('pl.grouperlite.table.role')),
-        array('value' => 'description', 'label' => _txt('pl.grouperlite.table.description')),
-        array('value' => 'action', 'label' => _txt('pl.grouperlite.table.action')),
-    )),
-    'optAction' => "leavegroup",
-    'actionUrl' => $this->Html->url([
-        'controller' => 'grouper_groups',
-        'action' => 'leavegroup',
-        'co' => $vv_coid,
-        'glid' => $vv_config['CoGrouperLiteWidget']['id'],
-    ]),
-    'members' => true,
-    'addSubscribers' => false,
-)); ?>
-<?php if (count($groupmemberships) < 1 && count($wgmemberships) < 1) : ?>
-    <div class="alert alert-info">
-        <p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.groups.zero-state'); ?></p>
-    </div>
-<?php endif; ?>
-
-<!--/nocache-->
\ No newline at end of file
diff --git a/View/GrouperGroups/groupoptin.ctp b/View/GrouperGroups/groupoptin.ctp
deleted file mode 100644
index e5cfa4d..0000000
--- a/View/GrouperGroups/groupoptin.ctp
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--nocache-->
-<?php $this->extend('/GrouperGroups/base'); ?>
-<?php $this->Html->addCrumb(_txt('pl.grouperlite.nav.groups-can-join')); ?>
-<?php echo $this->element('GrouperLiteWidget.Components/navigation-groups', array('active' => 'groupoptin')); ?>
-<?php echo $this->element('GrouperLiteWidget.Components/search', array('active' => 'groupoptin')); ?>
-<?php echo $this->element('GrouperLiteWidget.Components/vue-table', array(
-    'groupData' => json_encode(array(
-        'adhoc' => $groupoptins,
-        'working' => array()
-    )),
-    'treatAsOwner' => false,
-    'columns' => json_encode(array(
-        array('value' => 'name', 'label' => _txt('pl.grouperlite.table.name')),
-        array('value' => 'description', 'label' => _txt('pl.grouperlite.table.description')),
-        array('value' => 'action', 'label' => _txt('pl.grouperlite.table.action')),
-    )),
-    'optAction' => "joingroup",
-    'actionUrl' => $this->Html->url([
-        'controller' => 'grouper_groups',
-        'action' => 'joingroup',
-        'co' => $vv_coid,
-        'glid' => $vv_config['CoGrouperLiteWidget']['id'],
-    ]),
-)); ?>
-<?php if (count($groupoptins) < 1) : ?>
-  <div class="alert alert-info">
-    <p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.groups.zero-state'); ?></p>
-  </div>
-<?php endif; ?>
\ No newline at end of file
diff --git a/View/GrouperGroups/groupowner.ctp b/View/GrouperGroups/groupowner.ctp
deleted file mode 100644
index 68deeec..0000000
--- a/View/GrouperGroups/groupowner.ctp
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--nocache-->
-<?php $this->extend('/GrouperGroups/base'); ?>
-<?php $this->Html->addCrumb(_txt('pl.grouperlite.nav.groups-presided')); ?>
-<?php echo $this->element('Components/navigation-groups', array('active' => 'groupowner')); ?>
-<?php echo $this->element('Components/search', array('active' => 'groupowner')); ?>
-<?php
-$columns = array(
-    array('value' => 'name', 'label' => _txt('pl.grouperlite.table.name')),
-    array('value' => 'role', 'label' => _txt('pl.grouperlite.table.role')),
-    array('value' => 'description', 'label' => _txt('pl.grouperlite.table.description')),
-    array('value' => 'status', 'label' => _txt('pl.grouperlite.table.status')),
-    array('value' => 'action', 'label' => _txt('pl.grouperlite.table.action')),
-);
-
-if ($vv_is_user_owner !== 'T') {
-  array_splice($columns, 1, 1);
-}
-?>
-
-<?php echo $this->element('GrouperLiteWidget.Components/vue-table', array(
-    'groupData' => json_encode(array(
-        'adhoc' => $groupsowners,
-        'working' => array()
-    )),
-    'treatAsOwner' => $vv_is_user_owner === 'T' ? 'true' : 'false',
-    'columns' => json_encode($columns),
-    'addSubscribers' => true,
-    'members' => true
-)); ?>
-
-
-<?php if (count($groupsowners) < 1) : ?>
-  <div class="alert alert-info">
-    <p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.groups.zero-state'); ?></p>
-  </div>
-<?php endif; ?>
-<!--/nocache-->
\ No newline at end of file
diff --git a/View/GrouperGroups/joingroup.ctp b/View/GrouperGroups/joingroup.ctp
deleted file mode 100644
index e4d9672..0000000
--- a/View/GrouperGroups/joingroup.ctp
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php echo _txt('joined group').' - '.$groupname; ?>
-<?php echo $groupergroupjoined; ?>
\ No newline at end of file
diff --git a/View/GrouperGroups/leavegroup.ctp b/View/GrouperGroups/leavegroup.ctp
deleted file mode 100644
index 2a3df51..0000000
--- a/View/GrouperGroups/leavegroup.ctp
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php echo _txt('left group').' - '.$groupname; ?>
-<?php echo $groupergroupleft; ?>
\ No newline at end of file
diff --git a/View/GrouperGroups/templatefields.inc b/View/GrouperGroups/templatefields.inc
deleted file mode 100644
index 5b4d338..0000000
--- a/View/GrouperGroups/templatefields.inc
+++ /dev/null
@@ -1,234 +0,0 @@
-<fieldset id="form" class="container-fluid">
-    <div class="form-group row py-2 bg-light">
-        <?php echo $this->Form->label(false, _txt('pl.grouperlite.form.template.work-group-extension.label'), array(
-            'for' => 'gsh_input_workingGroupExtension',
-            'class' => "col-sm-3 col-form-label d-flex align-items-center"
-        )); ?>
-        <div class="col-sm-9">
-            <?php echo $this->Form->input('gsh_input_workingGroupExtension', array(
-                'label' => false,
-                'class' => 'form-control',
-                'required' => true,
-                'maxlength' => '62',
-                'id' => 'gsh_input_workingGroupExtension'
-            )); ?>
-        </div>
-    </div>
-    <div class="form-group row py-2 bg-light">
-        <?php echo $this->Form->label(false, _txt('pl.grouperlite.form.template.work-group-disp-extension.label'), array(
-            'for' => 'gsh_input_workingGroupDisplayExtension',
-            'class' => "col-sm-3 col-form-label d-flex align-items-center"
-        )); ?>
-        <div class="col-sm-9">
-            <?php echo $this->Form->input('gsh_input_workingGroupDisplayExtension', array(
-                'label' => false,
-                'class' => 'form-control',
-                'maxlength' => '62',
-                'id' => 'gsh_input_workingGroupDisplayExtension'
-            )); ?>
-        </div>
-    </div>
-    <div class="form-group row py-2 bg-light">
-        <?php echo $this->Form->label(false, _txt('pl.grouperlite.form.template.work-group-description.label'), array(
-            'for' => 'gsh_input_workingGroupDescription',
-            'class' => "col-sm-3 col-form-label d-flex align-items-center"
-        )); ?>
-        <div class="col-sm-9">
-            <?php echo $this->Form->input('gsh_input_workingGroupDescription', array(
-                'label' => false,
-                'class' => 'form-control',
-                'maxlength' => '62',
-                'id' => 'gsh_input_workingGroupDescription'
-            )); ?>
-        </div>
-    </div>
-    <fieldset class="form-group row py-2 bg-light">
-        <legend class="col-form-label float-sm-left col-sm-3 py-0 d-flex align-items-center"><?php echo _txt('pl.grouperlite.form.template.enable-email-list.label'); ?></legend>
-        <div class="col-sm-9 d-flex align-items-center">
-            <?php echo $this->Form->input(
-                'gsh_input_isSympa',
-                array(
-                    'label' => true,
-                    'class' => 'form-check-input',
-                    'legend' => false,
-                    'id' => 'gsh_input_isSympa',
-                    'before' => '<div class="form-check form-check-inline align-items-center">',
-                    'separator' => '</div><div class="form-check form-check-inline">',
-                    'after' => '</div>',
-                    'options' => array(
-                        true => _txt('pl.grouperlite.form.template.value.positive'),
-                        false => _txt('pl.grouperlite.form.template.value.negative')
-                    ),
-                    'type' => 'radio',
-                    'default' => true
-                )
-            ); ?>
-        </div>
-    </fieldset>
-    <fieldset class="form-group row py-2 bg-light sympa-option">
-        <legend class="col-form-label float-sm-left col-sm-3 py-0 pl-4 d-flex align-items-center"><?php echo _txt('pl.grouperlite.form.template.domain.label'); ?></legend>
-        <div class="col-sm-9 d-flex align-items-center">
-            <?php echo $this->Form->input(
-                'gsh_input_sympaDomain',
-                array(
-                    'label' => true,
-                    'class' => 'form-check-input',
-                    'legend' => false,
-                    'id' => 'gsh_input_sympaDomain',
-                    'before' => '<div class="form-check form-check-inline">',
-                    'separator' => '</div><div class="form-check form-check-inline">',
-                    'after' => '</div>',
-                    'options' => array(
-                        'internet2' => _txt('pl.grouperlite.form.template.value.internet2'),
-                        'incommon' => _txt('pl.grouperlite.form.template.value.incommon')
-                    ),
-                    'type' => 'radio'
-                )
-            ); ?>
-        </div>
-    </fieldset>
-    <fieldset class="form-group row py-2 bg-light sympa-option">
-        <legend class="col-form-label float-sm-left col-sm-3 py-0 pl-4 d-flex align-items-center"><?php echo _txt('pl.grouperlite.form.template.is-moderated.label'); ?></legend>
-        <div class="col-sm-9 d-flex align-items-center">
-            <?php echo $this->Form->input(
-                'gsh_input_isSympaModerated',
-                array(
-                    'label' => true,
-                    'class' => 'form-check-input',
-                    'legend' => false,
-                    'id' => 'gsh_input_isSympaModerated',
-                    'before' => '<div class="form-check form-check-inline">',
-                    'separator' => '</div><div class="form-check form-check-inline">',
-                    'after' => '</div>',
-                    'options' => array(
-                        true => _txt('pl.grouperlite.form.template.value.positive'),
-                        false => _txt('pl.grouperlite.form.template.value.negative')
-                    ),
-                    'type' => 'radio',
-                    'default' => false
-                )
-            ); ?>
-        </div>
-    </fieldset>
-    <fieldset class="form-group row py-2 bg-light">
-        <legend class="col-form-label float-sm-left col-sm-3 py-0 d-flex align-items-center"><?php echo _txt('pl.grouperlite.form.template.is-optin.label'); ?></legend>
-        <div class="col-sm-9 d-flex align-items-center">
-            <?php echo $this->Form->input(
-                'gsh_input_isOptin',
-                array(
-                    'label' => true,
-                    'class' => 'form-check-input',
-                    'legend' => false,
-                    'id' => 'gsh_input_isOptin',
-                    'before' => '<div class="form-check form-check-inline">',
-                    'separator' => '</div><div class="form-check form-check-inline">',
-                    'after' => '</div>',
-                    'options' => array(
-                        true => _txt('pl.grouperlite.form.template.value.positive'),
-                        false => _txt('pl.grouperlite.form.template.value.negative')
-                    ),
-                    'type' => 'radio',
-                    'default' => false
-                )
-            ); ?>
-        </div>
-    </fieldset>
-    <!--<div class="form-group row py-2 bg-light">
-        <?php /*echo $this->Form->label(false, "Days for Attestation", array(
-            'for' => 'gsh_input_attestationDays',
-            'class' => "col-sm-3 col-form-label"
-        ));*/ ?>
-        <div class="col-sm-9">
-            <?php /*echo $this->Form->input('gsh_input_attestationDays', array(
-                'label' => false,
-                'class' => 'form-control',
-                'type' => 'number',
-                'default' => '30',
-                'min' => '30',
-                'max' => '365',
-                'id' => 'gsh_input_attestationDays'
-            ));*/ ?>
-        </div>
-    </div>-->
-    <fieldset class="form-group row py-2 bg-light">
-        <legend class="col-form-label float-sm-left col-sm-3 py-0 d-flex align-items-center"><?php echo _txt('pl.grouperlite.form.template.add-wiki.label'); ?></legend>
-        <div class="col-sm-9 d-flex align-items-center">
-            <?php echo $this->Form->input(
-                'gsh_input_isConfluence',
-                array(
-                    'label' => true,
-                    'class' => 'form-check-input',
-                    'legend' => false,
-                    'id' => 'gsh_input_isConfluence',
-                    'before' => '<div class="form-check form-check-inline">',
-                    'separator' => '</div><div class="form-check form-check-inline">',
-                    'after' => '</div>',
-                    'options' => array(
-                        true => _txt('pl.grouperlite.form.template.value.positive'),
-                        false => _txt('pl.grouperlite.form.template.value.negative')
-                    ),
-                    'type' => 'radio',
-                    'default' => false
-                )
-            ); ?>
-        </div>
-    </fieldset>
-    <fieldset class="form-group row py-2 bg-light">
-        <legend class="col-form-label float-sm-left col-sm-3 py-0 d-flex align-items-center"><?php echo _txt('pl.grouperlite.form.template.add-project.label'); ?></legend>
-        <div class="col-sm-9 d-flex align-items-center">
-            <?php echo $this->Form->input(
-                'gsh_input_isJira',
-                array(
-                    'label' => true,
-                    'class' => 'form-check-input',
-                    'legend' => false,
-                    'id' => 'gsh_input_isJira',
-                    'before' => '<div class="form-check form-check-inline">',
-                    'separator' => '</div><div class="form-check form-check-inline">',
-                    'after' => '</div>',
-                    'options' => array(
-                        true => _txt('pl.grouperlite.form.template.value.positive'),
-                        false => _txt('pl.grouperlite.form.template.value.negative')
-                    ),
-                    'type' => 'radio',
-                    'default' => false
-                )
-            ); ?>
-        </div>
-    </fieldset>
-    <div class="form-group row py-2 bg-lighter">
-        <div class="col-sm-9 offset-sm-3">
-            <?php echo $this->Form->button(_txt('pl.grouperlite.form.group.action.save'), array(
-                'type' => 'submit',
-                'class' => 'btn btn-grouper btn-primary btn-lg btn-raised',
-                'id' => 'submit'
-            )); ?>
-        </div>
-    </div>
-</fieldset>
-<script type="text/javascript">
-    $(function() {
-        var sympaCheck = $('[name="data[gsh_input_isSympa]"]');
-
-        function isChecked(check) {
-            return check.filter(':checked').val() > 0 ? true : false;
-        }
-
-        function toggleSympaOptions(val) {
-            $('.sympa-option')[val ? 'fadeIn' : 'fadeOut'](250);
-        }
-
-        sympaCheck.change(function() {
-            var checked = isChecked(sympaCheck);
-            console.log(checked)
-            toggleSympaOptions(checked);
-        });
-
-        toggleSympaOptions(isChecked(sympaCheck));
-
-        /*$('#submit').on('click', function(ev) {
-            console.log($('#groupcreatetemplateformForm').serializeArray());
-            //ev.preventDefault();
-        });*/
-    });
-</script>
\ No newline at end of file
diff --git a/View/GrouperGroups/users.json b/View/GrouperGroups/users.json
deleted file mode 100644
index 6e08fee..0000000
--- a/View/GrouperGroups/users.json
+++ /dev/null
@@ -1,344 +0,0 @@
-[
-    {
-        "name": "Galena Munoz",
-        "email": "ipsum.cursus.vestibulum@urnaconvalliserat.net",
-        "cou": "Active, Member",
-        "org": "Eu Corporation"
-    },
-    {
-        "name": "Doris Santos",
-        "email": "vitae@non.org",
-        "cou": "Active, Filesource, Member",
-        "org": "Aliquam LLC"
-    },
-    {
-        "name": "Alma English",
-        "email": "pede.Cum.sociis@telluseu.net",
-        "cou": "Member, Active, Writer, Filesource",
-        "org": "Consectetuer Corp."
-    },
-    {
-        "name": "Halee Finley",
-        "email": "in.consectetuer.ipsum@parturientmontes.co.uk",
-        "cou": "Member",
-        "org": "Felis Ltd"
-    },
-    {
-        "name": "Austin Hardy",
-        "email": "iaculis@Donecegestas.co.uk",
-        "cou": "Writer",
-        "org": "Nonummy LLP"
-    },
-    {
-        "name": "Victor Powell",
-        "email": "nisi@eget.ca",
-        "cou": "Member, Active",
-        "org": "Praesent Interdum Ligula PC"
-    },
-    {
-        "name": "Baxter Estrada",
-        "email": "in.consequat.enim@vestibulum.co.uk",
-        "cou": "",
-        "org": "In Molestie Tortor Corporation"
-    },
-    {
-        "name": "Carlos Rose",
-        "email": "elit.elit@non.co.uk",
-        "cou": "Member, Writer, Filesource, Active",
-        "org": "Risus Nulla Eget LLP"
-    },
-    {
-        "name": "Ishmael Patton",
-        "email": "leo.Morbi@mollisnoncursus.co.uk",
-        "cou": "Writer, Filesource",
-        "org": "A Enim Suspendisse Consulting"
-    },
-    {
-        "name": "Ryder Tanner",
-        "email": "varius@rutrum.org",
-        "cou": "Writer, Filesource",
-        "org": "Ornare Elit Elit Consulting"
-    },
-    {
-        "name": "Dane Rollins",
-        "email": "Curabitur.consequat.lectus@Naminterdum.ca",
-        "cou": "Member",
-        "org": "Ut Pellentesque Consulting"
-    },
-    {
-        "name": "Brian Kaufman",
-        "email": "aliquet.vel@orciluctuset.edu",
-        "cou": "Filesource, Active",
-        "org": "Justo Eu Arcu Inc."
-    },
-    {
-        "name": "Lester Price",
-        "email": "Integer@idlibero.edu",
-        "cou": "Writer, Member, Active, Filesource",
-        "org": "Dapibus Rutrum Justo Incorporated"
-    },
-    {
-        "name": "Helen Cardenas",
-        "email": "Curabitur.egestas.nunc@quisdiam.org",
-        "cou": "Member, Active, Filesource",
-        "org": "Faucibus Morbi Vehicula Associates"
-    },
-    {
-        "name": "Hop Holloway",
-        "email": "non.arcu.Vivamus@nibhvulputate.org",
-        "cou": "Filesource, Active, Member",
-        "org": "Nunc Sed Pede Ltd"
-    },
-    {
-        "name": "Madeson Hendrix",
-        "email": "viverra@purus.com",
-        "cou": "",
-        "org": "Neque Venenatis Consulting"
-    },
-    {
-        "name": "Amity Navarro",
-        "email": "tincidunt.Donec@inconsequat.com",
-        "cou": "Writer",
-        "org": "Pretium Aliquet Consulting"
-    },
-    {
-        "name": "Cameron Booth",
-        "email": "nulla.magna@Quisqueporttitor.net",
-        "cou": "",
-        "org": "Fusce Associates"
-    },
-    {
-        "name": "Sybil Burgess",
-        "email": "Fusce.feugiat@sem.org",
-        "cou": "Writer, Member, Filesource, Active",
-        "org": "Curabitur Corporation"
-    },
-    {
-        "name": "Otto Cantrell",
-        "email": "Ut@nonarcu.org",
-        "cou": "",
-        "org": "Cursus PC"
-    },
-    {
-        "name": "Mannix Obrien",
-        "email": "eu.neque@egestasDuisac.ca",
-        "cou": "",
-        "org": "Amet Faucibus Corp."
-    },
-    {
-        "name": "Marcia Gill",
-        "email": "molestie.in.tempus@posuere.edu",
-        "cou": "",
-        "org": "Et Corp."
-    },
-    {
-        "name": "Tanek Figueroa",
-        "email": "diam@arcuSed.org",
-        "cou": "Active",
-        "org": "Bibendum Donec Ltd"
-    },
-    {
-        "name": "Ira Lynn",
-        "email": "aliquet@consequatpurusMaecenas.edu",
-        "cou": "Filesource",
-        "org": "Massa Suspendisse Eleifend Corporation"
-    },
-    {
-        "name": "Lesley Pittman",
-        "email": "iaculis.odio@Phasellus.edu",
-        "cou": "Member, Writer",
-        "org": "Urna Et Arcu PC"
-    },
-    {
-        "name": "Len Ryan",
-        "email": "ut.mi.Duis@sitamet.org",
-        "cou": "Writer, Filesource, Active",
-        "org": "Vestibulum Accumsan PC"
-    },
-    {
-        "name": "Sarah Morton",
-        "email": "dis.parturient@rhoncusProin.org",
-        "cou": "Active",
-        "org": "Amet Consectetuer PC"
-    },
-    {
-        "name": "Marny Hewitt",
-        "email": "dapibus@orciquis.ca",
-        "cou": "Active, Writer",
-        "org": "Ultricies Consulting"
-    },
-    {
-        "name": "Abel Lyons",
-        "email": "Proin.eget.odio@enim.org",
-        "cou": "Writer",
-        "org": "Amet Lorem Corporation"
-    },
-    {
-        "name": "Slade Schneider",
-        "email": "ante.dictum.cursus@turpisAliquamadipiscing.co.uk",
-        "cou": "",
-        "org": "Lacinia Company"
-    },
-    {
-        "name": "Ashton Arnold",
-        "email": "velit.justo@velitin.edu",
-        "cou": "",
-        "org": "Diam Ltd"
-    },
-    {
-        "name": "Phelan Goff",
-        "email": "ullamcorper.viverra.Maecenas@Donecporttitortellus.ca",
-        "cou": "",
-        "org": "Faucibus Id Libero Institute"
-    },
-    {
-        "name": "Graham Underwood",
-        "email": "Nulla.dignissim.Maecenas@Donecsollicitudin.ca",
-        "cou": "Filesource, Member",
-        "org": "Duis Gravida Praesent Ltd"
-    },
-    {
-        "name": "Alisa Scott",
-        "email": "ipsum.primis.in@erat.co.uk",
-        "cou": "Writer, Active",
-        "org": "Vivamus Non Lorem Inc."
-    },
-    {
-        "name": "Asher Mccray",
-        "email": "semper.auctor@nibhAliquamornare.edu",
-        "cou": "Writer, Member",
-        "org": "Orci Corporation"
-    },
-    {
-        "name": "Hanna Salas",
-        "email": "feugiat@purusactellus.net",
-        "cou": "",
-        "org": "Lectus Convallis Industries"
-    },
-    {
-        "name": "Jeremy Riley",
-        "email": "Ut.sagittis@necante.ca",
-        "cou": "Writer",
-        "org": "Luctus Curabitur LLP"
-    },
-    {
-        "name": "Violet Trevino",
-        "email": "vestibulum@nec.edu",
-        "cou": "",
-        "org": "Ligula Aenean Gravida Consulting"
-    },
-    {
-        "name": "Carissa Myers",
-        "email": "non@rhoncusDonec.co.uk",
-        "cou": "Member, Filesource",
-        "org": "Tempor Corporation"
-    },
-    {
-        "name": "Kadeem Osborn",
-        "email": "nulla.In@aliquameros.ca",
-        "cou": "Filesource, Active, Member, Writer",
-        "org": "Tempus Risus Donec PC"
-    },
-    {
-        "name": "Kiayada England",
-        "email": "ultrices.posuere@lectus.net",
-        "cou": "",
-        "org": "Orci Institute"
-    },
-    {
-        "name": "Connor Gardner",
-        "email": "diam.eu@tortorIntegeraliquam.org",
-        "cou": "Member, Active, Writer",
-        "org": "Vulputate Nisi Sem LLP"
-    },
-    {
-        "name": "Alfonso Casey",
-        "email": "montes.nascetur.ridiculus@risus.net",
-        "cou": "Member",
-        "org": "Sed Eu Nibh Consulting"
-    },
-    {
-        "name": "Avye Raymond",
-        "email": "mauris.sapien@tempusrisusDonec.co.uk",
-        "cou": "Active, Writer, Filesource, Member",
-        "org": "Amet Ante Incorporated"
-    },
-    {
-        "name": "Quamar Cross",
-        "email": "elit.pretium@Sedid.org",
-        "cou": "",
-        "org": "Dapibus PC"
-    },
-    {
-        "name": "Justine Kemp",
-        "email": "diam@ornare.org",
-        "cou": "Writer, Filesource",
-        "org": "Libero At Auctor Associates"
-    },
-    {
-        "name": "Blair Rush",
-        "email": "at.velit.Cras@pulvinar.ca",
-        "cou": "",
-        "org": "Nulla Tempor Associates"
-    },
-    {
-        "name": "Jael Travis",
-        "email": "ut.dolor.dapibus@vestibulumneceuismod.ca",
-        "cou": "",
-        "org": "Facilisis Lorem LLC"
-    },
-    {
-        "name": "Donovan Patel",
-        "email": "bibendum.ullamcorper@Sedeu.co.uk",
-        "cou": "Member, Filesource, Writer, Active",
-        "org": "Ipsum Sodales Incorporated"
-    },
-    {
-        "name": "Sylvester Brady",
-        "email": "amet@consequatauctornunc.net",
-        "cou": "",
-        "org": "Semper Nam Limited"
-    },
-    {
-        "name": "Yuri Eaton",
-        "email": "Nullam.lobortis.quam@Etiamligulatortor.com",
-        "cou": "",
-        "org": "Eu Elit Nulla LLP"
-    },
-    {
-        "name": "Bree Harmon",
-        "email": "libero.Integer@maurisaliquam.ca",
-        "cou": "Filesource, Active, Member, Writer",
-        "org": "Dui In Sodales PC"
-    },
-    {
-        "name": "Tanek Tucker",
-        "email": "arcu@Craslorem.org",
-        "cou": "Active, Member, Filesource",
-        "org": "Nisl Arcu Company"
-    },
-    {
-        "name": "Jermaine Stevens",
-        "email": "luctus@Donec.org",
-        "cou": "Active, Writer",
-        "org": "Pellentesque Sed Dictum Corp."
-    },
-    {
-        "name": "Ira Robinson",
-        "email": "malesuada.vel@lobortisClass.ca",
-        "cou": "Active, Member",
-        "org": "Ac Sem Ut Consulting"
-    },
-    {
-        "name": "Jocelyn Fulton",
-        "email": "tristique.senectus.et@faucibusorci.co.uk",
-        "cou": "Active, Member, Filesource, Writer",
-        "org": "Ante Ipsum Institute"
-    },
-    {
-        "name": "Tatyana Kelly",
-        "email": "a.facilisis.non@tortorat.ca",
-        "cou": "",
-        "org": "Donec Feugiat Limited"
-    }
-]
\ No newline at end of file
diff --git a/View/Layouts/Emails/html/default.ctp b/View/Layouts/Emails/html/default.ctp
deleted file mode 100644
index 747994a..0000000
--- a/View/Layouts/Emails/html/default.ctp
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
- * @link          https://cakephp.org CakePHP(tm) Project
- * @package       app.View.Layouts.Email.html
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       https://opensource.org/licenses/mit-license.php MIT License
- */
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<head>
-	<title><?php echo $this->fetch('title'); ?></title>
-</head>
-<body>
-	<?php echo $this->fetch('content'); ?>
-
-	<p>This email was sent using the <a href="https://cakephp.org">CakePHP Framework</a></p>
-</body>
-</html>
\ No newline at end of file
diff --git a/View/Layouts/Emails/text/default.ctp b/View/Layouts/Emails/text/default.ctp
deleted file mode 100644
index 82a1e19..0000000
--- a/View/Layouts/Emails/text/default.ctp
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
- * @link          https://cakephp.org CakePHP(tm) Project
- * @package       app.View.Layouts.Email.text
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       https://opensource.org/licenses/mit-license.php MIT License
- */
-?>
-<?php echo $this->fetch('content'); ?>
-
-This email was sent using the CakePHP Framework, https://cakephp.org.
diff --git a/View/Layouts/rss/default.ctp b/View/Layouts/rss/default.ctp
deleted file mode 100644
index 60a5365..0000000
--- a/View/Layouts/rss/default.ctp
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-if (!isset($channel)):
-	$channel = array();
-endif;
-if (!isset($channel['title'])):
-	$channel['title'] = $this->fetch('title');
-endif;
-
-echo $this->Rss->document(
-	$this->Rss->channel(
-		array(), $channel, $this->fetch('content')
-	)
-);
diff --git a/View/Layouts/xml/default.ctp b/View/Layouts/xml/default.ctp
deleted file mode 100644
index fbd5ee0..0000000
--- a/View/Layouts/xml/default.ctp
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $this->fetch('content'); ?>