diff --git a/frontend/src/app/components/containers/admin/user-management/add-user-search.tsx b/frontend/src/app/components/containers/admin/user-management/add-user-search.tsx
index 11e543152..4dfd047db 100644
--- a/frontend/src/app/components/containers/admin/user-management/add-user-search.tsx
+++ b/frontend/src/app/components/containers/admin/user-management/add-user-search.tsx
@@ -9,19 +9,8 @@ import { CompInput } from "@/app/components/common/comp-input";
 import "@assets/sass/user-management.scss";
 
 interface AddUserSearchProps {
-  officers: any;
-  officer: any;
-  officerError: string;
-  userIdirs: any;
-  officerGuid: any;
   setOfficer: Dispatch<SetStateAction<Option | undefined>>;
-  setOfficerError: Dispatch<SetStateAction<string>>;
-  getUserIdir: (person_guid: string, lastName: string, firstName: string) => Promise<void>;
-  setSelectedUserIdir: Dispatch<SetStateAction<string>>;
-  updateUserIdirByOfficerId: (userIdir: string, officerGuid: string) => Promise<void>;
-  handleAddNewUserDetails: () => void;
   handleCancel: () => void;
-  handleAddNewUser: () => void;
   goToEditView: () => void;
   setIsInAddUserView: Dispatch<SetStateAction<boolean>>;
   setNewUser: Dispatch<SetStateAction<CssUser | null>>;
@@ -29,17 +18,6 @@ interface AddUserSearchProps {
 
 export const AddUserSearch: FC<AddUserSearchProps> = ({
   setOfficer,
-  setOfficerError,
-  getUserIdir,
-  handleAddNewUser,
-  officers,
-  officer,
-  officerError,
-  userIdirs,
-  setSelectedUserIdir,
-  updateUserIdirByOfficerId,
-  officerGuid,
-  handleAddNewUserDetails,
   handleCancel,
   goToEditView,
   setIsInAddUserView,
diff --git a/frontend/src/app/components/containers/admin/user-management/edit-user.tsx b/frontend/src/app/components/containers/admin/user-management/edit-user.tsx
index 6ff95598c..f388ea6e3 100644
--- a/frontend/src/app/components/containers/admin/user-management/edit-user.tsx
+++ b/frontend/src/app/components/containers/admin/user-management/edit-user.tsx
@@ -1,4 +1,4 @@
-import { FC, useEffect, useState } from "react";
+import { Dispatch, FC, SetStateAction, useEffect, useState } from "react";
 import { Button } from "react-bootstrap";
 import { useAppDispatch, useAppSelector } from "@hooks/hooks";
 import { assignOfficerToOffice, createOfficer, getOfficers, selectOfficerByPersonGuid } from "@store/reducers/officer";
@@ -12,10 +12,11 @@ import { CEEB_ROLE_OPTIONS, COS_ROLE_OPTIONS, ROLE_OPTIONS } from "@constants/ce
 import { generateApiParameters, get, patch } from "@common/api";
 import config from "@/config";
 import { ValidationMultiSelect } from "@common/validation-multiselect";
-import "@assets/sass/user-management.scss";
 import { AgencyType } from "@/app/types/app/agency-types";
-import { CssUser, NewOfficer } from "@/app/types/person/person";
+import { CssUser } from "@/app/types/person/person";
+import { NewOfficer } from "@/app/types/person/new-officer";
 import { TOGGLE_DEACTIVATE } from "@/app/types/modal/modal-types";
+import "@assets/sass/user-management.scss";
 
 interface EditUserProps {
   officer: Option;
@@ -23,9 +24,17 @@ interface EditUserProps {
   newUser: CssUser | null;
   handleCancel: () => void;
   goToSearchView: () => void;
+  setOfficer: Dispatch<SetStateAction<Option | undefined>>;
 }
 
-export const EditUser: FC<EditUserProps> = ({ officer, isInAddUserView, newUser, handleCancel, goToSearchView }) => {
+export const EditUser: FC<EditUserProps> = ({
+  officer,
+  isInAddUserView,
+  newUser,
+  handleCancel,
+  goToSearchView,
+  setOfficer,
+}) => {
   const dispatch = useAppDispatch();
   const officerData = useAppSelector(selectOfficerByPersonGuid(officer.value));
   const officeAssignments = useAppSelector(selectOfficesForAssignmentDropdown);
@@ -88,7 +97,7 @@ export const EditUser: FC<EditUserProps> = ({ officer, isInAddUserView, newUser,
         if (hasCEEBRole) {
           currentAgency = mapAgencyDropDown(AgencyType.CEEB, agency);
           const currentTeam = await getUserCurrentTeam(officerData.officer_guid);
-          if (currentTeam && currentTeam.team_guid) {
+          if (currentTeam?.team_guid) {
             const currentTeamMapped = mapAgencyDropDown(currentTeam.team_guid.team_code.team_code, teams);
             setSelectedTeam(currentTeamMapped);
           }
@@ -230,88 +239,94 @@ export const EditUser: FC<EditUserProps> = ({ officer, isInAddUserView, newUser,
 
       if (newUser) {
         //create new officer
-        const newOfficerData: NewOfficer = {
-          user_id: newUser.attributes.idir_username[0],
-          create_user_id: adminIdirUsername,
-          create_utc_timestamp: new Date(),
-          update_user_id: adminIdirUsername,
-          update_utc_timestamp: new Date(),
-          auth_user_guid: newUser.username.slice(0, -5),
-          office_guid: selectedOffice?.value ?? null,
-          team_code: selectedTeam?.value ?? null,
-          person_guid: {
-            first_name: newUser.firstName,
-            middle_name_1: null,
-            middle_name_2: null,
-            last_name: newUser.lastName,
-            create_user_id: adminIdirUsername,
-            create_utc_timestamp: new Date(),
-            update_user_id: adminIdirUsername,
-            updateTimestamp: new Date(),
-          },
-          roles: {
-            user_roles: mapRoles,
-            user_idir: newUser.username,
-          },
-          coms_enrolled_ind: false,
-          deactivate_ind: false,
-        };
-        dispatch(createOfficer(newOfficerData));
+        addNewOfficer(newUser, mapRoles);
       } else {
         //update existing officer
         const selectedUserAgency = currentAgency ?? selectedAgency;
         const selectedUserIdir = `${officerData?.auth_user_guid.split("-").join("")}@idir`;
+        await updateOfficer(selectedUserAgency, selectedUserIdir, mapRoles);
+      }
+      resetSelect();
+      goToSearchView();
+      setOfficer({ value: "", label: "" }); //reset select from search view
+    }
+  };
 
-        switch (selectedUserAgency?.value) {
-          case "EPO": {
-            if (selectedTeam && selectedRoles) {
-              let res = await updateTeamRole(
-                selectedUserIdir,
-                officerData?.officer_guid,
-                selectedUserAgency.value,
-                selectedTeam?.value,
-                mapRoles,
-              );
-
-              if (res?.team && res?.roles) {
-                ToggleSuccess("Officer updated successfully");
-              } else {
-                ToggleError("Unable to update");
-              }
-            }
-            break;
-          }
-          case "PARKS": {
-            break;
-          }
-          case "COS":
-          default: {
-            const officerId = officer?.value ? officer.value : "";
-            const officeId = selectedOffice?.value ? selectedOffice.value : "";
-            dispatch(assignOfficerToOffice(officerId, officeId));
-            const mapRoles = selectedRoles?.map((role) => {
-              return { name: role.value };
-            });
-            let res = await updateTeamRole(
-              selectedUserIdir,
-              officerData?.officer_guid,
-              selectedUserAgency?.value,
-              null,
-              mapRoles,
-            );
-
-            if (res?.roles) {
-              dispatch(getOfficers());
-              ToggleSuccess("Officer updated successfully");
-            } else {
-              ToggleError("Unable to update");
-            }
-            break;
+  const addNewOfficer = (newUser: CssUser, mapRoles: Array<{ name: string | undefined }>) => {
+    const newOfficerData: NewOfficer = {
+      user_id: newUser.attributes.idir_username[0],
+      create_user_id: adminIdirUsername,
+      create_utc_timestamp: new Date(),
+      update_user_id: adminIdirUsername,
+      update_utc_timestamp: new Date(),
+      auth_user_guid: newUser.username.slice(0, -5),
+      office_guid: selectedOffice?.value ?? null,
+      team_code: selectedTeam?.value ?? null,
+      person_guid: {
+        first_name: newUser.firstName,
+        middle_name_1: null,
+        middle_name_2: null,
+        last_name: newUser.lastName,
+        create_user_id: adminIdirUsername,
+        create_utc_timestamp: new Date(),
+        update_user_id: adminIdirUsername,
+        updateTimestamp: new Date(),
+      },
+      roles: {
+        user_roles: mapRoles,
+        user_idir: newUser.username,
+      },
+      coms_enrolled_ind: false,
+      deactivate_ind: false,
+    };
+    dispatch(createOfficer(newOfficerData));
+  };
+
+  const updateOfficer = async (
+    selectedUserAgency: Option | null,
+    selectedUserIdir: string,
+    mapRoles: Array<{ name: string | undefined }>,
+  ) => {
+    switch (selectedUserAgency?.value) {
+      case "EPO": {
+        if (selectedTeam && selectedRoles) {
+          let res = await updateTeamRole(
+            selectedUserIdir,
+            officerData?.officer_guid,
+            selectedUserAgency.value,
+            selectedTeam?.value,
+            mapRoles,
+          );
+
+          if (res?.team && res?.roles) {
+            ToggleSuccess("Officer updated successfully");
+          } else {
+            ToggleError("Unable to update");
           }
         }
+        break;
+      }
+      case "COS":
+      default: {
+        const officerId = officer?.value ? officer.value : "";
+        const officeId = selectedOffice?.value ? selectedOffice.value : "";
+        dispatch(assignOfficerToOffice(officerId, officeId));
+        let res = await updateTeamRole(
+          selectedUserIdir,
+          officerData?.officer_guid,
+          selectedUserAgency?.value,
+          null,
+          mapRoles,
+        );
+
+        if (res?.roles) {
+          dispatch(getOfficers());
+          ToggleSuccess("Officer updated successfully");
+        } else {
+          ToggleError("Unable to update");
+        }
+        break;
       }
-      resetSelect();
-      goToSearchView();
     }
   };
 
diff --git a/frontend/src/app/components/containers/admin/user-management/index.tsx b/frontend/src/app/components/containers/admin/user-management/index.tsx
index db98323e4..719035611 100644
--- a/frontend/src/app/components/containers/admin/user-management/index.tsx
+++ b/frontend/src/app/components/containers/admin/user-management/index.tsx
@@ -1,17 +1,9 @@
 import { FC, useEffect, useState } from "react";
 import { useAppDispatch, useAppSelector } from "@hooks/hooks";
-import { assignOfficerToOffice, selectOfficersDropdown } from "@store/reducers/officer";
 import Option from "@apptypes/app/option";
-import { fetchOfficeAssignments, selectOfficesForAssignmentDropdown, selectOffices } from "@store/reducers/office";
 import { ToastContainer } from "react-toastify";
-import { ToggleError, ToggleSuccess } from "@common/toast";
 import { clearNotification, selectNotification } from "@store/reducers/app";
-import { selectAgencyDropdown, selectTeamDropdown } from "@store/reducers/code-table";
-import { ROLE_OPTIONS } from "@constants/ceeb-roles";
-import { generateApiParameters, get, patch } from "@common/api";
-import config from "@/config";
-import { CssUser, Officer } from "@apptypes/person/person";
-import { UUID } from "crypto";
+import { CssUser } from "@apptypes/person/person";
 import { SelectUser } from "@/app/components/containers/admin/user-management/select-user";
 import { EditUser } from "@/app/components/containers/admin/user-management/edit-user";
 import { AddUserSearch } from "@/app/components/containers/admin/user-management/add-user-search";
@@ -23,45 +15,14 @@ export const UserManagement: FC = () => {
   const ADD_USER_SEARCH_VIEW = 2;
 
   const dispatch = useAppDispatch();
-  const officers = useAppSelector(selectOfficersDropdown(true));
-  const officeAssignments = useAppSelector(selectOfficesForAssignmentDropdown);
   const notification = useAppSelector(selectNotification);
-  const agency = useAppSelector(selectAgencyDropdown);
-
-  const availableOffices = useAppSelector(selectOffices);
 
   const [viewState, setViewState] = useState<number>(SEARCH_VIEW);
   const [officer, setOfficer] = useState<Option>();
   const [officerError, setOfficerError] = useState<string>("");
-  const [office, setOffice] = useState<Option>();
-  const [officeError, setOfficeError] = useState<string>("");
-  const [selectedAgency, setSelectedAgency] = useState<Option | null>();
-  const [selectedTeam, setSelectedTeam] = useState<Option>();
-  const [selectedRoles, setSelectedRoles] = useState<Array<Option>>();
-  const [userIdirs, setUserIdirs] = useState<any[]>([]);
-  const [selectedUserIdir, setSelectedUserIdir] = useState<string>("");
-  const [officerGuid, setOfficerGuid] = useState<string>("");
-  const [offices, setOffices] = useState<Array<Option>>([]);
   const [isInAddUserView, setIsInAddUserView] = useState<boolean>(false);
   const [newUser, setNewUser] = useState<CssUser | null>(null);
 
-  useEffect(() => {
-    if (officeAssignments) {
-      dispatch(fetchOfficeAssignments());
-      let options = availableOffices.map((item) => {
-        const { id, name, agency } = item;
-        const record: Option = {
-          label: `${agency} - ${name}`,
-          value: id,
-        };
-
-        return record;
-      });
-      setOffices(options);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [dispatch]);
-
   useEffect(() => {
     const { type } = notification;
     if (type !== "") {
@@ -69,118 +30,10 @@ export const UserManagement: FC = () => {
     }
   }, [dispatch, notification]);
 
-  useEffect(() => {
-    (async () => {
-      if (officerGuid && selectedUserIdir && agency) {
-        const current = await getUserCurrentSetting(selectedUserIdir, officerGuid);
-        const currentUserAgency = mapAgencyDropDown(current.agency, agency);
-        setSelectedAgency(currentUserAgency);
-        if (current.agency === "EPO") setSelectedTeam(current.team);
-        if (current.roles) {
-          const currentUserRoles = mapRolesDropdown(current.roles);
-          setSelectedRoles(currentUserRoles);
-        }
-
-        if (current.agency) {
-          let filtered = availableOffices
-            .filter((item) => item.code === current.agency)
-            .map((item) => {
-              const { id, name, agency } = item;
-              const record: Option = {
-                label: `${agency} - ${name}`,
-                value: id,
-              };
-
-              return record;
-            });
-
-          setOffices(filtered);
-        }
-      }
-    })();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [officerGuid, selectedUserIdir]);
-
-  const mapRolesDropdown = (userRoles: any): Option[] => {
-    let result: Option[] = [];
-    ROLE_OPTIONS.forEach((roleOption) => {
-      const found = userRoles.some((role: any) => role.name === roleOption.value);
-      if (found) result.push(roleOption);
-    });
-    return result;
-  };
-
-  const mapAgencyDropDown = (userAgency: any, agencyList: Option[]) => {
-    const result = agencyList.find((agencyItem: Option) => agencyItem.value === userAgency);
-    return result ?? null;
-  };
-
-  const getUserIdir = async (person_guid: string, lastName: string, firstName: string) => {
-    const parameters = generateApiParameters(`${config.API_BASE_URL}/v1/officer/find-by-person-guid/${person_guid}`);
-    const officerRes = await get<Officer>(dispatch, parameters);
-    setOfficerGuid(officerRes.officer_guid);
-    if (officerRes.auth_user_guid) {
-      setSelectedUserIdir(`${officerRes.auth_user_guid.split("-").join("")}@idir`);
-    } else {
-      const parameters = generateApiParameters(`${config.API_BASE_URL}/v1/team/find-user`, { firstName, lastName });
-      const response: any = await get(dispatch, parameters);
-      if (response.length === 0) setOfficerError("Cannot find user idir.");
-      else if (response.length === 1) {
-        setSelectedUserIdir(response[0].username);
-        await updateUserIdirByOfficerId(response[0].username.split("@")[0], officerRes.officer_guid);
-      } else setUserIdirs(response);
-    }
-  };
-
-  const getUserCurrentSetting = async (userIdir: any, officerGuid: any) => {
-    const parameters = generateApiParameters(`${config.API_BASE_URL}/v1/team/current`, { userIdir, officerGuid });
-    const response: any = await get(dispatch, parameters);
-    return response;
-  };
-
-  const updateUserIdirByOfficerId = async (userIdir: string, officerGuid: string) => {
-    const parameters = generateApiParameters(`${config.API_BASE_URL}/v1/officer/${officerGuid}`, {
-      auth_user_guid: userIdir as UUID,
-    });
-    const response = await patch<Officer>(dispatch, parameters);
-    if (!response.auth_user_guid) {
-      setOfficerError("Error updating officer idir.");
-    }
-  };
-
-  const updateTeamRole = async (
-    userIdir: string,
-    officerGuid: string,
-    agencyCode: string | undefined,
-    teamCode: string | undefined | null,
-    roles: Array<{ name: string | undefined }> | undefined,
-  ) => {
-    const parameters = generateApiParameters(`${config.API_BASE_URL}/v1/team/update/${officerGuid}`, {
-      userIdir,
-      agencyCode,
-      teamCode,
-      roles,
-    });
-    const response: any = await patch(dispatch, parameters);
-    return response;
-  };
-
   const resetValidationErrors = () => {
-    setOfficeError("");
     setOfficerError("");
   };
 
-  const validateUserAssignment = (): boolean => {
-    resetValidationErrors();
-    if (!officer) {
-      setOfficerError("User is required");
-    }
-    if (selectedAgency?.value === "COS" && !office) {
-      setOfficeError("Office is required");
-    }
-    return officeError === "" && officerError === "";
-  };
-
   const handleEdit = () => {
     setViewState(EDIT_VIEW);
     setIsInAddUserView(false);
@@ -202,11 +55,6 @@ export const UserManagement: FC = () => {
     setViewState(ADD_USER_SEARCH_VIEW);
   };
 
-  const handleAddNewUserDetails = () => {
-    setViewState(EDIT_VIEW);
-    setIsInAddUserView(true);
-  };
-
   const goToSearchView = () => {
     setViewState(SEARCH_VIEW);
   };
@@ -215,33 +63,16 @@ export const UserManagement: FC = () => {
     setViewState(EDIT_VIEW);
   };
 
-  const resetSelect = () => {
-    setSelectedAgency({ value: "", label: "" });
-    setSelectedTeam({ value: "", label: "" });
-    setOfficeError("");
-    setOfficerError("");
-    setSelectedUserIdir("");
-    setUserIdirs([]);
-    setOfficerGuid("");
-    setOffice({ value: "", label: "" });
-    setSelectedRoles([]);
-  };
-
   return (
     <>
       <ToastContainer />
       {viewState === SEARCH_VIEW && (
         <SelectUser
           setOfficer={setOfficer}
-          setOfficerError={setOfficeError}
-          getUserIdir={getUserIdir}
+          setOfficerError={setOfficerError}
           handleAddNewUser={handleAddNewUser}
           officer={officer}
           officerError={officerError}
-          userIdirs={userIdirs}
-          setSelectedUserIdir={setSelectedUserIdir}
-          updateUserIdirByOfficerId={updateUserIdirByOfficerId}
-          officerGuid={officerGuid}
           handleEdit={handleEdit}
         />
       )}
@@ -252,22 +83,12 @@ export const UserManagement: FC = () => {
           handleCancel={handleCancel}
           goToSearchView={goToSearchView}
           newUser={newUser}
+          setOfficer={setOfficer}
         />
       )}
       {viewState === ADD_USER_SEARCH_VIEW && (
         <AddUserSearch
           setOfficer={setOfficer}
-          setOfficerError={setOfficeError}
-          getUserIdir={getUserIdir}
-          handleAddNewUser={handleAddNewUser}
-          officers={officers}
-          officer={officer}
-          officerError={officerError}
-          userIdirs={userIdirs}
-          setSelectedUserIdir={setSelectedUserIdir}
-          updateUserIdirByOfficerId={updateUserIdirByOfficerId}
-          officerGuid={officerGuid}
-          handleAddNewUserDetails={handleAddNewUserDetails}
           handleCancel={handleCancel}
           goToEditView={goToEditView}
           setIsInAddUserView={setIsInAddUserView}
diff --git a/frontend/src/app/components/containers/admin/user-management/select-user.tsx b/frontend/src/app/components/containers/admin/user-management/select-user.tsx
index 96e628fe2..e9f32001f 100644
--- a/frontend/src/app/components/containers/admin/user-management/select-user.tsx
+++ b/frontend/src/app/components/containers/admin/user-management/select-user.tsx
@@ -1,34 +1,17 @@
-import { Dispatch, FC, Fragment, SetStateAction, useEffect, useState } from "react";
+import { Dispatch, FC, SetStateAction } from "react";
 import { Button } from "react-bootstrap";
-import { useAppDispatch, useAppSelector } from "@hooks/hooks";
-import { assignOfficerToOffice, selectOfficers, selectOfficersDropdown } from "@store/reducers/officer";
+import { useAppSelector } from "@hooks/hooks";
+import { selectOfficers } from "@store/reducers/officer";
 import { CompSelect } from "@components/common/comp-select";
 import Option from "@apptypes/app/option";
-import { fetchOfficeAssignments, selectOfficesForAssignmentDropdown, selectOffices } from "@store/reducers/office";
-import { ToastContainer } from "react-toastify";
-import { ToggleError, ToggleSuccess } from "@common/toast";
-import { clearNotification, selectNotification } from "@store/reducers/app";
-import { selectAgencyDropdown, selectTeamDropdown } from "@store/reducers/code-table";
-import { ROLE_OPTIONS } from "@constants/ceeb-roles";
-import { generateApiParameters, get, patch } from "@common/api";
-import config from "@/config";
 import { Officer } from "@apptypes/person/person";
-import { UUID } from "crypto";
-import { ValidationMultiSelect } from "@common/validation-multiselect";
 import "@assets/sass/user-management.scss";
-import { AsyncTypeahead, Typeahead } from "react-bootstrap-typeahead";
-import Select, { OptionProps, StylesConfig, components } from "react-select";
 
 interface SelectUserProps {
   officer: any;
   officerError: string;
-  userIdirs: any;
-  officerGuid: any;
   setOfficer: Dispatch<SetStateAction<Option | undefined>>;
   setOfficerError: Dispatch<SetStateAction<string>>;
-  getUserIdir: (person_guid: string, lastName: string, firstName: string) => Promise<void>;
-  setSelectedUserIdir: Dispatch<SetStateAction<string>>;
-  updateUserIdirByOfficerId: (userIdir: string, officerGuid: string) => Promise<void>;
   handleEdit: () => void;
   handleAddNewUser: () => void;
 }
@@ -39,10 +22,6 @@ export const SelectUser: FC<SelectUserProps> = ({
   handleAddNewUser,
   officer,
   officerError,
-  userIdirs,
-  setSelectedUserIdir,
-  updateUserIdirByOfficerId,
-  officerGuid,
   handleEdit,
 }) => {
   const officers = useAppSelector(selectOfficers);
diff --git a/frontend/src/app/store/reducers/officer.ts b/frontend/src/app/store/reducers/officer.ts
index 192b99542..99d6550c6 100644
--- a/frontend/src/app/store/reducers/officer.ts
+++ b/frontend/src/app/store/reducers/officer.ts
@@ -2,7 +2,8 @@ import { Action, createSlice, createSelector, ThunkAction } from "@reduxjs/toolk
 import { RootState, AppThunk } from "@store/store";
 import config from "@/config";
 import { OfficerState } from "@apptypes/complaints/officers-state";
-import { NewOfficer, Officer } from "@apptypes/person/person";
+import { Officer } from "@apptypes/person/person";
+import { NewOfficer } from "@/app/types/person/new-officer";
 import { UUID } from "crypto";
 import { PersonComplaintXref } from "@apptypes/complaints/person-complaint-xref";
 import COMPLAINT_TYPES from "@apptypes/app/complaint-types";
diff --git a/frontend/src/app/types/person/new-officer.ts b/frontend/src/app/types/person/new-officer.ts
new file mode 100644
index 000000000..e98f0cc9e
--- /dev/null
+++ b/frontend/src/app/types/person/new-officer.ts
@@ -0,0 +1,26 @@
+export interface NewOfficer {
+  user_id: string;
+  create_user_id: string;
+  create_utc_timestamp: Date;
+  update_user_id: string;
+  update_utc_timestamp: Date;
+  auth_user_guid: string;
+  office_guid: string | null;
+  team_code: string | null;
+  person_guid: {
+    first_name: string;
+    middle_name_1: null;
+    middle_name_2: null;
+    last_name: string;
+    create_user_id: string;
+    create_utc_timestamp: Date;
+    update_user_id: string;
+    updateTimestamp: Date;
+  };
+  roles: {
+    user_roles: Array<{ name: string | undefined }>;
+    user_idir: string; //Example : fohe4m5pn8clhkxmlho33sn1r7vr7m67@idir
+  };
+  coms_enrolled_ind: boolean;
+  deactivate_ind: boolean;
+}
diff --git a/frontend/src/app/types/person/person.ts b/frontend/src/app/types/person/person.ts
index e1739d274..e9e07fa8e 100644
--- a/frontend/src/app/types/person/person.ts
+++ b/frontend/src/app/types/person/person.ts
@@ -29,33 +29,6 @@ export interface Officer {
   deactivate_ind: boolean;
 }
 
-export interface NewOfficer {
-  user_id: string;
-  create_user_id: string;
-  create_utc_timestamp: Date;
-  update_user_id: string;
-  update_utc_timestamp: Date;
-  auth_user_guid: string;
-  office_guid: string | null;
-  team_code: string | null;
-  person_guid: {
-    first_name: string;
-    middle_name_1: null;
-    middle_name_2: null;
-    last_name: string;
-    create_user_id: string;
-    create_utc_timestamp: Date;
-    update_user_id: string;
-    updateTimestamp: Date;
-  };
-  roles: {
-    user_roles: Array<{ name: string | undefined }>;
-    user_idir: string; //Example : fohe4m5pn8clhkxmlho33sn1r7vr7m67@idir
-  };
-  coms_enrolled_ind: boolean;
-  deactivate_ind: boolean;
-}
-
 export interface OfficeGUID {
   office_guid: string;
   create_user_id: string;