diff --git a/pages/myportal/[appealtypes].js b/pages/myportal/[appealtypes].js
index 782880c5..3ea52570 100644
--- a/pages/myportal/[appealtypes].js
+++ b/pages/myportal/[appealtypes].js
@@ -1,3 +1,4 @@
+import fs from "fs";
 import jsonpath from "jsonpath";
 import useTranslation from "next-translate/useTranslation";
 import Head from "next/head";
@@ -6,12 +7,11 @@ import { useEffect } from "react";
 import { connect } from "react-redux";
 import xpath from "xpath";
 import {
-    createCase,
     getAppealsTypes,
-    getFormData,
     getMandatoryFields,
     getPickLists,
 } from "../../actions";
+import { getProviderConfig } from "../../actions/govgateway";
 import Breadcrumbs from "../../components/breadcrumbs";
 import CookieBanner from "../../components/cookieBanner";
 import Footer from "../../components/footer";
@@ -19,31 +19,8 @@ import Header from "../../components/header";
 import BuildCheckSection from "../../components/newappeal/buildchecksection";
 import BuildSection from "../../components/newappeal/buildsection";
 import CompleteAppeal from "../../components/newappeal/complete";
-import AdvertsForm from "../../data/forms/adverts";
-import Callinss77Form from "../../data/forms/callinss77";
-import CommonLandForm from "../../data/forms/commonland";
-import CommunityInfrastructureLevys117118119Form from "../../data/forms/communityinfrastructurelevys117118119";
-import CompulsoryPurchaseOrdersForm from "../../data/forms/compulsorypurchaseorders";
-import DNSForm from "../../data/forms/dns";
-import ElectricityActForm from "../../data/forms/electricityact";
-import EnforcementListedBuildingConservationapForm from "../../data/forms/enforcementlistedbuildingconservationap";
-import EnforcementNoticeAppeals174Form from "../../data/forms/enforcementnoticeappeals174";
-import EnvironmentalPermittingForm from "../../data/forms/environmentalpermitting";
-import HarbourRevisionOrderForm from "../../data/forms/harbourrevisionorder";
-import HedgesHedgerowsTreePreservationReplacemForm from "../../data/forms/hedgeshedgerowstreepreservationreplacem";
-import HouseholderAppealHasForm from "../../data/forms/householderappealhas";
-import LawfulDevelopmentCertificateForm from "../../data/forms/lawfuldevelopmentcertificate";
-import LdpForm from "../../data/forms/ldp";
-import ListedBuildingAndConservationAreaConsenForm from "../../data/forms/listedbuildingandconservationareaconsen";
-import MaintenanceOfLands217Form from "../../data/forms/maintenanceoflands217";
-import MiscellaneousCaseworkForm from "../../data/forms/miscellaneouscasework";
-import NonValidationForm from "../../data/forms/nonvalidation";
-import PlanningAppeals78Form from "../../data/forms/planningappeals78";
-import PlanningConditionss73s79Form from "../../data/forms/planningconditionss73s79";
-import PlanningObligationAppeals106Form from "../../data/forms/planningobligationappeals106";
-import RowForm from "../../data/forms/row";
-import TransportAndWorkActForm from "../../data/forms/transportandworkact";
-import WayleaveForm from "../../data/forms/wayleave";
+import TimeOut from "../../components/timeout";
+
 import { setLoggedInUserId } from "../../store/accountDetails/action";
 import {
     setAppealLPA,
@@ -53,6 +30,7 @@ import {
     setCaseReference,
 } from "../../store/appealType/action";
 import { setForm } from "../../store/formData/action";
+import { getGovGatewayConfig } from "../../store/govgateway/action";
 import { wrapper } from "../../store/store";
 
 let Home = (props) => {
@@ -65,7 +43,6 @@ let Home = (props) => {
 
     useEffect(() => {
         //setFormTitle(formTitle);
-        console.log(router.query);
         setCaseReference(router.query.casereference);
     }, []); // eslint-disable-line react-hooks/exhaustive-deps
 
@@ -105,88 +82,6 @@ let Home = (props) => {
 
     const formTitle = selectedObj[0].value;
 
-    const getFormType = (appealType) => {
-        switch (appealType) {
-            case "adverts":
-                return <AdvertsForm props={props} />;
-            case "callinss77":
-                return <Callinss77Form props={props} />;
-            case "commonland":
-                return <CommonLandForm props={props} />;
-            case "communityinfrastructurelevys117118119":
-                return (
-                    <CommunityInfrastructureLevys117118119Form props={props} />
-                );
-            case "compulsorypurchaseorders":
-                return <CompulsoryPurchaseOrdersForm props={props} />;
-            case "dns":
-                return <DNSForm props={props} />;
-            case "electricityact":
-                return <ElectricityActForm props={props} />;
-            case "enforcementlistedbuildingconservationap":
-                return (
-                    <EnforcementListedBuildingConservationapForm
-                        props={props}
-                    />
-                );
-            case "enforcementnoticeappeals174":
-                return <EnforcementNoticeAppeals174Form props={props} />;
-            case "environmentalpermitting":
-                return <EnvironmentalPermittingForm props={props} />;
-            case "harbourrevisionorder":
-                return <HarbourRevisionOrderForm props={props} />;
-            case "harbourrhedgeshedgerowstreepreservationreplacemevisionorder":
-                return (
-                    <HedgesHedgerowsTreePreservationReplacemForm
-                        props={props}
-                    />
-                );
-            case "householderappealhas":
-                return <HouseholderAppealHasForm props={props} />;
-            case "lawfuldevelopmentcertificate":
-                return <LawfulDevelopmentCertificateForm props={props} />;
-
-            case "ldp":
-                return <LdpForm props={props} />;
-
-            case "listedbuildingandconservationareaconsen":
-                return (
-                    <ListedBuildingAndConservationAreaConsenForm
-                        props={props}
-                    />
-                );
-            case "maintenanceoflands217":
-                return <MaintenanceOfLands217Form props={props} />;
-
-            case "miscellaneouscasework":
-                return <MiscellaneousCaseworkForm props={props} />;
-
-            case "nonvalidation":
-                return <NonValidationForm props={props} />;
-
-            case "planningappeals78":
-                return <PlanningAppeals78Form props={props} />;
-
-            case "planningconditionss73s79":
-                return <PlanningConditionss73s79Form props={props} />;
-
-            case "planningobligationappeals106":
-                return <PlanningObligationAppeals106Form props={props} />;
-
-            case "row":
-                return <RowForm props={props} />;
-
-            case "transportandworkact":
-                return <TransportAndWorkActForm props={props} />;
-            case "wayleave":
-                return <WayleaveForm props={props} />;
-
-            default:
-                return <HouseholderAppealHasForm props={props} />;
-        }
-        re;
-    };
-
     const { onSubmit } = props;
 
     return (
@@ -296,14 +191,13 @@ let Home = (props) => {
                                     }
                                     props={props}
                                 />
-                                {/* {getFormType(appealtypes)} */}
                             </>
                         )}
                     </main>
                 </div>
-
                 <Footer footerLinks={footerLinks} />
             </div>
+            <TimeOut ggLogout={props.govGateway.config.end_session_endpoint} />
         </div>
     );
 };
@@ -314,15 +208,14 @@ export const getServerSideProps = wrapper.getServerSideProps(
         const { cookies } = req;
 
         console.log(cookies);
-        console.log("the query", query);
+        console.log("the query", query.appealtypes);
         let loggedInUser = cookies.pinsUser;
 
-        const [appealTypeData, mandatoryFieldsData, pickListData, formdata] =
+        const [appealTypeData, mandatoryFieldsData, pickListData] =
             await Promise.all([
                 await getAppealsTypes(),
                 await getMandatoryFields(query.appealtypes),
                 await getPickLists(query.appealtypes),
-                await getFormData(query.appealtypes),
             ]);
 
         let caseReference = {};
@@ -330,12 +223,20 @@ export const getServerSideProps = wrapper.getServerSideProps(
         caseReference.ticketnumber = query.casereference;
         caseReference.incidentid = query.inid;
 
-        console.log(caseReference);
-        let xmlStr = formdata;
-        xmlStr = formdata.value[0].formxml;
-        xmlStr = xmlStr.replace(/\\"/g, "");
+        var path = require("path");
+        const configDirectory = path.resolve(process.cwd(), "data/formsxml");
+        var xmlStr = fs.readFileSync(
+            path.join(configDirectory, query.appealtypes + ".xml"),
+            "utf8"
+        );
 
-        //console.log(caseReference, query.appealtypes, formdata);
+        xmlStr = xmlStr.replace(/\t/g, "");
+        xmlStr = xmlStr.replace(/\n/g, "");
+        xmlStr = xmlStr.replace(/> <"/g, "><");
+        xmlStr = xmlStr.toString();
+
+        const providerConfig = await getProviderConfig();
+        store.dispatch(getGovGatewayConfig(providerConfig));
         store.dispatch(setLoggedInUserId(loggedInUser));
         store.dispatch(setAppealLPA(query.lpa));
         store.dispatch(setAppealTypeID(query.apt));
@@ -353,6 +254,7 @@ const mapStateToProps = (state) => {
         appealType: state.appealType,
         form: state.form,
         accountDetails: state.accountDetails,
+        govGateway: state.govGateway,
     };
 };
 
diff --git a/pages/myportal/index.js b/pages/myportal/index.js
index dbf7b7ff..28c7207a 100644
--- a/pages/myportal/index.js
+++ b/pages/myportal/index.js
@@ -154,14 +154,6 @@ export const getServerSideProps = wrapper.getServerSideProps(
 
         let providerConfig = await getProviderConfig();
 
-        // console.log(
-        //     "logout endpoint: ",
-        //     providerConfig.end_session_endpoint,
-        //     "\n",
-        //     "redirect:",
-        //     process.env.GG_REDIRECT_URI
-        //);
-
         store.dispatch(getGovGatewayConfig(providerConfig));
 
         const [
diff --git a/pages/newappeal/[appealtypes].js b/pages/newappeal/[appealtypes].js
index 8a43cf36..5c1c5918 100644
--- a/pages/newappeal/[appealtypes].js
+++ b/pages/newappeal/[appealtypes].js
@@ -1,3 +1,4 @@
+import fs from "fs";
 import jsonpath from "jsonpath";
 import useTranslation from "next-translate/useTranslation";
 import Head from "next/head";
@@ -8,10 +9,10 @@ import xpath from "xpath";
 import {
     createCase,
     getAppealsTypes,
-    getFormData,
     getMandatoryFields,
     getPickLists,
 } from "../../actions";
+import { getProviderConfig } from "../../actions/govgateway";
 import Breadcrumbs from "../../components/breadcrumbs";
 import CookieBanner from "../../components/cookieBanner";
 import Footer from "../../components/footer";
@@ -19,31 +20,8 @@ import Header from "../../components/header";
 import BuildCheckSection from "../../components/newappeal/buildchecksection";
 import BuildSection from "../../components/newappeal/buildsection";
 import CompleteAppeal from "../../components/newappeal/complete";
-import AdvertsForm from "../../data/forms/adverts";
-import Callinss77Form from "../../data/forms/callinss77";
-import CommonLandForm from "../../data/forms/commonland";
-import CommunityInfrastructureLevys117118119Form from "../../data/forms/communityinfrastructurelevys117118119";
-import CompulsoryPurchaseOrdersForm from "../../data/forms/compulsorypurchaseorders";
-import DNSForm from "../../data/forms/dns";
-import ElectricityActForm from "../../data/forms/electricityact";
-import EnforcementListedBuildingConservationapForm from "../../data/forms/enforcementlistedbuildingconservationap";
-import EnforcementNoticeAppeals174Form from "../../data/forms/enforcementnoticeappeals174";
-import EnvironmentalPermittingForm from "../../data/forms/environmentalpermitting";
-import HarbourRevisionOrderForm from "../../data/forms/harbourrevisionorder";
-import HedgesHedgerowsTreePreservationReplacemForm from "../../data/forms/hedgeshedgerowstreepreservationreplacem";
-import HouseholderAppealHasForm from "../../data/forms/householderappealhas";
-import LawfulDevelopmentCertificateForm from "../../data/forms/lawfuldevelopmentcertificate";
-import LdpForm from "../../data/forms/ldp";
-import ListedBuildingAndConservationAreaConsenForm from "../../data/forms/listedbuildingandconservationareaconsen";
-import MaintenanceOfLands217Form from "../../data/forms/maintenanceoflands217";
-import MiscellaneousCaseworkForm from "../../data/forms/miscellaneouscasework";
-import NonValidationForm from "../../data/forms/nonvalidation";
-import PlanningAppeals78Form from "../../data/forms/planningappeals78";
-import PlanningConditionss73s79Form from "../../data/forms/planningconditionss73s79";
-import PlanningObligationAppeals106Form from "../../data/forms/planningobligationappeals106";
-import RowForm from "../../data/forms/row";
-import TransportAndWorkActForm from "../../data/forms/transportandworkact";
-import WayleaveForm from "../../data/forms/wayleave";
+import TimeOut from "../../components/timeout";
+
 import { setLoggedInUserId } from "../../store/accountDetails/action";
 import {
     setAppealLPA,
@@ -53,6 +31,7 @@ import {
     setCaseReference,
 } from "../../store/appealType/action";
 import { setForm } from "../../store/formData/action";
+import { getGovGatewayConfig } from "../../store/govgateway/action";
 import { wrapper } from "../../store/store";
 
 let Home = (props) => {
@@ -104,88 +83,6 @@ let Home = (props) => {
 
     const formTitle = selectedObj[0].value;
 
-    const getFormType = (appealType) => {
-        switch (appealType) {
-            case "adverts":
-                return <AdvertsForm props={props} />;
-            case "callinss77":
-                return <Callinss77Form props={props} />;
-            case "commonland":
-                return <CommonLandForm props={props} />;
-            case "communityinfrastructurelevys117118119":
-                return (
-                    <CommunityInfrastructureLevys117118119Form props={props} />
-                );
-            case "compulsorypurchaseorders":
-                return <CompulsoryPurchaseOrdersForm props={props} />;
-            case "dns":
-                return <DNSForm props={props} />;
-            case "electricityact":
-                return <ElectricityActForm props={props} />;
-            case "enforcementlistedbuildingconservationap":
-                return (
-                    <EnforcementListedBuildingConservationapForm
-                        props={props}
-                    />
-                );
-            case "enforcementnoticeappeals174":
-                return <EnforcementNoticeAppeals174Form props={props} />;
-            case "environmentalpermitting":
-                return <EnvironmentalPermittingForm props={props} />;
-            case "harbourrevisionorder":
-                return <HarbourRevisionOrderForm props={props} />;
-            case "harbourrhedgeshedgerowstreepreservationreplacemevisionorder":
-                return (
-                    <HedgesHedgerowsTreePreservationReplacemForm
-                        props={props}
-                    />
-                );
-            case "householderappealhas":
-                return <HouseholderAppealHasForm props={props} />;
-            case "lawfuldevelopmentcertificate":
-                return <LawfulDevelopmentCertificateForm props={props} />;
-
-            case "ldp":
-                return <LdpForm props={props} />;
-
-            case "listedbuildingandconservationareaconsen":
-                return (
-                    <ListedBuildingAndConservationAreaConsenForm
-                        props={props}
-                    />
-                );
-            case "maintenanceoflands217":
-                return <MaintenanceOfLands217Form props={props} />;
-
-            case "miscellaneouscasework":
-                return <MiscellaneousCaseworkForm props={props} />;
-
-            case "nonvalidation":
-                return <NonValidationForm props={props} />;
-
-            case "planningappeals78":
-                return <PlanningAppeals78Form props={props} />;
-
-            case "planningconditionss73s79":
-                return <PlanningConditionss73s79Form props={props} />;
-
-            case "planningobligationappeals106":
-                return <PlanningObligationAppeals106Form props={props} />;
-
-            case "row":
-                return <RowForm props={props} />;
-
-            case "transportandworkact":
-                return <TransportAndWorkActForm props={props} />;
-            case "wayleave":
-                return <WayleaveForm props={props} />;
-
-            default:
-                return <HouseholderAppealHasForm props={props} />;
-        }
-        re;
-    };
-
     const { onSubmit } = props;
 
     return (
@@ -295,7 +192,6 @@ let Home = (props) => {
                                     }
                                     props={props}
                                 />
-                                {/* {getFormType(appealtypes)} */}
                             </>
                         )}
                     </main>
@@ -303,6 +199,7 @@ let Home = (props) => {
 
                 <Footer footerLinks={footerLinks} />
             </div>
+            <TimeOut ggLogout={props.govGateway.config.end_session_endpoint} />
         </div>
     );
 };
@@ -321,21 +218,29 @@ export const getServerSideProps = wrapper.getServerSideProps(
             appealTypeData,
             mandatoryFieldsData,
             pickListData,
-            formdata,
         ] = await Promise.all([
             await createCase(query.apt, query.lpa, loggedInUser),
             await getAppealsTypes(),
             await getMandatoryFields(query.appealtypes),
             await getPickLists(query.appealtypes),
-            await getFormData(query.appealtypes),
         ]);
 
         let caseReference = caseReferenceData;
-        let xmlStr = formdata;
-        xmlStr = formdata.value[0].formxml;
-        xmlStr = xmlStr.replace(/\\"/g, "");
 
-        //console.log(caseReference, query.appealtypes, formdata);
+        var path = require("path");
+        const configDirectory = path.resolve(process.cwd(), "data/formsxml");
+        var xmlStr = fs.readFileSync(
+            path.join(configDirectory, query.appealtypes + ".xml"),
+            "utf8"
+        );
+        // xmlStr = formdata.value[0].formxml;
+        xmlStr = xmlStr.replace(/\t/g, "");
+        xmlStr = xmlStr.replace(/\n/g, "");
+        xmlStr = xmlStr.replace(/> <"/g, "><");
+        xmlStr = xmlStr.toString();
+
+        const providerConfig = await getProviderConfig();
+        store.dispatch(getGovGatewayConfig(providerConfig));
         store.dispatch(setLoggedInUserId(loggedInUser));
         store.dispatch(setAppealLPA(query.lpa));
         store.dispatch(setAppealTypeID(query.apt));
@@ -353,6 +258,7 @@ const mapStateToProps = (state) => {
         appealType: state.appealType,
         form: state.form,
         accountDetails: state.accountDetails,
+        govGateway: state.govGateway,
     };
 };