diff --git a/pages/api/endpoint/getappealtypes_api.js b/pages/api/endpoint/getappealtypes_api.js
index 16edd5f8..a14511ee 100644
--- a/pages/api/endpoint/getappealtypes_api.js
+++ b/pages/api/endpoint/getappealtypes_api.js
@@ -9,46 +9,30 @@
  *         description: Success
  */
 
-import axios from "axios";
-import { azureHeaders } from "../../../actions/core/headers";
-import { consoleLogger } from "../../../actions/core/logger";
-import { getToken } from "../../../actions/core/token";
-import { hashAPIPath } from "../../../actions/core/hash";
-import { respondError, respondSuccess } from "../middleware/apiResponse";
-
-const WEBAPI_URL =
-    process.env.RELAY_ROOT ||
-    "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
+import { respondError } from "../middleware/apiResponse";
+import { relayGet } from "../middleware/relayForwarding";
 
 export default async function ApiProxy(req, res) {
-    try {
-        const token = await getToken();
+    const queryUrl =
+        "stringmaps?$filter=objecttypecode eq 'incident' and attributename eq 'pinswg_appealcasetype'  " +
+        (process.env.SHOWSIPS !== "true"
+            ? "and attributevalue ne 846040002"
+            : "") +
+        "&$count=true&$select=value,stringmapid,organizationid,attributevalue&$orderby=value asc";
 
-        const queryUrl =
-            "stringmaps?$filter=objecttypecode eq 'incident' and attributename eq 'pinswg_appealcasetype'  " +
-            (process.env.SHOWSIPS !== "true"
-                ? "and attributevalue ne 846040002"
-                : "") +
-            "&$count=true&$select=value,stringmapid,organizationid,attributevalue&$orderby=value asc";
+    // for sips
+    // "stringmaps?$filter=objecttypecode eq 'incident' and attributename eq 'pinswg_appealcasetype'&$count=true&$select=value,stringmapid,organizationid,attributevalue&$orderby=value asc";
 
-        // for sips
-        // "stringmaps?$filter=objecttypecode eq 'incident' and attributename eq 'pinswg_appealcasetype'&$count=true&$select=value,stringmapid,organizationid,attributevalue&$orderby=value asc";
+    // "stringmaps?$filter=objecttypecode eq 'incident' and attributename eq 'pinswg_appealcasetype' and value ne 'Misc Casework'&$count=true&$select=value,stringmapid,organizationid,attributevalue&$orderby=value asc";
+    //"stringmaps?$filter=objecttypecode eq 'incident' and attributename eq 'pinswg_appealcasetype' and value ne 'Developments of National Significance' and value ne 'LDP' and value ne 'Misc Casework'&$count=true&$select=value,stringmapid,organizationid,attributevalue&$orderby=value asc";
 
-        // "stringmaps?$filter=objecttypecode eq 'incident' and attributename eq 'pinswg_appealcasetype' and value ne 'Misc Casework'&$count=true&$select=value,stringmapid,organizationid,attributevalue&$orderby=value asc";
-        //"stringmaps?$filter=objecttypecode eq 'incident' and attributename eq 'pinswg_appealcasetype' and value ne 'Developments of National Significance' and value ne 'LDP' and value ne 'Misc Casework'&$count=true&$select=value,stringmapid,organizationid,attributevalue&$orderby=value asc";
-
-        const { data } = await axios.get(
-            WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
-            azureHeaders(token.access_token)
-        );
-
-        return respondSuccess(res, data);
-    } catch (error) {
-        consoleLogger(error);
-        return respondError(res, {
+    return relayGet({
+        queryUrl,
+        res,
+        errorResponse: {
             status: 400,
             code: "APPEAL_TYPES_FETCH_FAILED",
             message: "Failed to fetch appeal types"
-        });
-    }
+        }
+    });
 }
diff --git a/pages/api/endpoint/getispublishedbyid_api.js b/pages/api/endpoint/getispublishedbyid_api.js
index f434dac0..a4a8f88e 100644
--- a/pages/api/endpoint/getispublishedbyid_api.js
+++ b/pages/api/endpoint/getispublishedbyid_api.js
@@ -15,16 +15,8 @@
  *         description: Success
  */
 
