diff --git a/src/components/modals/add-user-modal/AddUserModal.tsx b/src/components/modals/add-user-modal/AddUserModal.tsx
index c724720b..15c58b37 100644
--- a/src/components/modals/add-user-modal/AddUserModal.tsx
+++ b/src/components/modals/add-user-modal/AddUserModal.tsx
@@ -1,5 +1,5 @@
-import { Button, Col, Divider, Form, Input, Modal, notification, Row, Select, Switch } from 'antd';
-import { MouseEvent, useCallback, useEffect, useMemo, useState } from 'react';
+import { Button, Col, Divider, Form, Input, Modal, notification, Row, Switch } from 'antd';
+import { MouseEvent, useCallback, useEffect, useState } from 'react';
 import { useStore } from '@/store/store';
 import '../CustomModal.scss';
 import { extractErrorMsg } from '@/utils/ServiceUtils';
@@ -24,12 +24,6 @@ export default function AddUserModal({ isOpen, onCreateUser, onCancel }: AddUser
   const isAdminVal = Form.useWatch('isadmin', form);
   const passwordVal = Form.useWatch('password', form);
 
-  const userGroups = useMemo(() => {
-    const groups = new Set<string>();
-    users.forEach((u) => u.groups?.forEach((g) => groups.add(g)));
-    return Array.from(groups);
-  }, [users]);
-
   const resetModal = () => {
     form.resetFields();
   };
@@ -88,7 +82,7 @@ export default function AddUserModal({ isOpen, onCreateUser, onCancel }: AddUser
     >
       <Divider style={{ margin: '0px 0px 2rem 0px' }} />
       <div className="CustomModalBody">
-        <Form name="add-user-form" form={form} layout="vertical" initialValues={{ groups: ['*'] }}>
+        <Form name="add-user-form" form={form} layout="vertical" initialValues={{ groups: ['*'], isadmin: true }}>
           <Form.Item label="Username" name="username" rules={[{ required: true }]}>
             <Input placeholder="Username" />
           </Form.Item>
@@ -119,6 +113,7 @@ export default function AddUserModal({ isOpen, onCreateUser, onCancel }: AddUser
 
           <Form.Item label="Is admin" name="isadmin" valuePropName="checked">
             <Switch
+              disabled
               onChange={(newVal) => {
                 if (newVal) {
                   form.setFieldValue('networks', []);
@@ -127,59 +122,6 @@ export default function AddUserModal({ isOpen, onCreateUser, onCancel }: AddUser
             />
           </Form.Item>
 
-          {isServerEE && (
-            <Form.Item label="User groups">
-              <Row>
-                <Col xs={18}>
-                  <Form.Item name="groups" noStyle>
-                    <Select
-                      mode="multiple"
-                      placeholder="Groups"
-                      options={userGroups.map((g) => ({ label: g, value: g }))}
-                    />
-                  </Form.Item>
-                </Col>
-                <Col xs={6} style={{ textAlign: 'right' }}>
-                  <Button
-                    onClick={() => {
-                      form.setFieldValue('groups', userGroups);
-                    }}
-                  >
-                    Select All
-                  </Button>
-                </Col>
-              </Row>
-            </Form.Item>
-          )}
-
-          <Form.Item label="Allowed Networks">
-            <Row>
-              <Col xs={18}>
-                <Form.Item name="networks" noStyle>
-                  <Select
-                    disabled={isAdminVal}
-                    mode="multiple"
-                    placeholder="Networks"
-                    options={store.networks.map((n) => ({ label: n.netid, value: n.netid }))}
-                  />
-                </Form.Item>
-              </Col>
-              <Col xs={6} style={{ textAlign: 'right' }}>
-                <Button
-                  disabled={isAdminVal}
-                  onClick={() => {
-                    form.setFieldValue(
-                      'networks',
-                      store.networks.map((n) => n.netid)
-                    );
-                  }}
-                >
-                  Select All
-                </Button>
-              </Col>
-            </Row>
-          </Form.Item>
-
           <Row>
             <Col xs={24} style={{ textAlign: 'right' }}>
               <Form.Item>
diff --git a/src/pages/users/UsersPage.tsx b/src/pages/users/UsersPage.tsx
index a681c30d..8799b4bf 100644
--- a/src/pages/users/UsersPage.tsx
+++ b/src/pages/users/UsersPage.tsx
@@ -12,7 +12,6 @@ import {
   notification,
   Row,
   Skeleton,
-  Switch,
   Table,
   TableColumnsType,
   Tabs,
@@ -45,8 +44,6 @@ export default function UsersPage(props: PageProps) {
   const [userGroups, setUserGroups] = useState<UserGroup[]>([]);
   const [isLoading, setIsLoading] = useState(true);
   const [usersSearch, setUsersSearch] = useState('');
-  const [networksSearch, setNetworksSearch] = useState('');
-  const [groupSearch, setGroupSearch] = useState('');
   const [isAddGroupModalOpen, setIsAddGroupModalOpen] = useState(false);
   const [selectedGroup, setSelectedGroup] = useState<UserGroup | null>(null);
   const [isUpdateGroupModalOpen, setIsUpdateGroupModalOpen] = useState(false);
@@ -105,39 +102,11 @@ export default function UsersPage(props: PageProps) {
     [notify]
   );
 
-  const confirmDeleteGroup = useCallback(
-    async (group: UserGroup) => {
-      Modal.confirm({
-        title: 'Delete user group',
-        content: `Are you sure you want to delete group ${group}?`,
-        onOk: async () => {
-          try {
-            await UsersService.deleteUserGroup(group);
-            notify.success({ message: `User group ${group} deleted` });
-            loadUsers();
-            loadUserGroups();
-          } catch (err) {
-            notify.error({
-              message: 'Failed to delete user group',
-              description: extractErrorMsg(err as any),
-            });
-          }
-        },
-      });
-    },
-    [loadUserGroups, loadUsers, notify]
-  );
-
   const onEditUser = useCallback((user: User) => {
     setSelectedUser(user);
     setIsUpdateUserModalOpen(true);
   }, []);
 
-  const onEditGroup = useCallback((group: UserGroup) => {
-    setSelectedGroup(group);
-    setIsUpdateGroupModalOpen(true);
-  }, []);
-
   const onAddUser = useCallback(() => {
     if (isSaasBuild) {
       window.location = getAmuiUrl('invite-user') as any;
@@ -159,25 +128,10 @@ export default function UsersPage(props: PageProps) {
       },
       {
         title: 'Role',
-        width: '10rem',
         render(_, user) {
           return <Tag color={user.isadmin ? 'warning' : 'default'}>{user.isadmin ? 'Admin' : 'User'}</Tag>;
         },
       },
-      {
-        title: 'Networks',
-        render(_, user) {
-          return <Typography.Text>{user.isadmin ? 'n/a' : user.networks?.join(', ')}</Typography.Text>;
-        },
-      },
-      isServerEE
-        ? {
-            title: 'Groups',
-            render(_, user) {
-              return <Typography.Text>{user.groups?.join(', ')}</Typography.Text>;
-            },
-          }
-        : {},
       {
         width: '1rem',
         render(_, user) {
@@ -222,166 +176,15 @@ export default function UsersPage(props: PageProps) {
         },
       },
     ],
-    [confirmDeleteUser, isServerEE, onEditUser, store.username]
-  );
-
-  const networksTableColumns: TableColumnsType<Network> = useMemo(
-    () => [
-      {
-        title: 'Network',
-        dataIndex: 'netid',
-        render(_, network) {
-          return (
-            <Typography.Link
-              onClick={() => {
-                setSelectedNetwork(network);
-                setIsNetworkPermissionsModalOpen(true);
-              }}
-            >
-              {network.netid}
-            </Typography.Link>
-          );
-        },
-        sorter(a, b) {
-          return a.netid.localeCompare(b.netid);
-        },
-        defaultSortOrder: 'ascend',
-      },
-      {
-        title: 'Default Access Level',
-        render(_, network) {
-          switch (network.prosettings?.defaultaccesslevel) {
-            case 0:
-              return <Tag>0 - Network Admin</Tag>;
-            case 1:
-              return <Tag>1 - Host Access</Tag>;
-            case 2:
-              return <Tag>2 - Client Access</Tag>;
-            case 3:
-              return <Tag>3 - No Access</Tag>;
-          }
-        },
-        sorter(a, b) {
-          return (a.prosettings?.defaultaccesslevel ?? 0) - (b.prosettings?.defaultaccesslevel ?? 0);
-        },
-      },
-      {
-        title: 'Allowed Groups',
-        render(_, network) {
-          return network.prosettings?.allowedgroups.length;
-        },
-        sorter(a, b) {
-          return (a.prosettings?.allowedgroups.length ?? 0) - (b.prosettings?.allowedgroups.length ?? 0);
-        },
-      },
-      {
-        title: 'Allowed Users',
-        render(_, network) {
-          return network.prosettings?.allowedusers.length;
-        },
-        sorter(a, b) {
-          return (a.prosettings?.allowedusers.length ?? 0) - (b.prosettings?.allowedusers.length ?? 0);
-        },
-      },
-    ],
-    []
-  );
-
-  const groupTableCols: TableColumnsType<{ name: UserGroup }> = useMemo(
-    () => [
-      {
-        title: 'Name',
-        render(_, group) {
-          return <Typography.Text>{group.name}</Typography.Text>;
-        },
-        sorter(a, b) {
-          return a.name.localeCompare(b.name);
-        },
-        defaultSortOrder: 'ascend',
-      },
-      {
-        title: 'Users',
-        render(_, group) {
-          let usersCount = 0;
-          users.forEach((u) => {
-            if (u.groups?.includes(group.name)) {
-              usersCount++;
-            }
-          });
-          return <Typography.Text>{usersCount}</Typography.Text>;
-        },
-      },
-      {
-        width: '1rem',
-        render(_, group) {
-          return (
-            <Dropdown
-              placement="bottomRight"
-              menu={{
-                items: [
-                  {
-                    key: 'edit',
-                    label: 'Edit',
-                    onClick: (ev) => {
-                      ev.domEvent.stopPropagation();
-                      onEditGroup(group.name);
-                    },
-                  },
-                  {
-                    key: 'delete',
-                    label: (
-                      <Typography.Text
-                        onClick={(ev) => {
-                          ev.stopPropagation();
-                          confirmDeleteGroup(group.name);
-                        }}
-                      >
-                        Delete
-                      </Typography.Text>
-                    ),
-                  },
-                ] as MenuProps['items'],
-              }}
-            >
-              <Button type="text" icon={<MoreOutlined />} />
-            </Dropdown>
-          );
-        },
-      },
-    ],
-    [confirmDeleteGroup, onEditGroup, users]
+    [confirmDeleteUser, onEditUser, store.username]
   );
 
-  const usersTableCols2 = usersTableColumns;
-
   const filteredUsers = useMemo(() => {
     return users.filter((u) => {
       return u.username.toLowerCase().includes(usersSearch.trim().toLowerCase());
     });
   }, [users, usersSearch]);
 
-  const filteredNetworks = useMemo(
-    () => store.networks.filter((net) => net.netid.toLocaleLowerCase().includes(networksSearch.trim().toLowerCase())),
-    [store.networks, networksSearch]
-  );
-
-  const filteredGroups = useMemo(() => {
-    return userGroups
-      .map((g) => ({ name: g }))
-      .filter((g) => g.name.toLowerCase().includes(groupSearch.trim().toLowerCase()));
-  }, [groupSearch, userGroups]);
-
-  const filteredGroupUsers = useMemo(() => {
-    if (selectedGroup) {
-      return users.filter((u) => u.groups?.includes(selectedGroup));
-    }
-    const groupsMap = filteredGroups.reduce((acc, g) => {
-      acc[g.name] = true;
-      return acc;
-    }, {} as Record<UserGroup, boolean>);
-    return users.filter((u) => u.groups?.some((g) => groupsMap[g]));
-  }, [filteredGroups, selectedGroup, users]);
-
   // ui components
   const getUsersContent = useCallback(() => {
     return (
@@ -411,140 +214,15 @@ export default function UsersPage(props: PageProps) {
     );
   }, [filteredUsers, usersSearch, usersTableColumns, onAddUser]);
 
-  const getNetworkPermissionsContent = useCallback(() => {
-    return (
-      <>
-        <Row>
-          <Col xs={24} md={8}>
-            <Input
-              size="large"
-              placeholder="Search networks"
-              prefix={<SearchOutlined />}
-              value={networksSearch}
-              onChange={(ev) => setNetworksSearch(ev.target.value)}
-            />
-          </Col>
-        </Row>
-        <Row className="" style={{ marginTop: '1rem' }}>
-          <Col xs={24}>
-            <Table columns={networksTableColumns} dataSource={filteredNetworks} rowKey="netid" />
-          </Col>
-        </Row>
-      </>
-    );
-  }, [networksSearch, networksTableColumns, filteredNetworks]);
-
-  const getGroupsContent = useCallback(() => {
-    return (
-      <Row style={{ width: '100%' }}>
-        <Col xs={24} style={{ marginBottom: '2rem' }}>
-          <Input
-            placeholder="Search group"
-            value={groupSearch}
-            onChange={(ev) => setGroupSearch(ev.target.value)}
-            prefix={<SearchOutlined />}
-            style={{ width: '30%' }}
-          />
-        </Col>
-        <Col xs={12}>
-          <Row style={{ width: '100%' }}>
-            <Col xs={12}>
-              <Typography.Title style={{ marginTop: '0px' }} level={5}>
-                Groups
-              </Typography.Title>
-            </Col>
-            <Col xs={11} style={{ textAlign: 'right' }}>
-              <Button type="primary" onClick={() => setIsAddGroupModalOpen(true)}>
-                <PlusOutlined /> Create Group
-              </Button>
-            </Col>
-          </Row>
-          <Row style={{ marginTop: '1rem' }}>
-            <Col xs={23}>
-              <Table
-                columns={groupTableCols}
-                dataSource={filteredGroups}
-                rowKey={(group) => group.name}
-                size="small"
-                rowClassName={(group) => {
-                  return group.name === selectedGroup ? 'selected-row' : '';
-                }}
-                onRow={(group) => {
-                  return {
-                    onClick: () => {
-                      if (selectedGroup === group.name) setSelectedGroup(null);
-                      else setSelectedGroup(group.name);
-                    },
-                  };
-                }}
-              />
-            </Col>
-          </Row>
-        </Col>
-        <Col xs={12}>
-          <Row style={{ width: '100%' }}>
-            <Col xs={12}>
-              <Typography.Title style={{ marginTop: '0px' }} level={5}>
-                Users
-              </Typography.Title>
-            </Col>
-            <Col xs={12} style={{ textAlign: 'right' }}>
-              {selectedGroup && (
-                <Button
-                  type="primary"
-                  style={{ marginRight: '1rem' }}
-                  onClick={() => {
-                    onEditGroup(selectedGroup);
-                  }}
-                >
-                  <PlusOutlined /> Add user to group
-                </Button>
-              )}
-              Display All{' '}
-              <Switch
-                title="Display all user groups. Click a group to filter users only under that group."
-                checked={selectedGroup === null}
-                onClick={() => {
-                  setSelectedGroup(null);
-                }}
-              />
-            </Col>
-          </Row>
-          <Row style={{ marginTop: '1rem' }}>
-            <Col xs={24}>
-              <Table columns={usersTableCols2} dataSource={filteredGroupUsers} rowKey="username" size="small" />
-            </Col>
-          </Row>
-        </Col>
-      </Row>
-    );
-  }, [filteredGroupUsers, filteredGroups, groupSearch, groupTableCols, onEditGroup, selectedGroup, usersTableCols2]);
-
   const tabs: TabsProps['items'] = useMemo(
-    () =>
-      [
-        {
-          key: 'users',
-          label: 'Users',
-          children: getUsersContent(),
-        },
-      ].concat(
-        isServerEE
-          ? [
-              {
-                key: 'network-permissions',
-                label: 'Network Permissions',
-                children: getNetworkPermissionsContent(),
-              },
-              {
-                key: 'groups',
-                label: 'Groups',
-                children: getGroupsContent(),
-              },
-            ]
-          : []
-      ),
-    [getUsersContent, isServerEE, getNetworkPermissionsContent, getGroupsContent]
+    () => [
+      {
+        key: 'users',
+        label: 'Users',
+        children: getUsersContent(),
+      },
+    ],
+    [getUsersContent]
   );
 
   useEffect(() => {