diff --git a/backend/main.go b/backend/main.go
index 0963b78..ce29a3a 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -1453,19 +1453,6 @@ func connect() {
 				"result": result,
 			})
 
-		case "check-statuspops-local":
-			var resultInt, resultCount int
-			err := dbpop.QueryRow(`SELECT COUNT(OrderPayId) AS resultInt, COUNT(AFNum) AS resultCount FROM orderpaydetail WHERE oprefid = ?`, data).Scan(&resultInt, &resultCount)
-			if err != nil {
-				c.AbortWithError(http.StatusBadRequest, err)
-				c.String(http.StatusBadRequest, err.Error())
-				return
-			}
-			c.JSON(http.StatusOK, gin.H{
-				"result":  resultInt,
-				"result2": resultCount,
-			})
-
 		}
 	})
 
@@ -2335,50 +2322,6 @@ func connect() {
 		}
 	})
 
-	// router.POST("/api/return-approval-electrical", middleware.TokenChecker(), func(c *gin.Context) {
-	// 	type returnApprovalData struct {
-	// 		Data string `json:"data"` //electricalNo
-	// 	}
-	// 	var returnapprovalData returnApprovalData
-	// 	if err := c.ShouldBindJSON(&returnapprovalData); err != nil {
-	// 		c.String(http.StatusBadRequest, "Invalid request body")
-	// 		return
-	// 	}
-
-	// 	c.Writer.Header().Set("X-XSS-Protection", "1; mode=block")
-	// 	c.Writer.Header().Set("X-Content-Type-Options", "nosniff")
-	// 	c.Writer.Header().Set("X-DNS-Prefetch-Control", "off")
-	// 	c.Writer.Header().Set("X-Frame-Options", "DENY")
-	// 	c.Writer.Header().Set("X-Download-Options", "noopen")
-	// 	c.Writer.Header().Set("Referrer-Policy", "no-referrer")
-	// 	c.Writer.Header().Set("Content-Security-Policy", "default-src 'self'; img-src 'self';")
-	// 	c.Writer.Header().Set("X-Server", "OCBO Server")
-
-	// 	dbpost, err := db.Prepare("INSERT INTO esign_lock (esign_lockid, referenceNo, lock_code) VALUES (NULL, ?, ?)")
-	// 	if err != nil {
-	// 		c.AbortWithError(http.StatusInternalServerError, err)
-	// 		c.String(http.StatusInternalServerError, "Internal Server Error")
-	// 		return
-	// 	}
-	// 	defer dbpost.Close()
-
-	// 	exec, err := dbpost.Exec(returnapprovalData.Data)
-	// 	if err != nil {
-	// 		panic(err.Error())
-	// 	}
-
-	// 	affect, err := exec.RowsAffected()
-	// 	if err != nil {
-	// 		panic(err.Error())
-	// 	}
-
-	// 	if affect > 0 {
-	// 		c.String(http.StatusOK, "Success on Saving Lock Data")
-	// 	} else {
-	// 		c.String(http.StatusInternalServerError, "Failed on Saving Lock Data")
-	// 	}
-	// })
-
 	router.DELETE("/api/delete-orderofpayment-electrical", middleware.TokenChecker(), func(c *gin.Context) {
 		type DeleteOP struct {
 			Data int `json:"data"`
@@ -2512,8 +2455,8 @@ func connect() {
 		c.Writer.Header().Set("Content-Security-Policy", "default-src 'self'; img-src 'self';")
 		c.Writer.Header().Set("X-Server", "OCBO Server")
 
-		var resultId, resultCount int
-		checkErr := dbpop.QueryRow("SELECT COUNT(OrderPayId) AS resultId, COUNT(AFNum) AS resultCount FROM orderpaydetail WHERE OPRefId = ?", deleteOpLocal.Data).Scan(&resultId, &resultCount)
+		var resultCount int
+		checkErr := dbpop.QueryRow("SELECT COUNT(AFNum) AS resultCount FROM orderpaydetail WHERE OPRefId = ?", deleteOpLocal.Data).Scan(&resultCount)
 		if checkErr != nil {
 			c.AbortWithError(http.StatusInternalServerError, checkErr)
 			c.String(http.StatusInternalServerError, "Internal Server Error")
@@ -2521,36 +2464,33 @@ func connect() {
 		}
 
 		if resultCount > 0 {
-			c.String(http.StatusForbidden, "Error! Payment already exist.")
+			c.String(http.StatusBadRequest, "Error! Payment already exist.")
 			return
 		}
 
-		if resultId > 0 {
-			dbpost, err := dbpop.Prepare("DELETE FROM orderpaydetail WHERE OPRefId = ?")
-			if err != nil {
-				c.AbortWithError(http.StatusInternalServerError, err)
-				c.String(http.StatusInternalServerError, "Internal Server Error")
-				return
-			}
-			defer dbpost.Close()
+		dbpost, err := dbpop.Prepare("DELETE FROM orderpaydetail WHERE OPRefId = ?")
+		if err != nil {
+			c.AbortWithError(http.StatusInternalServerError, err)
+			c.String(http.StatusInternalServerError, "Internal Server Error")
+			return
+		}
+		defer dbpost.Close()
 
-			exec, err := dbpost.Exec(deleteOpLocal.Data)
-			if err != nil {
-				panic(err.Error())
-			}
-
-			affect, err := exec.RowsAffected()
-			if err != nil {
-				panic(err.Error())
-			}
-
-			if affect > 0 {
-				c.String(http.StatusOK, "Success on Deleting POPS Local")
-			} else {
-				c.String(http.StatusInternalServerError, "Failed on Deleting POPS Local")
-			}
+		exec, err := dbpost.Exec(deleteOpLocal.Data)
+		if err != nil {
+			panic(err.Error())
 		}
 
+		affect, err := exec.RowsAffected()
+		if err != nil {
+			panic(err.Error())
+		}
+
+		if affect > 0 {
+			c.String(http.StatusOK, "Success on Deleting POPS Local")
+		} else {
+			c.String(http.StatusInternalServerError, "Failed on Deleting POPS Local")
+		}
 	})
 
 	router.DELETE("/api/delete-esigntransactions", func(c *gin.Context) {
diff --git a/src/pages/AssessorPage/Assessor.sass b/src/pages/AssessorPage/Assessor.sass
index 06478a6..894a243 100644
--- a/src/pages/AssessorPage/Assessor.sass
+++ b/src/pages/AssessorPage/Assessor.sass
@@ -79,4 +79,4 @@
       opacity: 0.6
 
   &__button
-    padding: 1rem 0 0 0
\ No newline at end of file
+    padding: 1rem 0 0 0
diff --git a/src/pages/AssessorPage/Assessor.tsx b/src/pages/AssessorPage/Assessor.tsx
index a2f685a..193cd6f 100644
--- a/src/pages/AssessorPage/Assessor.tsx
+++ b/src/pages/AssessorPage/Assessor.tsx
@@ -33,7 +33,6 @@ import {
   _units,
 } from '../../stores/pdfinfo.ts'
 import { checkConnection, createPdfElectrical, createPdfOccupancy, getApi, getApiMulti, getDateTime, postApi, saveNewName, saveNewPassword, securePassword, statusPopsApi, voidPopsApi } from '../../utils/functions/index.ts'
-import { AiOutlineLoading3Quarters } from 'solid-icons/ai'
 import './Assessor.sass'
 
 const PESO = import.meta.env.VITE_PESO
@@ -83,7 +82,6 @@ export default () => {
   const [selectedType, setSelectedType] = createSignal('Print')
 
   const [voidError, setVoidError] = createSignal(false)
-  const [isLoading, setIsLoading] = createSignal(false)
 
   let bldgadditional = false
 
@@ -248,8 +246,6 @@ export default () => {
   }
 
   const getListForPrinting = async (division: string) => {
-    setIsLoading(true)
-
     try {
       let response: any
 
@@ -287,8 +283,6 @@ export default () => {
     } catch (error) {
       console.error(error)
     }
-
-    setIsLoading(false)
   }
 
   const removeEmployee = () => {
@@ -512,11 +506,6 @@ export default () => {
     return true
   }
 
-  const checkStatusPopsLocal = async (application: string) => {
-    const response = await getApi('check-statuspops-local', application)
-    return response
-  }
-
   const statusPopsOp = async (application: string) => {
     const response = await statusPopsApi(application)
     return response
@@ -877,98 +866,87 @@ export default () => {
                 </Padding>
 
                 <Row>
-                  <Show when={isLoading()}>
-                    <Padding top={2} bottom={0} right={10} left={10}>
-                      <Column gap={1}>
-                        <AiOutlineLoading3Quarters class="loading-spinner" size={42} opacity={0.8} />
-                        <span>Downloading Data</span>
-                      </Column>
-                    </Padding>
-                  </Show>
-
-                  <Show when={!isLoading()}>
-                    <table class="table">
-                      <thead>
+                  <table class="table">
+                    <thead>
+                      <tr>
+                        <th>Application Number</th>
+                        <th>Name</th>
+                        <th style="text-align: center">Show Details</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      {applicationListElectrical().map((item: string, index: number) => (
                         <tr>
-                          <th>Application Number</th>
-                          <th>Name</th>
-                          <th style="text-align: center">Show Details</th>
-                        </tr>
-                      </thead>
-                      <tbody>
-                        {applicationListElectrical().map((item: string, index: number) => (
-                          <tr>
-                            <td>{item}</td>
-                            <td>{nameListElectrical()[index]}</td>
+                          <td>{item}</td>
+                          <td>{nameListElectrical()[index]}</td>
 
-                            <td>
-                              <ModalButton
-                                class="modal"
-                                label="Show Details"
-                                design="bo-link"
-                                background="#121e2acc"
-                                color="#ffffffec"
-                                function={async () => {
-                                  await getopdetails('electrical', item)
-                                }}
-                              >
-                                <Padding top={0} left={2} right={2} bottom={0}>
-                                  <span class="modal__application-number">{item}</span>
+                          <td>
+                            <ModalButton
+                              class="modal"
+                              label="Show Details"
+                              design="bo-link"
+                              background="#121e2acc"
+                              color="#ffffffec"
+                              function={async () => {
+                                await getopdetails('electrical', item)
+                              }}
+                            >
+                              <Padding top={0} left={2} right={2} bottom={0}>
+                                <span class="modal__application-number">{item}</span>
 
-                                  <Padding top={1} left={0} right={0} bottom={0}>
-                                    <section class="modal__row">
-                                      <span class="modal__row__label">Name of Applicant:</span>
-                                      <span class="modal__row__detail">{nameListElectrical()[index]}</span>
-                                    </section>
+                                <Padding top={1} left={0} right={0} bottom={0}>
+                                  <section class="modal__row">
+                                    <span class="modal__row__label">Name of Applicant:</span>
+                                    <span class="modal__row__detail">{nameListElectrical()[index]}</span>
+                                  </section>
 
-                                    <section class="modal__row">
-                                      <span class="modal__row__label">Location:</span>
-                                      <span class="modal__row__detail">{location()}</span>
-                                    </section>
+                                  <section class="modal__row">
+                                    <span class="modal__row__label">Location:</span>
+                                    <span class="modal__row__detail">{location()}</span>
+                                  </section>
 
-                                    <section class="modal__row">
-                                      <span class="modal__row__label">Type:</span>
-                                      <span class="modal__row__detail">{type().toUpperCase()}</span>
-                                    </section>
+                                  <section class="modal__row">
+                                    <span class="modal__row__label">Type:</span>
+                                    <span class="modal__row__detail">{type().toUpperCase()}</span>
+                                  </section>
 
-                                    <section class="modal__row">
-                                      <span class="modal__row__label">Assessed By:</span>
-                                      <span class="modal__row__detail">{assessor()}</span>
-                                    </section>
+                                  <section class="modal__row">
+                                    <span class="modal__row__label">Assessed By:</span>
+                                    <span class="modal__row__detail">{assessor()}</span>
+                                  </section>
 
-                                    <section class="modal__row">
-                                      <span class="modal__row__label">Date Assessed:</span>
-                                      <span class="modal__row__detail">{dateOp().toUpperCase()}</span>
-                                    </section>
+                                  <section class="modal__row">
+                                    <span class="modal__row__label">Date Assessed:</span>
+                                    <span class="modal__row__detail">{dateOp().toUpperCase()}</span>
+                                  </section>
 
-                                    <section class="modal__row">
-                                      <span class="modal__row__label">Total Fee:</span>
-                                      <span class="modal__row__detail__price">
-                                        {PESO}{' '}
-                                        {totalOp().toLocaleString('en-US', {
-                                          minimumFractionDigits: 2,
-                                        })}
-                                      </span>
-                                    </section>
-                                  </Padding>
-
-                                  <Row padding="2rem 0 0 0">
-                                    <Show when={selectedType() === 'Print'}>
-                                      <Button wide label="Print" edges="curved" design="bo-primary" onClick={() => printHandler('electrical', item)}></Button>
-                                    </Show>
-                                    <Show when={selectedType() !== 'Print'}>
-                                      <Button wide label="Reprint" edges="curved" design="bo-primary" onClick={() => rePrintHandler('electrical', item)}></Button>
-                                    </Show>
-                                    <span class="modal__cancel">Click anywhere to cancel</span>
-                                  </Row>
+                                  <section class="modal__row">
+                                    <span class="modal__row__label">Total Fee:</span>
+                                    <span class="modal__row__detail__price">
+                                      {PESO}{' '}
+                                      {totalOp().toLocaleString('en-US', {
+                                        minimumFractionDigits: 2,
+                                      })}
+                                    </span>
+                                  </section>
                                 </Padding>
-                              </ModalButton>
-                            </td>
-                          </tr>
-                        ))}
-                      </tbody>
-                    </table>
-                  </Show>
+
+                                <Row padding="2rem 0 0 0">
+                                  <Show when={selectedType() === 'Print'}>
+                                    <Button wide label="Print" edges="curved" design="bo-primary" onClick={() => printHandler('electrical', item)}></Button>
+                                  </Show>
+                                  <Show when={selectedType() !== 'Print'}>
+                                    <Button wide label="Reprint" edges="curved" design="bo-primary" onClick={() => rePrintHandler('electrical', item)}></Button>
+                                  </Show>
+                                  <span class="modal__cancel">Click anywhere to cancel</span>
+                                </Row>
+                              </Padding>
+                            </ModalButton>
+                          </td>
+                        </tr>
+                      ))}
+                    </tbody>
+                  </table>
                 </Row>
               </Tabs.Content>
             </Tabs>
diff --git a/src/pages/MainPage/Main.sass b/src/pages/MainPage/Main.sass
index 8552c3d..e97fdbd 100644
--- a/src/pages/MainPage/Main.sass
+++ b/src/pages/MainPage/Main.sass
@@ -112,3 +112,4 @@ h1
     
   &__error
     color: #c85656
+
diff --git a/src/pages/MainPage/Main.tsx b/src/pages/MainPage/Main.tsx
index 7bbb492..7216bd6 100644
--- a/src/pages/MainPage/Main.tsx
+++ b/src/pages/MainPage/Main.tsx
@@ -7,14 +7,12 @@ import { VsRefresh } from 'solid-icons/vs'
 import { createEffect, createSignal, onMount } from 'solid-js'
 import { Show } from 'solid-js/web'
 import { Box, Button, Clickable, Column, Input, Link, Logo, Modal, ModalButton, Padding, Page, Row } from '../../components/'
-import { checkConnection, deleteApi, getApi, getApiMulti, getDateTime, lockData, postApi, saveNewName, saveNewPassword, securePassword, voidPopsApi, voidApi, statusPopsApi } from '../../utils/functions'
-import { AiOutlineLoading3Quarters } from 'solid-icons/ai'
+import { checkConnection, deleteApi, getApi, getApiMulti, getDateTime, lockData, postApi, saveNewName, saveNewPassword, securePassword, voidPopsApi } from '../../utils/functions'
 import './Main.sass'
 
 const PESO = import.meta.env.VITE_PESO
 const ID = sessionStorage.getItem('id')!
 const PUBLICIP = import.meta.env.VITE_PUBLICIP
-const BACKEND = import.meta.env.VITE_BACKEND
 
 export default () => {
   const navigate = useNavigate()
@@ -61,7 +59,6 @@ export default () => {
 
   const [configNotification, setConfigNotification] = createSignal(false)
   const [isIncomplete, setIsIncomplete] = createSignal(false)
-  const [isLoading, setIsLoading] = createSignal(false)
 
   let bldgadditional = false
 
@@ -76,19 +73,15 @@ export default () => {
   }
 
   const getListForApprovalElectrical = async () => {
-    // setIsLoading(true)
     const responseE = await getApiMulti('get-listopapproval-electrical')
     setApplicationListElectrical(responseE.result)
     setNameListElectrical(responseE.result2)
-    // setIsLoading(false)
   }
 
   const getListForApprovalOccupancy = async () => {
-    // setIsLoading(true)
     const responseO = await getApiMulti('get-listopapproval-occupancy')
     setApplicationListOccupancy(responseO.result)
     setNameListOccupancy(responseO.result2)
-    // setIsLoading(false)
   }
 
   const load = async (division: string) => {
@@ -97,7 +90,6 @@ export default () => {
       setErrorMessage('Could not gather list of applications')
       return
     }
-    setIsLoading(true)
 
     await getPassword()
 
@@ -109,7 +101,6 @@ export default () => {
     } else {
       await getListForApproval()
     }
-    setIsLoading(false)
   }
 
   const getopdetails = async (division: string, applicationNo: string) => {
@@ -157,9 +148,6 @@ export default () => {
     let forprinting: boolean = false
     let updateOrderofpayment: boolean = false
 
-    let popsExist: boolean = false
-    let popsPaid: boolean = false
-
     setConnected(await checkConnection())
     if (connected() === false) {
       setErrorMessage('No Connection on Server')
@@ -167,35 +155,7 @@ export default () => {
     }
 
     if (division === 'electrical') {
-      // const isPaid = BACKEND.includes('localhost') ? await checkStatusPopsLocal(application) : await statusPopsOp(application)
-      // let isPaid
-
-      if (BACKEND.includes('localhost')) {
-        const status = await checkStatusPopsLocal(application)
-        if (status.result > 0) popsExist = true
-        if (status.result2 > 0) popsPaid = true
-      } else {
-        const status = await await statusPopsOp(application)
-        if (status.message === 'Success') popsExist = true
-        if (status.pops_paid === true) popsPaid = true
-      }
-
-      if (popsExist) {
-        if (popsPaid) {
-          setPostError(true)
-          setErrorMessage('Application Already Paid')
-          return
-        } else {
-          const voidOP = BACKEND.includes('localhost') ? await voidPopsOpLocal(application) : await voidPopsOp(application)
-
-          if (!voidOP) {
-            setPostError(true)
-            setErrorMessage('POPS Record found but failed to void')
-            return
-          }
-        }
-      }
-
+      await voidPopsOp(application)
       await postPops(division, application)
       const popsResult = await checkPops(application)
       const lockResult = await lockOpData(division, application)
@@ -256,37 +216,6 @@ export default () => {
     }
   }
 
-  const approveElectrical = async (division: string, application: string) => {
-    let signed: boolean = false
-    let forprinting: boolean = false
-    let updateOrderofpayment: boolean = false
-
-    await postPops(division, application)
-    const popsResult = await checkPops(application)
-    const lockResult = await lockOpData(division, application)
-
-    if (popsResult && lockResult) {
-      signed = await setNewStatus(division, 'ELECTRICAL ORDER OF PAYMENT APPROVED AND SIGNED', '170', 'ELECOPAPPROVEDSIGNED', 1)
-      updateDocflow(division, application, 'FOR ELECTRICAL ORDER OF PAYMENT APPROVAL')
-      if (!signed) return
-
-      forprinting = await setNewStatus(division, 'FOR ELECTRICAL ORDER OF PAYMENT PRINTING', '95', 'ELECOPPRINT', 0)
-      if (!forprinting) return
-
-      updateOrderofpayment = await updateOp(division)
-
-      if (updateOrderofpayment) {
-        postTransaction()
-        setApprovedApplication(application)
-        setApproved(true)
-      }
-    } else {
-      setPostError(true)
-      setErrorMessage('Error on posting on POPS Server, please try again')
-      return
-    }
-  }
-
   const lockOpData = async (division: string, application: string) => {
     const dataToLock = await getApi(`get-opdata-${division}`, application)
     const lockedData = await lockData(dataToLock)
@@ -301,21 +230,6 @@ export default () => {
     return true
   }
 
-  const voidPopsOpLocal = async (application: string) => {
-    const response = await voidApi('void-op-local', { data: application })
-    return response
-  }
-
-  const checkStatusPopsLocal = async (application: string) => {
-    const response = await getApiMulti('check-statuspops-local', application)
-    return response
-  }
-
-  const statusPopsOp = async (application: string) => {
-    const response = await statusPopsApi(application)
-    return response
-  }
-
   const returnAssessment = async (division: string, application: string) => {
     const id = await getApplicationById(division, application)
     setApplicationId(id)
@@ -766,117 +680,107 @@ export default () => {
                 </Padding>
 
                 <Row>
-                  <Show when={isLoading()}>
-                    <Padding top={2} bottom={0} right={10} left={10}>
-                      <Column gap={1}>
-                        <AiOutlineLoading3Quarters class="loading-spinner" size={42} opacity={0.8} />
-                        <span>Downloading Data</span>
-                      </Column>
-                    </Padding>
-                  </Show>
-                  <Show when={!isLoading()}>
-                    <table class="table">
-                      <thead>
+                  <table class="table">
+                    <thead>
+                      <tr>
+                        <th>Application Number</th>
+                        <th>Name</th>
+                        <th style="text-align: center">Show Details</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      {applicationListElectrical().map((item: string, index: number) => (
                         <tr>
-                          <th>Application Number</th>
-                          <th>Name</th>
-                          <th style="text-align: center">Show Details</th>
-                        </tr>
-                      </thead>
-                      <tbody>
-                        {applicationListElectrical().map((item: string, index: number) => (
-                          <tr>
-                            <td>{item}</td>
-                            <td>{nameListElectrical()[index]}</td>
+                          <td>{item}</td>
+                          <td>{nameListElectrical()[index]}</td>
 
-                            <td>
-                              <ModalButton
-                                class="modal"
-                                label="Show Details"
-                                design="bo-link"
-                                background="#121e2acc"
-                                color="#ffffffec"
-                                function={async () => {
-                                  await getopdetails('electrical', item)
-                                }}
-                              >
-                                <Show when={isIncomplete()}>
-                                  <Padding top={0} left={2} right={2} bottom={0}>
-                                    <span class="modal__application-number">{item}</span>
+                          <td>
+                            <ModalButton
+                              class="modal"
+                              label="Show Details"
+                              design="bo-link"
+                              background="#121e2acc"
+                              color="#ffffffec"
+                              function={async () => {
+                                await getopdetails('electrical', item)
+                              }}
+                            >
+                              <Show when={isIncomplete()}>
+                                <Padding top={0} left={2} right={2} bottom={0}>
+                                  <span class="modal__application-number">{item}</span>
 
-                                    <Padding top={1} left={0} right={0} bottom={0}>
-                                      <Column padding="0 0 1rem 0">
-                                        <Box curved thickness={3} color="#c85656" padding="1rem">
-                                          <h2 class="incomplete__error">Signing Error</h2>
-                                        </Box>
-                                        <h3 class="incomplete__error">Missing Data Detected</h3>
+                                  <Padding top={1} left={0} right={0} bottom={0}>
+                                    <Column padding="0 0 1rem 0">
+                                      <Box curved thickness={3} color="#c85656" padding="1rem">
+                                        <h2 class="incomplete__error">Signing Error</h2>
+                                      </Box>
+                                      <h3 class="incomplete__error">Missing Data Detected</h3>
+                                    </Column>
+
+                                    <div class="incomplete">
+                                      <Column>
+                                        <span class="incomplete__text">Some required information is missing from the application details</span>
+                                        <span class="incomplete__text">Please return to Assessment to complete the required fields</span>
                                       </Column>
-
-                                      <div class="incomplete">
-                                        <Column>
-                                          <span class="incomplete__text">Some required information is missing from the application details</span>
-                                          <span class="incomplete__text">Please return to Assessment to complete the required fields</span>
-                                        </Column>
-                                      </div>
-                                    </Padding>
-                                    <Column padding="1rem 0 0 0">
-                                      <Button wide label="Return to Assessment" edges="curved" design="bo-primary" onClick={() => returnAssessment('electrical', item)} />
-                                      <span class="modal__cancel">Click anywhere to cancel</span>
-                                    </Column>
+                                    </div>
                                   </Padding>
-                                </Show>
+                                  <Column padding="1rem 0 0 0">
+                                    <Button wide label="Return to Assessment" edges="curved" design="bo-primary" onClick={() => returnAssessment('electrical', item)} />
+                                    <span class="modal__cancel">Click anywhere to cancel</span>
+                                  </Column>
+                                </Padding>
+                              </Show>
 
-                                <Show when={!isIncomplete()}>
-                                  <Padding top={0} left={2} right={2} bottom={0}>
-                                    <span class="modal__application-number">{item}</span>
+                              <Show when={!isIncomplete()}>
+                                <Padding top={0} left={2} right={2} bottom={0}>
+                                  <span class="modal__application-number">{item}</span>
 
-                                    <Padding top={1} left={0} right={0} bottom={0}>
-                                      <section class="modal__row">
-                                        <span class="modal__row__label">Name of Applicant:</span>
-                                        <span class="modal__row__detail">{nameListElectrical()[index]}</span>
-                                      </section>
+                                  <Padding top={1} left={0} right={0} bottom={0}>
+                                    <section class="modal__row">
+                                      <span class="modal__row__label">Name of Applicant:</span>
+                                      <span class="modal__row__detail">{nameListElectrical()[index]}</span>
+                                    </section>
 
-                                      <section class="modal__row">
-                                        <span class="modal__row__label">Location:</span>
-                                        <span class="modal__row__detail">{location()}</span>
-                                      </section>
+                                    <section class="modal__row">
+                                      <span class="modal__row__label">Location:</span>
+                                      <span class="modal__row__detail">{location()}</span>
+                                    </section>
 
-                                      <section class="modal__row">
-                                        <span class="modal__row__label">Type:</span>
-                                        <span class="modal__row__detail">{type().toUpperCase()}</span>
-                                      </section>
+                                    <section class="modal__row">
+                                      <span class="modal__row__label">Type:</span>
+                                      <span class="modal__row__detail">{type().toUpperCase()}</span>
+                                    </section>
 
-                                      <section class="modal__row">
-                                        <span class="modal__row__label">Assessed By:</span>
-                                        <span class="modal__row__detail">{assessor()}</span>
-                                      </section>
+                                    <section class="modal__row">
+                                      <span class="modal__row__label">Assessed By:</span>
+                                      <span class="modal__row__detail">{assessor()}</span>
+                                    </section>
 
-                                      <section class="modal__row">
-                                        <span class="modal__row__label">Date Assessed:</span>
-                                        <span class="modal__row__detail">{dateOp().toUpperCase()}</span>
-                                      </section>
+                                    <section class="modal__row">
+                                      <span class="modal__row__label">Date Assessed:</span>
+                                      <span class="modal__row__detail">{dateOp().toUpperCase()}</span>
+                                    </section>
 
-                                      <section class="modal__row">
-                                        <span class="modal__row__label">Total Fee:</span>
-                                        <span class="modal__row__detail__price">
-                                          {PESO} {totalOp()}
-                                        </span>
-                                      </section>
-                                    </Padding>
-
-                                    <Column padding="2rem 0 0 0">
-                                      <Button wide label="Approve" edges="curved" design="bo-primary" onClick={() => approveHandler('electrical', item)} />
-                                      <span class="modal__cancel">Click anywhere to cancel</span>
-                                    </Column>
+                                    <section class="modal__row">
+                                      <span class="modal__row__label">Total Fee:</span>
+                                      <span class="modal__row__detail__price">
+                                        {PESO} {totalOp()}
+                                      </span>
+                                    </section>
                                   </Padding>
-                                </Show>
-                              </ModalButton>
-                            </td>
-                          </tr>
-                        ))}
-                      </tbody>
-                    </table>
-                  </Show>
+
+                                  <Column padding="2rem 0 0 0">
+                                    <Button wide label="Approve" edges="curved" design="bo-primary" onClick={() => approveHandler('electrical', item)} />
+                                    <span class="modal__cancel">Click anywhere to cancel</span>
+                                  </Column>
+                                </Padding>
+                              </Show>
+                            </ModalButton>
+                          </td>
+                        </tr>
+                      ))}
+                    </tbody>
+                  </table>
                 </Row>
               </Tabs.Content>
             </Tabs>
@@ -1017,7 +921,7 @@ export default () => {
             <Column>
               <Row>
                 <Box curved thickness={3} color="#ffebebe6" padding="1rem">
-                  <h2>Approval and Signing Error</h2>
+                  <h2>Signing Error</h2>
                 </Box>
               </Row>
 
diff --git a/src/styles/classes.sass b/src/styles/classes.sass
index 47b051b..fb3ec27 100644
--- a/src/styles/classes.sass
+++ b/src/styles/classes.sass
@@ -123,16 +123,6 @@
     @extend .table
     cursor: not-allowed
 
-.loading-spinner
-  display: inline-block
-  animation: rotate 2s linear infinite
-
-@keyframes rotate
-  from
-    transform: rotate(0deg)
-  to
-    transform: rotate(360deg)
-
 .required-config
   padding: 0.75rem 1rem
   border-radius: 8px
diff --git a/src/utils/functions/index.ts b/src/utils/functions/index.ts
index e2a7824..a0a01fd 100644
--- a/src/utils/functions/index.ts
+++ b/src/utils/functions/index.ts
@@ -12,4 +12,3 @@ export { default as saveNewPassword } from './saveNewPassword.ts'
 export { default as getDateTime } from './getDateTime.ts'
 export { default as deleteApi } from './deleteApi.ts'
 export { default as lockData } from './lockData.ts'
-export { default as voidApi } from './voidApi.ts'
diff --git a/src/utils/functions/voidApi.ts b/src/utils/functions/voidApi.ts
deleted file mode 100644
index 56b7c0d..0000000
--- a/src/utils/functions/voidApi.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { ofetch } from 'ofetch'
-import dayjs from 'dayjs'
-import encryptRsa from './encryptRsa'
-
-const API = import.meta.env.VITE_BACKEND
-
-export default async (api: string, body: Object) => {
-  const today = new Date()
-  const todayUnix = dayjs(today).unix()
-  const expiration = todayUnix + 9
-  const aes = await encryptRsa(`${api.toString()}-${todayUnix.toString()}-${expiration.toString()}`)
-
-  const hash = `ocbo=${aes}token`
-  try {
-    let data
-    await ofetch(API + api, {
-      headers: {
-        Accept: 'application/json',
-        'Cache-Control': 'no-cache',
-        'OCBO-Token': hash,
-      },
-      async onResponse({ response }) {
-        data = response.ok
-      },
-      retry: 3,
-      retryDelay: 500,
-      retryStatusCodes: [400, 404, 405, 500, 502],
-      method: 'DELETE',
-      body: body,
-    })
-
-    return data
-  } catch {
-    return 'error'
-  }
-}