-import axios from "axios";
-import { azureHeaders } from "../../../actions/core/headers";
-import { consoleLogger } from "../../../actions/core/logger";
-import { getToken } from "../../../actions/core/token";
-import { hashAPIPath } from "../../../actions/core/hash";
-import { respondError, respondSuccess } from "../middleware/apiResponse";
-
-const WEBAPI_URL =
-    process.env.RELAY_ROOT ||
-    "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
+import { respondError } from "../middleware/apiResponse";
+import { relayGet } from "../middleware/relayForwarding";
 
 export default async function ApiProxy(req, res) {
     const searchString = req.query.searchString;
@@ -37,28 +29,20 @@ export default async function ApiProxy(req, res) {
         });
     }
 
-    try {
-        const token = await getToken();
+    const escapedSearchString = searchString.split("'").join("''");
 
-        const escapedSearchString = searchString.split("'").join("''");
+    const queryUrl =
+        "incidents?$select=pinswg_environmentalstatementlocation,pinswg_publishtoweb,ticketnumber,title, _primarycontactid_value&$filter=incidentid eq " +
+        escapedSearchString +
+        " and pinswg_appealcasetype ne null &$orderby=createdon desc&$count=true";
 
-        const queryUrl =
-            "incidents?$select=pinswg_environmentalstatementlocation,pinswg_publishtoweb,ticketnumber,title, _primarycontactid_value&$filter=incidentid eq " +
-            escapedSearchString +
-            " and pinswg_appealcasetype ne null &$orderby=createdon desc&$count=true";
-
-        const { data } = await axios.get(
-            WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
-            azureHeaders(token.access_token)
-        );
-
-        return respondSuccess(res, data);
-    } catch (error) {
-        consoleLogger(error);
-        return respondError(res, {
+    return relayGet({
+        queryUrl,
+        res,
+        errorResponse: {
             status: 400,
             code: "IS_PUBLISHED_FETCH_FAILED",
             message: "Failed to fetch published state"
-        });
-    }
+        }
+    });
 }
diff --git a/pages/api/endpoint/getlinkedcases_api.js b/pages/api/endpoint/getlinkedcases_api.js
index d4b9ed84..0b7fcfac 100644
--- a/pages/api/endpoint/getlinkedcases_api.js
+++ b/pages/api/endpoint/getlinkedcases_api.js
@@ -16,16 +16,9 @@
  *         description: Success
  */
 
-import axios from "axios";
 import { azureHeadersPaged } from "../../../actions/core/headers";
-import { consoleLogger } from "../../../actions/core/logger";
-import { getToken } from "../../../actions/core/token";
-import { hashAPIPath } from "../../../actions/core/hash";
-import { respondError, respondSuccess } from "../middleware/apiResponse";
-
-const WEBAPI_URL =
-    process.env.RELAY_ROOT ||
-    "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
+import { respondError } from "../middleware/apiResponse";
+import { relayGet } from "../middleware/relayForwarding";
 
 export default async function ApiProxy(req, res) {
     const parentIncidentid = req.query.parentincidentid;
@@ -41,26 +34,19 @@ export default async function ApiProxy(req, res) {
         });
     }
 
-    try {
-        const token = await getToken();
+    const queryUrl =
+        "incidents?$count=true&$filter=_parentcaseid_value eq " +
+        parentIncidentid +
+        " and pinswg_appealcasetype ne null and pinswg_publishtoweb eq true &$select=title, incidentid";
 
-        const queryUrl =
-            "incidents?$count=true&$filter=_parentcaseid_value eq " +
-            parentIncidentid +
-            " and pinswg_appealcasetype ne null and pinswg_publishtoweb eq true &$select=title, incidentid";
-
-        const { data } = await axios.get(
-            WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
-            azureHeadersPaged(token.access_token)
-        );
-
-        return respondSuccess(res, data);
-    } catch (error) {
-        consoleLogger(error);
-        return respondError(res, {
+    return relayGet({
+        queryUrl,
+        res,
+        requestOptionsBuilder: (accessToken) => azureHeadersPaged(accessToken),
+        errorResponse: {
             status: 400,
             code: "LINKED_CASES_FETCH_FAILED",
             message: "Failed to fetch linked cases"
-        });
-    }
+        }
+    });
 }
