diff --git a/src/app/(main)/settings/user/edit/page.tsx b/src/app/(main)/settings/user/edit/page.tsx
index f820520..bbe5936 100644
--- a/src/app/(main)/settings/user/edit/page.tsx
+++ b/src/app/(main)/settings/user/edit/page.tsx
@@ -6,8 +6,6 @@ import { I18nProvider } from "@/i18n";
 // import EditStaffWrapper from "@/components/EditStaff/EditStaffWrapper";
 import { Metadata } from "next";
 import EditUser from "@/components/EditUser";
-import { useRouter } from 'next/router';
-import { getServerSideProps } from "next/dist/build/templates/pages";
 import { preloadUserDetail } from "@/app/api/user";
 import { searchParamsProps } from "@/app/utils/fetchUtil";
 
diff --git a/src/components/EditStaff/EditStaff.tsx b/src/components/EditStaff/EditStaff.tsx
index 7b42d6e..b86d954 100644
--- a/src/components/EditStaff/EditStaff.tsx
+++ b/src/components/EditStaff/EditStaff.tsx
@@ -281,7 +281,6 @@ const EditStaff: React.FC<formProps> = ({ Staff, combos, SalaryEffectiveInfo, In
               variant="scrollable"
             >
               <Tab label={t("Info")}/>
-              <Tab label={t("Info History")}  />
               <Tab label={t("Involved Project History")} />
             </Tabs>
           </Stack>
diff --git a/src/components/EditStaff/StaffInfo.tsx b/src/components/EditStaff/StaffInfo.tsx
index 01df7f1..5ca6c4c 100644
--- a/src/components/EditStaff/StaffInfo.tsx
+++ b/src/components/EditStaff/StaffInfo.tsx
@@ -114,9 +114,9 @@ const StaffInfo: React.FC<Props> = ({ combos }) => {
     resetStaff()
   }, [defaultValues]);
     
-  useEffect(() => {
-    console.log(state)
-  }, [state]);
+  // useEffect(() => {
+  //   console.log(state)
+  // }, [state]);
 
   const joinDate = watch("joinDate");
   const departDate = watch("departDate");
@@ -699,26 +699,34 @@ const StaffInfo: React.FC<Props> = ({ combos }) => {
           </Grid>
         </Box>
       </CardContent>
-      <SalaryEffectiveModel
-        open={state.seModal}
-        onClose={toggleSeModal}
-        columns={salaryCols}
-      />
-      <TeamHistoryModal
-        open={state.teamModal}
-        onClose={toggleTeamModal}
-        columns={teamHistoryCols}
-      />
-      <GradeHistoryModal
-        open={state.gradeModal}
-        onClose={toggleGradeModal}
-        columns={gradeHistoryCols}
-      />
-      <PositionHistoryModal
-        open={state.positionModal}
-        onClose={togglePositionModal}
-        columns={positionHistoryCols}
-      />
+      {state.seModal && 
+        <SalaryEffectiveModel
+          open={state.seModal}
+          onClose={toggleSeModal}
+          columns={salaryCols}
+        />
+      }
+      {state.teamModal &&
+        <TeamHistoryModal
+          open={state.teamModal}
+          onClose={toggleTeamModal}
+          columns={teamHistoryCols}
+        />
+      }
+      {state.gradeModal && 
+        <GradeHistoryModal
+          open={state.gradeModal}
+          onClose={toggleGradeModal}
+          columns={gradeHistoryCols}
+        />
+      }
+      {state.positionModal &&
+        <PositionHistoryModal
+          open={state.positionModal}
+          onClose={togglePositionModal}
+          columns={positionHistoryCols}
+        />      
+      }
     </Card>
   );
 };