diff --git a/src/pages/EmailTemplate/Detail_GLD/index.js b/src/pages/EmailTemplate/Detail_GLD/index.js
index 8510a2c..5c43db9 100644
--- a/src/pages/EmailTemplate/Detail_GLD/index.js
+++ b/src/pages/EmailTemplate/Detail_GLD/index.js
@@ -50,7 +50,7 @@ const Index = () => {
             axios.get(`${UrlUtils.GET_EMAIL}/${params.id}`)
             .then((response) => {
                 if (response.status === 200) {
-                    console.log(response)
+                    // console.log(response)
                     setRecord(response.data.data)
                 }
             })
@@ -95,14 +95,14 @@ const Index = () => {
                 console.log(error);
                 return false;
             });
-        console.log(data)
+        // console.log(data)
     }
 
     const handleDelete = () => {
         axios.delete(`${UrlUtils.DELETE_EMAIL}/${params.id}`,
         )
             .then((response) => {
-                console.log(response)
+                // console.log(response)
                 if (response.status === 204) {
                     // location.reload();
                     navigate('/setting/emailTemplate');
diff --git a/src/pages/GFMIS/index.js b/src/pages/GFMIS/index.js
index 5d5611d..498b9a4 100644
--- a/src/pages/GFMIS/index.js
+++ b/src/pages/GFMIS/index.js
@@ -50,7 +50,7 @@ const Index = () => {
                 dateFrom: input.dateFrom,
             },
             onSuccess: (responseData) => {
-                console.log(responseData)
+                // console.log(responseData)
                 const parser = new DOMParser();
                 const xmlDoc = parser.parseFromString(responseData, 'application/xml');
                 // Get the DCBHeader element
@@ -75,7 +75,7 @@ const Index = () => {
               
                 const updatedXmlString = new XMLSerializer().serializeToString(xmlDoc);
                 const filename = xmlDoc.querySelector('FileHeader').getAttribute('H_Filename');
-                console.log(updatedXmlString)
+                // console.log(updatedXmlString)
                 const blob = new Blob([updatedXmlString], { type: 'application/xml' });
                 // Create a download link
                 const link = document.createElement('a');
diff --git a/src/pages/GazetteIssue/ExportForm.js b/src/pages/GazetteIssue/ExportForm.js
index e721a2d..8eac79a 100644
--- a/src/pages/GazetteIssue/ExportForm.js
+++ b/src/pages/GazetteIssue/ExportForm.js
@@ -27,9 +27,9 @@ const SearchGazetteIssueForm = ({ applyExport, comboData, waitDownload}) => {
         handleSubmit } = useForm()
 
     const onSubmit = () => {
-        console.log(selectedYear)
+        // console.log(selectedYear)
         if (selectedYear !=null && Object.keys(selectedYear).length>0){
-            console.log("okkkkkkkkkkkkkkkk")
+            // console.log("okkkkkkkkkkkkkkkk")
             const temp = {
                 year: selectedYear.label,
             };
diff --git a/src/pages/Holiday/DataGrid.js b/src/pages/Holiday/DataGrid.js
index bca77f6..77b3d02 100644
--- a/src/pages/Holiday/DataGrid.js
+++ b/src/pages/Holiday/DataGrid.js
@@ -15,7 +15,7 @@ export default function HolidayTable({ recordList }) {
     // const navigate = useNavigate()
 
     useEffect(() => {
-        console.log(recordList)
+        // console.log(recordList)
         setRows(recordList.records);
     }, [recordList]);
 
diff --git a/src/pages/Organization/DetailPage/OrganizationCard.js b/src/pages/Organization/DetailPage/OrganizationCard.js
index 9850a91..76fa33f 100644
--- a/src/pages/Organization/DetailPage/OrganizationCard.js
+++ b/src/pages/Organization/DetailPage/OrganizationCard.js
@@ -56,7 +56,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
         //if state data are ready and assign to different field
         // console.log(currentApplicationDetailData)
         if (Object.keys(currentUserData).length > 0) {
-            console.log(currentUserData)
+            // console.log(currentUserData)
             if (DateUtils.dateValue(currentUserData.brExpiryDate) > DateUtils.dateValue(minDate)) {
                 setFromDate(currentUserData.brExpiryDate);
             } else {
diff --git a/src/pages/Payment/Details_GLD/DataGrid.js b/src/pages/Payment/Details_GLD/DataGrid.js
index 37c302d..92aab12 100644
--- a/src/pages/Payment/Details_GLD/DataGrid.js
+++ b/src/pages/Payment/Details_GLD/DataGrid.js
@@ -43,7 +43,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
             flex: 1,
             renderCell: (params) => {
                 let appNo = params.row.appNo;
-                console.log(params.row)
+                // console.log(params.row)
                 return <div style={{ margin: 4, textAlign:"left"}}>Gazette Supplement No. 6 <br/>
                     {isORGLoggedIn()&&params.row.careOf!=null&&params.row.careOf!=""?<>{params.row.careOf}<br /></>:null}
                     App No: {appNo}<br/>
diff --git a/src/pages/Payment/MultiPaymentWindow.js b/src/pages/Payment/MultiPaymentWindow.js
index fbaaea9..ea8f397 100644
--- a/src/pages/Payment/MultiPaymentWindow.js
+++ b/src/pages/Payment/MultiPaymentWindow.js
@@ -64,7 +64,7 @@ const MultiPaymentWindow = (props) => {
     // console.log(props.transactionData)
     if(Object.keys(props.transactionData).length > 0){
       setLoadtTransactionData(props.transactionData)
-      console.log(props.browserType)
+      // console.log(props.browserType)
     }
   }, [props.transactionData]);
 
diff --git a/src/pages/Proof/Create_FromApp/UploadFileTable.js b/src/pages/Proof/Create_FromApp/UploadFileTable.js
index 38563af..824637b 100644
--- a/src/pages/Proof/Create_FromApp/UploadFileTable.js
+++ b/src/pages/Proof/Create_FromApp/UploadFileTable.js
@@ -59,10 +59,10 @@ export default function UploadFileTable({ recordList, setRecordList, showPageCol
             ...rowModesModel,
             [id]: { mode: GridRowModes.View, ignoreModifications: true },
         });
-        console.log("Starting Delete")
-        const editedRow = rows.find((row) => row.id === id);
-        console.log(editedRow)
-        console.log(editedRow.isNew)
+        // console.log("Starting Delete")
+        // const editedRow = rows.find((row) => row.id === id);
+        // console.log(editedRow)
+        // console.log(editedRow.isNew)
         setRecordList(rows.filter((row) => row.id !== id));
         setRows(rows.filter((row) => row.id !== id));
     }
diff --git a/src/pages/Proof/Reply_GLD/UploadFileTable.js b/src/pages/Proof/Reply_GLD/UploadFileTable.js
index ffed14b..4fa573c 100644
--- a/src/pages/Proof/Reply_GLD/UploadFileTable.js
+++ b/src/pages/Proof/Reply_GLD/UploadFileTable.js
@@ -44,10 +44,10 @@ export default function UploadFileTable({recordList, setRecordList,}) {
             ...rowModesModel,
             [id]: { mode: GridRowModes.View, ignoreModifications: true },
         });
-        console.log("Starting Delete")
-        const editedRow = rows.find((row) => row.id === id);
-        console.log(editedRow)
-        console.log(editedRow.isNew)
+        // console.log("Starting Delete")
+        // const editedRow = rows.find((row) => row.id === id);
+        // console.log(editedRow)
+        // console.log(editedRow.isNew)
         setRecordList(rows.filter((row) => row.id !== id));
         setRows(rows.filter((row) => row.id !== id));
     }
diff --git a/src/pages/Proof/Reply_Public/ProofForm.js b/src/pages/Proof/Reply_Public/ProofForm.js
index 5d9d299..b0ee8e0 100644
--- a/src/pages/Proof/Reply_Public/ProofForm.js
+++ b/src/pages/Proof/Reply_Public/ProofForm.js
@@ -121,7 +121,7 @@ const FormPanel = ({ formData }) => {
                 },
                 files: attachments ? attachments : [],
                 onSuccess: function (responseData) {
-                    console.log(responseData)
+                    // console.log(responseData)
                     if (responseData.success === false) {
                         navigate("/publicNotice/" + responseData.id);
                     } else {
diff --git a/src/pages/Proof/Reply_Public/UploadFileTable.js b/src/pages/Proof/Reply_Public/UploadFileTable.js
index 1a44ad5..940a8c1 100644
--- a/src/pages/Proof/Reply_Public/UploadFileTable.js
+++ b/src/pages/Proof/Reply_Public/UploadFileTable.js
@@ -46,10 +46,10 @@ export default function UploadFileTable({recordList, setRecordList,}) {
             ...rowModesModel,
             [id]: { mode: GridRowModes.View, ignoreModifications: true },
         });
-        console.log("Starting Delete")
-        const editedRow = rows.find((row) => row.id === id);
-        console.log(editedRow)
-        console.log(editedRow.isNew)
+        // console.log("Starting Delete")
+        // const editedRow = rows.find((row) => row.id === id);
+        // console.log(editedRow)
+        // console.log(editedRow.isNew)
         setRecordList(rows.filter((row) => row.id !== id));
         setRows(rows.filter((row) => row.id !== id));
     }
diff --git a/src/pages/PublicNotice/Details_GLD/ClientDetailCard.js b/src/pages/PublicNotice/Details_GLD/ClientDetailCard.js
index b2050d0..3b914da 100644
--- a/src/pages/PublicNotice/Details_GLD/ClientDetailCard.js
+++ b/src/pages/PublicNotice/Details_GLD/ClientDetailCard.js
@@ -94,7 +94,7 @@ const ClientDetailCard = (
 
     useEffect(() => {
         if (brNo != undefined && brNo.length > 0) {
-            console.log(brExpiryDate)
+            // console.log(brExpiryDate)
             var currentDate = new Date();  // Current date
             var targetDate = new Date(brExpiryDate);  // Target date
 
@@ -102,9 +102,9 @@ const ClientDetailCard = (
                 alert("The BR is expired.")
             } else {
                 var timeDiff = Math.abs(currentDate.getTime() - targetDate.getTime());
-                console.log(timeDiff)
+                // console.log(timeDiff)
                 var diffDays = Math.ceil(timeDiff / (1000 * 3600 * 24));
-                console.log(diffDays)
+                // console.log(diffDays)
                 if (diffDays <= 7 && diffDays > 0) {
                     alert("The BR is expiring.")
                 }
@@ -114,7 +114,7 @@ const ClientDetailCard = (
     }, [brNo]);
 
     const handleViewClick = () => () => {
-        console.log(currentApplicationDetailData)
+        // console.log(currentApplicationDetailData)
         currentApplicationDetailData.type == "ORG" ?
             window.open('/orgUser/' + currentApplicationDetailData.id, "_blank", "noreferrer") :
             window.open('/indUser/' + currentApplicationDetailData.id, "_blank", "noreferrer");
diff --git a/src/pages/PublicNotice/Details_GLD/StatusChangeDialog.js b/src/pages/PublicNotice/Details_GLD/StatusChangeDialog.js
index 60d95ac..c4fdcb3 100644
--- a/src/pages/PublicNotice/Details_GLD/StatusChangeDialog.js
+++ b/src/pages/PublicNotice/Details_GLD/StatusChangeDialog.js
@@ -67,7 +67,7 @@ const StatusChangeDialog = (props) => {
     if (!helperText) {
       props.setReason({ "reason": remarks });
       if (remarks != null && remarks != "") {
-        console.log(remarks)
+        // console.log(remarks)
         // props.setStatusWindowAccepted(true);
       }
     }
@@ -150,7 +150,7 @@ const StatusChangeDialog = (props) => {
               inputValue={comboInputValue.label}
               onChange={(event, newValue) => {
                 if (newValue != null && newValue != {}) {
-                  console.log(comboInputValue)
+                  // console.log(comboInputValue)
                   props.setSelectedGazetteGroupInputType(newValue.label);
                   setComboInputValue(newValue);
                   props.setSelectedGazetteGroup(newValue);
diff --git a/src/pages/PublicNotice/Details_Public/StatusChangeDialog.js b/src/pages/PublicNotice/Details_Public/StatusChangeDialog.js
index 085a5b3..73581b8 100644
--- a/src/pages/PublicNotice/Details_Public/StatusChangeDialog.js
+++ b/src/pages/PublicNotice/Details_Public/StatusChangeDialog.js
@@ -28,7 +28,7 @@ const StatusChangeDialog = (props) => {
   const intl = useIntl();
 
   useEffect(() => {
-    console.log(Object.keys(!props.selectedGazetteGroup).length)
+    // console.log(Object.keys(!props.selectedGazetteGroup).length)
     if(props.getStatus === "cancel"){
       setStatus(intl.formatMessage({id: 'cancel'}))
     }
diff --git a/src/pages/Recon/SearchForm.js b/src/pages/Recon/SearchForm.js
index 241512d..e7c60ee 100644
--- a/src/pages/Recon/SearchForm.js
+++ b/src/pages/Recon/SearchForm.js
@@ -101,7 +101,7 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, onLoad }) => {
             CollDateTo: sentCollDateTo,
         };
 
-        console.log(temp)
+        // console.log(temp)
         applySearch(temp);
     };
 
diff --git a/src/pages/User/ChangePasswordPage/index.js b/src/pages/User/ChangePasswordPage/index.js
index b9b6367..24f4484 100644
--- a/src/pages/User/ChangePasswordPage/index.js
+++ b/src/pages/User/ChangePasswordPage/index.js
@@ -68,7 +68,7 @@ const Index = () => {
                 setIsChanged(true);
             },
             onError:function (error) {
-                console.log(error.response.data);
+                // console.log(error.response.data);
                 setExpiryErrText(intl.formatMessage({ id: error.response.data.error }))
                 setExpiryErr(true)
                 // window.location.assign("/iamsmart/loginFail");
diff --git a/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual.js b/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual.js
index 8dd310b..8f06c78 100644
--- a/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual.js
+++ b/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual.js
@@ -136,7 +136,7 @@ const UserInformationCard_Individual = ({ formData, loadDataFun }) => {
             checkDigit: yup.string().max(1, getMaxErrStr(1)).nullable()
             .matches(/^[A-Z0-9\s]+$/, { message: displayErrorMsg(`${selectedIdDocInputType}${intl.formatMessage({ id: 'noSpecialCharacter' })}`) })
             .test('checkIDCardFormat', displayErrorMsg(`${intl.formatMessage({ id: 'requiredNumberInQuote' })}`), function (value) {
-                console.log(selectedIdDocInputType)
+                // console.log(selectedIdDocInputType)
                 if (value != undefined || value != null) {
                     switch (selectedIdDocInputType) {
                         case "HKID":
diff --git a/src/pages/authentication/ForgotPassword/ForgotPasswordApplyForm.js b/src/pages/authentication/ForgotPassword/ForgotPasswordApplyForm.js
index 7d33847..d93546b 100644
--- a/src/pages/authentication/ForgotPassword/ForgotPasswordApplyForm.js
+++ b/src/pages/authentication/ForgotPassword/ForgotPasswordApplyForm.js
@@ -59,7 +59,7 @@ const ForgotPasswordApplyForm = () => {
             username: yup.string().required(intl.formatMessage({id: 'requireUsername'})),
         }),
         onSubmit: values => {
-            console.log(values)
+            // console.log(values)
             HttpUtils.post({
                 url: UrlUtils.POST_FORGOT_PASSWORD_EMAIL,
                 params: {
diff --git a/src/pages/authentication/ForgotUsername/AuthCallback/index.js b/src/pages/authentication/ForgotUsername/AuthCallback/index.js
index e400089..545e82d 100644
--- a/src/pages/authentication/ForgotUsername/AuthCallback/index.js
+++ b/src/pages/authentication/ForgotUsername/AuthCallback/index.js
@@ -76,7 +76,7 @@ const Index = () => {
         }).then(
             (response)=>{
                 if (response.status === 200 && response.data) {
-                    console.log(response)
+                    // console.log(response)
                     setUsername(response.data.username)
                     setVerifyState(true)
                 } else {
diff --git a/src/pages/authentication/ForgotUsername/ForgotUsernameApplyForm.js b/src/pages/authentication/ForgotUsername/ForgotUsernameApplyForm.js
index ae735d3..3f87a86 100644
--- a/src/pages/authentication/ForgotUsername/ForgotUsernameApplyForm.js
+++ b/src/pages/authentication/ForgotUsername/ForgotUsernameApplyForm.js
@@ -61,7 +61,7 @@ const ForgotUsernameApplyForm = () => {
             emailAddress: yup.string().email(intl.formatMessage({id: 'validEmailFormat'})).max(255).required(intl.formatMessage({id: 'requireEmail'})),
         }),
         onSubmit: values => {
-            console.log(values)
+            // console.log(values)
             HttpUtils.post({
                 url: UrlUtils.POST_FORGOT_USERNAME_EMAIL,
                 params: {
diff --git a/src/pages/authentication/auth-forms/AuthLogin.js b/src/pages/authentication/auth-forms/AuthLogin.js
index 9b48602..badf7a8 100644
--- a/src/pages/authentication/auth-forms/AuthLogin.js
+++ b/src/pages/authentication/auth-forms/AuthLogin.js
@@ -63,7 +63,7 @@ const AuthLogin = () => {
         })
         .then((response) => {
           //setPosts("12354")
-          console.log(response.data);
+          // console.log(response.data);
           setPosts(response.data);
 
           const userData = {
diff --git a/src/pages/authentication/auth-forms/CustomFormWizard.js b/src/pages/authentication/auth-forms/CustomFormWizard.js
index ce9baca..895da7e 100644
--- a/src/pages/authentication/auth-forms/CustomFormWizard.js
+++ b/src/pages/authentication/auth-forms/CustomFormWizard.js
@@ -165,7 +165,7 @@ const CustomFormWizard = (props) => {
                 const response = await axios.post(`${POST_IDNO}`, {
                     i1: values.idNo,
                 })
-                console.log(response.data.Vaild)
+                // console.log(response.data.Vaild)
                 setCheckIdDocNumber(response.data.Vaild === false)
                 return response.data.Vaild === false
             }
@@ -178,7 +178,7 @@ const CustomFormWizard = (props) => {
                 const response = await axios.post(`${POST_IDNO}`, {
                     i1: values.idNo,
                 })
-                console.log(response.data.Vaild)
+                // console.log(response.data.Vaild)
                 setCheckIdDocNumber(response.data.Vaild === false)
                 return response.data.Vaild === false
             }
diff --git a/src/pages/iAmSmart/AuthCallback/index.js b/src/pages/iAmSmart/AuthCallback/index.js
index 3df9e1e..cb02712 100644
--- a/src/pages/iAmSmart/AuthCallback/index.js
+++ b/src/pages/iAmSmart/AuthCallback/index.js
@@ -34,8 +34,8 @@ const Index = () => {
                     code: params.get("code")
                 },
                 onSuccess: (responseData) => {
-                    console.log("responseData");
-                    console.log(responseData);
+                    // console.log("responseData");
+                    // console.log(responseData);
                         const userData = {
                           id: responseData.id,
                           fullenName: responseData.name,
diff --git a/src/pages/iAmSmart/DirectLoginCallback/index.js b/src/pages/iAmSmart/DirectLoginCallback/index.js
index 130a94a..91a1974 100644
--- a/src/pages/iAmSmart/DirectLoginCallback/index.js
+++ b/src/pages/iAmSmart/DirectLoginCallback/index.js
@@ -34,8 +34,8 @@ const Index = () => {
                     code: params.get("code")
                 },
                 onSuccess: (responseData) => {
-                    console.log("responseData");
-                    console.log(responseData);
+                    // console.log("responseData");
+                    // console.log(responseData);
                         const userData = {
                           id: responseData.id,
                           fullenName: responseData.name,
diff --git a/src/pages/pnspsUserGroupDetailPage/UserAddCard.js b/src/pages/pnspsUserGroupDetailPage/UserAddCard.js
index 5039e98..2b1af31 100644
--- a/src/pages/pnspsUserGroupDetailPage/UserAddCard.js
+++ b/src/pages/pnspsUserGroupDetailPage/UserAddCard.js
@@ -42,7 +42,7 @@ const UserAddCard = ({ isCollectData, updateGroupMember, userGroupData, isNewRec
             if (!idList.includes(selectedUser.id)) {
                 const userList = [...groupUserData, selectedUser];
                 setGroupUserData(userList);
-                console.log(userList);
+                // console.log(userList);
             }
         }
     }
@@ -125,7 +125,7 @@ const UserAddCard = ({ isCollectData, updateGroupMember, userGroupData, isNewRec
                                         value={selectedUser === null ? null : selectedUser}
                                         options={userComboList}
                                         onChange={(event, newValue) => {
-                                            console.log(newValue)
+                                            // console.log(newValue)
                                             setSelectedUser(newValue);
                                         }}
                                         renderInput={(params) => <TextField {...params} />}
diff --git a/src/pages/pnspsUserGroupDetailPage/UserAddTable.js b/src/pages/pnspsUserGroupDetailPage/UserAddTable.js
index 65480af..3cdcce0 100644
--- a/src/pages/pnspsUserGroupDetailPage/UserAddTable.js
+++ b/src/pages/pnspsUserGroupDetailPage/UserAddTable.js
@@ -65,8 +65,8 @@ export default function UserAddTable({setGroupUserData, userList,setDeletedList,
     const handleDeleteClick = (id) => () => {
         if(id >0){
             const temp = [...localDeletedList, id];
-            console.log("temp here");
-            console.log(temp);
+            // console.log("temp here");
+            // console.log(temp);
             setLocalDeletedList(temp);
         }
         const newList =removeObjectWithId(groupData,id)
diff --git a/src/pages/pnspsUserGroupDetailPage/index.js b/src/pages/pnspsUserGroupDetailPage/index.js
index dee177a..e26ca22 100644
--- a/src/pages/pnspsUserGroupDetailPage/index.js
+++ b/src/pages/pnspsUserGroupDetailPage/index.js
@@ -137,7 +137,7 @@ const UserMaintainPage = () => {
         if (userConfirm && onReady) {
             //avoid delete and add user at the same time
             let finalDeletedUserList = getDeletedRecordWithRefList(deletedUserList, getIdList(groupMember));
-            console.log(finalDeletedUserList)
+            // console.log(finalDeletedUserList)
             axios.post(POST_AND_UPDATE_USER_GROUP,
                 {
                     "id": parseInt(params.id) !== -1 ? parseInt(params.id) : null,
diff --git a/src/utils/CommonFunction.js b/src/utils/CommonFunction.js
index 1dbecc1..4955a1f 100644
--- a/src/utils/CommonFunction.js
+++ b/src/utils/CommonFunction.js
@@ -232,8 +232,8 @@ export const notifyActionWarning = (actionMsg) => {
 }
 
 export function prettyJson(json) {
-    console.log(json);
-    console.log(JSON.stringify(json, null, 2));
+    // console.log(json);
+    // console.log(JSON.stringify(json, null, 2));
     return (
         <div>{JSON.stringify(json, null, 2)}</div>
     );
diff --git a/src/utils/Utils.js b/src/utils/Utils.js
index 795711f..4923a10 100644
--- a/src/utils/Utils.js
+++ b/src/utils/Utils.js
@@ -102,7 +102,7 @@ export const haveOrgPaymentRecord = () =>{
 }
 export const checkSysEnv = () =>{
     if (localStorage.getItem('sysEnv') != null){
-        console.log(localStorage.getItem('sysEnv'))
+        // console.log(localStorage.getItem('sysEnv'))
         return localStorage.getItem('sysEnv')
     }
 }