diff --git a/pages/api/endpoint/getlpa_api.js b/pages/api/endpoint/getlpa_api.js
index 51a75b87..0055bbf8 100644
--- a/pages/api/endpoint/getlpa_api.js
+++ b/pages/api/endpoint/getlpa_api.js
@@ -12,36 +12,20 @@
  *
  */
 
-import axios from "axios";
-import { azureHeaders } from "../../../actions/core/headers";
-import { consoleLogger } from "../../../actions/core/logger";
-import { getToken } from "../../../actions/core/token";
-import { hashAPIPath } from "../../../actions/core/hash";
-import { respondError, respondSuccess } from "../middleware/apiResponse";
-
-const WEBAPI_URL =
-    process.env.RELAY_ROOT ||
-    "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
+import { respondError } from "../middleware/apiResponse";
+import { relayGet } from "../middleware/relayForwarding";
 
 export default async function ApiProxy(req, res) {
-    try {
-        const token = await getToken();
+    const queryUrl =
+        "accounts?$count=true&$filter=pinswg_isalocalplanningauthorityaccount eq 846040000&$select=name&$orderby=name asc";
 
-        const queryUrl =
-            "accounts?$count=true&$filter=pinswg_isalocalplanningauthorityaccount eq 846040000&$select=name&$orderby=name asc";
-
-        const { data } = await axios.get(
-            WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
-            azureHeaders(token.access_token)
-        );
-
-        return respondSuccess(res, data);
-    } catch (error) {
-        consoleLogger(error);
-        return respondError(res, {
+    return relayGet({
+        queryUrl,
+        res,
+        errorResponse: {
             status: 400,
             code: "LPA_FETCH_FAILED",
             message: "Failed to fetch local planning authorities"
-        });
-    }
+        }
+    });
 }
diff --git a/pages/api/endpoint/getprojecttypes_api.js b/pages/api/endpoint/getprojecttypes_api.js
index 8600c828..c5b7b534 100644
--- a/pages/api/endpoint/getprojecttypes_api.js
+++ b/pages/api/endpoint/getprojecttypes_api.js
@@ -9,36 +9,20 @@
  *         description: Success
  */
 
-import axios from "axios";
-import { azureHeaders } from "../../../actions/core/headers";
-import { consoleLogger } from "../../../actions/core/logger";
-import { getToken } from "../../../actions/core/token";
-import { hashAPIPath } from "../../../actions/core/hash";
-import { respondError, respondSuccess } from "../middleware/apiResponse";
-
-const WEBAPI_URL =
-    process.env.RELAY_ROOT ||
-    "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
+import { respondError } from "../middleware/apiResponse";
+import { relayGet } from "../middleware/relayForwarding";
 
 export default async function ApiProxy(req, res) {
-    try {
-        const token = await getToken();
+    const queryUrl =
+        "pinswg_sipsprojecttypes?$select=pinswg_name,pinswg_sipsprojecttypeid&$orderby=pinswg_name asc&$count=true";
 
-        const queryUrl =
-            "pinswg_sipsprojecttypes?$select=pinswg_name,pinswg_sipsprojecttypeid&$orderby=pinswg_name asc&$count=true";
-
-        const { data } = await axios.get(
-            WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
-            azureHeaders(token.access_token)
-        );
-
-        return respondSuccess(res, data);
-    } catch (error) {
-        consoleLogger(error);
-        return respondError(res, {
+    return relayGet({
+        queryUrl,
+        res,
+        errorResponse: {
             status: 400,
             code: "PROJECT_TYPES_FETCH_FAILED",
             message: "Failed to fetch project types"
-        });
-    }
+        }
+    });
 }