From c48f60e6671dd120433427c5882ac857a42c005e Mon Sep 17 00:00:00 2001
From: Miguel Escriva <miesgre@gmail.com>
Date: Tue, 30 Jan 2024 12:59:58 +0100
Subject: [PATCH] Delete unused templates and properties files

---
 .../resources/cas-theme-custom.properties     |   2 -
 .../acceptto/casAccepttoRegistrationView.html |  76 ----
 .../acct-mgmt/casAccountSignupView.html       | 104 -----
 .../casAccountSignupViewComplete.html         | 215 -----------
 .../casAccountSignupViewCompleted.html        |  18 -
 .../casAccountSignupViewSentInfo.html         |  18 -
 .../acct/casMyAccountProfile.html             |  83 ----
 .../casRiskAuthenticationBlockedView.html     |  21 -
 .../admin/casAdminLoginView.html              |  97 -----
 .../aup/casAcceptableUsagePolicyView.html     |  55 ---
 .../authy/casAuthyLoginView.html              |  64 ----
 .../consent/casConsentView.html               | 267 -------------
 .../casDelegatedAuthnErrorView.html           |  23 --
 .../casDelegatedAuthnSelectionView.html       |  71 ----
 .../casDelegatedAuthnStopWebflow.html         |  78 ----
 .../casDynamicDiscoveryView.html              |  69 ----
 .../duo-security/casDuoLoginView.html         |  36 --
 .../resources/templates_original/error.html   |  40 --
 .../templates_original/error/400.html         |  21 -
 .../templates_original/error/401.html         |  24 --
 .../templates_original/error/403.html         |  28 --
 .../templates_original/error/404.html         |  25 --
 .../templates_original/error/405.html         |  23 --
 .../templates_original/error/423.html         |  22 --
 .../error/casServiceErrorView.html            |  22 --
 .../error/casWebflowConfigErrorView.html      |  27 --
 .../casForgotUsernameSendInfoView.html        |  87 -----
 .../casForgotUsernameSentInfoView.html        |  22 --
 .../fragments/accepttoQRCode.html             |  79 ----
 .../fragments/accountprofileapplications.html |  73 ----
 .../fragments/accountprofileattributes.html   |  61 ---
 .../fragments/accountprofileauditlog.html     | 105 -----
 .../fragments/accountprofileconsent.html      | 101 -----
 .../fragments/accountprofilemfadevices.html   | 101 -----
 .../fragments/accountprofilenavigation.html   | 123 ------
 .../fragments/accountprofileoverview.html     |  32 --
 .../accountprofilesecurityquestions.html      | 128 -------
 .../fragments/accountprofilesessions.html     | 104 -----
 .../templates_original/fragments/footer.html  |   5 -
 .../fragments/googleanalytics.html            |  20 -
 .../templates_original/fragments/header.html  | 237 ------------
 .../fragments/includes.html                   |  15 -
 .../fragments/loginProviders.html             | 179 ---------
 .../fragments/logindrawer.html                |  77 ----
 .../fragments/loginform.html                  | 361 ------------------
 .../fragments/loginsidebar.html               |  24 --
 .../templates_original/fragments/pmlinks.html |  47 ---
 .../fragments/pwdupdateform.html              | 165 --------
 .../fragments/qrAuthentication.html           | 111 ------
 .../fragments/recaptcha.html                  |  56 ---
 .../templates_original/fragments/scripts.html |  24 --
 .../fragments/serviceui.html                  |  50 ---
 .../fragments/submitbutton.html               |  75 ----
 .../fragments/unlockaccount.html              |  91 -----
 .../fragments/webAuthnLogin.html              | 152 --------
 ...eAuthenticatorConfirmRegistrationView.html |  66 ----
 .../casGoogleAuthenticatorLoginView.html      | 103 -----
 ...asGoogleAuthenticatorRegistrationView.html | 195 ----------
 .../gua/casGuaDisplayUserGraphicsView.html    |  45 ---
 .../gua/casGuaGetUserIdView.html              |  52 ---
 .../interrupt/casInterruptView.html           | 126 ------
 .../inwebo/casInweboCheckResultView.html      |  28 --
 .../inwebo/casInweboErrorView.html            | 169 --------
 .../inwebo/casInweboMAAuthnView.html          |  99 -----
 .../inwebo/casInweboSelectAuthnView.html      |  35 --
 .../inwebo/casInweboVAAuthnView.html          |  55 ---
 .../resources/templates_original/layout.html  |  50 ---
 .../login-error/casAccountDisabledView.html   |  28 --
 .../login-error/casAccountLockedView.html     |  24 --
 .../login-error/casAccountUnlockedView.html   |  24 --
 .../casAuthenticationBlockedView.html         |  21 -
 .../login-error/casBadHoursView.html          |  20 -
 .../login-error/casBadWorkstationView.html    |  20 -
 .../login-error/casExpiredPassView.html       |  23 --
 .../login-error/casMustChangePassView.html    |  23 --
 .../login/casConfirmView.html                 |  46 ---
 .../login/casGenericSuccessView.html          | 207 ----------
 .../login/casLoginMessageView.html            |  45 ---
 .../login/casLoginView.html                   |  47 ---
 .../logout/casConfirmLogoutView.html          |  64 ----
 .../logout/casLogoutView.html                 |  30 --
 .../logout/casPropagateLogoutView.html        |  92 -----
 .../casMfaRegisterDeviceView.html             |  91 -----
 .../casCompositeMfaProviderSelectionView.html |  44 ---
 .../mfa/casMfaDeniedView.html                 |  22 --
 .../mfa/casMfaUnavailableView.html            |  21 -
 .../casPasswordUpdateSuccessView.html         |  30 --
 .../casResetPasswordErrorView.html            |  22 --
 .../casResetPasswordSendInstructionsView.html |  78 ----
 .../casResetPasswordSentInstructionsView.html |  23 --
 .../casResetPasswordVerifyQuestionsView.html  |  78 ----
 .../casPasswordlessDisplayView.html           |  65 ----
 .../casPasswordlessGetUserIdView.html         |  62 ---
 .../protocol/2.0/casProxyFailureView.html     |   3 -
 .../protocol/2.0/casProxySuccessView.html     |   5 -
 .../2.0/casServiceValidationFailure.html      |   3 -
 .../2.0/casServiceValidationSuccess.html      |   9 -
 .../3.0/casServiceValidationFailure.html      |   3 -
 .../3.0/casServiceValidationSuccess.html      |  14 -
 .../protocol/casPostResponseView.html         |  17 -
 .../protocol/oauth/confirm.html               |  20 -
 .../protocol/oauth/deviceCodeApproval.html    |  55 ---
 .../protocol/oauth/deviceCodeApproved.html    |  15 -
 .../oauth/sessionStaleMismatchError.html      |  17 -
 .../protocol/oidc/confirm.html                |  82 ----
 .../casOpenIdAssociationSuccessView.html      |   7 -
 .../openid/casOpenIdServiceFailureView.html   |   2 -
 .../openid/casOpenIdServiceSuccessView.html   |   2 -
 .../protocol/openid/user.html                 |   6 -
 .../radius/casRadiusLoginView.html            |  65 ----
 .../casSamlIdPDiscoveryView.html              |  51 ---
 .../saml2-idp/casSamlIdPErrorView.html        |  23 --
 .../simple-mfa/casSimpleMfaLoginView.html     |  85 -----
 .../storage/casSessionStorageReadView.html    |  20 -
 .../storage/casSessionStorageWriteView.html   |  32 --
 .../surrogate/casSurrogateAuthnListView.html  |  53 ---
 .../casSurrogateAuthnWildcardView.html        |  24 --
 .../swivel/casSwivelLoginView.html            |  69 ----
 .../u2f/casU2fLoginView.html                  |  61 ---
 .../u2f/casU2fRegistrationView.html           |  60 ---
 .../webauthn/casWebAuthnLoginView.html        |  23 --
 .../webauthn/casWebAuthnRegistrationView.html | 177 ---------
 .../wsfed/casWsFedStopWebflow.html            |  21 -
 .../yubikey/casYubiKeyLoginView.html          |  83 ----
 .../yubikey/casYubiKeyRegistrationView.html   |  86 -----
 125 files changed, 7700 deletions(-)
 delete mode 100644 src/main/resources/cas-theme-custom.properties
 delete mode 100644 src/main/resources/templates_original/acceptto/casAccepttoRegistrationView.html
 delete mode 100644 src/main/resources/templates_original/acct-mgmt/casAccountSignupView.html
 delete mode 100644 src/main/resources/templates_original/acct-mgmt/casAccountSignupViewComplete.html
 delete mode 100644 src/main/resources/templates_original/acct-mgmt/casAccountSignupViewCompleted.html
 delete mode 100644 src/main/resources/templates_original/acct-mgmt/casAccountSignupViewSentInfo.html
 delete mode 100644 src/main/resources/templates_original/acct/casMyAccountProfile.html
 delete mode 100644 src/main/resources/templates_original/adaptive-authn/casRiskAuthenticationBlockedView.html
 delete mode 100644 src/main/resources/templates_original/admin/casAdminLoginView.html
 delete mode 100644 src/main/resources/templates_original/aup/casAcceptableUsagePolicyView.html
 delete mode 100644 src/main/resources/templates_original/authy/casAuthyLoginView.html
 delete mode 100644 src/main/resources/templates_original/consent/casConsentView.html
 delete mode 100644 src/main/resources/templates_original/delegated-authn/casDelegatedAuthnErrorView.html
 delete mode 100644 src/main/resources/templates_original/delegated-authn/casDelegatedAuthnSelectionView.html
 delete mode 100644 src/main/resources/templates_original/delegated-authn/casDelegatedAuthnStopWebflow.html
 delete mode 100644 src/main/resources/templates_original/delegated-authn/casDynamicDiscoveryView.html
 delete mode 100644 src/main/resources/templates_original/duo-security/casDuoLoginView.html
 delete mode 100644 src/main/resources/templates_original/error.html
 delete mode 100644 src/main/resources/templates_original/error/400.html
 delete mode 100644 src/main/resources/templates_original/error/401.html
 delete mode 100644 src/main/resources/templates_original/error/403.html
 delete mode 100644 src/main/resources/templates_original/error/404.html
 delete mode 100644 src/main/resources/templates_original/error/405.html
 delete mode 100644 src/main/resources/templates_original/error/423.html
 delete mode 100644 src/main/resources/templates_original/error/casServiceErrorView.html
 delete mode 100644 src/main/resources/templates_original/error/casWebflowConfigErrorView.html
 delete mode 100644 src/main/resources/templates_original/forgot-username/casForgotUsernameSendInfoView.html
 delete mode 100644 src/main/resources/templates_original/forgot-username/casForgotUsernameSentInfoView.html
 delete mode 100644 src/main/resources/templates_original/fragments/accepttoQRCode.html
 delete mode 100644 src/main/resources/templates_original/fragments/accountprofileapplications.html
 delete mode 100644 src/main/resources/templates_original/fragments/accountprofileattributes.html
 delete mode 100644 src/main/resources/templates_original/fragments/accountprofileauditlog.html
 delete mode 100644 src/main/resources/templates_original/fragments/accountprofileconsent.html
 delete mode 100644 src/main/resources/templates_original/fragments/accountprofilemfadevices.html
 delete mode 100644 src/main/resources/templates_original/fragments/accountprofilenavigation.html
 delete mode 100644 src/main/resources/templates_original/fragments/accountprofileoverview.html
 delete mode 100644 src/main/resources/templates_original/fragments/accountprofilesecurityquestions.html
 delete mode 100644 src/main/resources/templates_original/fragments/accountprofilesessions.html
 delete mode 100644 src/main/resources/templates_original/fragments/footer.html
 delete mode 100644 src/main/resources/templates_original/fragments/googleanalytics.html
 delete mode 100644 src/main/resources/templates_original/fragments/header.html
 delete mode 100644 src/main/resources/templates_original/fragments/includes.html
 delete mode 100644 src/main/resources/templates_original/fragments/loginProviders.html
 delete mode 100644 src/main/resources/templates_original/fragments/logindrawer.html
 delete mode 100644 src/main/resources/templates_original/fragments/loginform.html
 delete mode 100644 src/main/resources/templates_original/fragments/loginsidebar.html
 delete mode 100644 src/main/resources/templates_original/fragments/pmlinks.html
 delete mode 100644 src/main/resources/templates_original/fragments/pwdupdateform.html
 delete mode 100644 src/main/resources/templates_original/fragments/qrAuthentication.html
 delete mode 100644 src/main/resources/templates_original/fragments/recaptcha.html
 delete mode 100644 src/main/resources/templates_original/fragments/scripts.html
 delete mode 100644 src/main/resources/templates_original/fragments/serviceui.html
 delete mode 100644 src/main/resources/templates_original/fragments/submitbutton.html
 delete mode 100644 src/main/resources/templates_original/fragments/unlockaccount.html
 delete mode 100644 src/main/resources/templates_original/fragments/webAuthnLogin.html
 delete mode 100644 src/main/resources/templates_original/gauth/casGoogleAuthenticatorConfirmRegistrationView.html
 delete mode 100644 src/main/resources/templates_original/gauth/casGoogleAuthenticatorLoginView.html
 delete mode 100644 src/main/resources/templates_original/gauth/casGoogleAuthenticatorRegistrationView.html
 delete mode 100644 src/main/resources/templates_original/gua/casGuaDisplayUserGraphicsView.html
 delete mode 100644 src/main/resources/templates_original/gua/casGuaGetUserIdView.html
 delete mode 100644 src/main/resources/templates_original/interrupt/casInterruptView.html
 delete mode 100644 src/main/resources/templates_original/inwebo/casInweboCheckResultView.html
 delete mode 100644 src/main/resources/templates_original/inwebo/casInweboErrorView.html
 delete mode 100644 src/main/resources/templates_original/inwebo/casInweboMAAuthnView.html
 delete mode 100644 src/main/resources/templates_original/inwebo/casInweboSelectAuthnView.html
 delete mode 100644 src/main/resources/templates_original/inwebo/casInweboVAAuthnView.html
 delete mode 100644 src/main/resources/templates_original/layout.html
 delete mode 100644 src/main/resources/templates_original/login-error/casAccountDisabledView.html
 delete mode 100644 src/main/resources/templates_original/login-error/casAccountLockedView.html
 delete mode 100644 src/main/resources/templates_original/login-error/casAccountUnlockedView.html
 delete mode 100644 src/main/resources/templates_original/login-error/casAuthenticationBlockedView.html
 delete mode 100644 src/main/resources/templates_original/login-error/casBadHoursView.html
 delete mode 100644 src/main/resources/templates_original/login-error/casBadWorkstationView.html
 delete mode 100644 src/main/resources/templates_original/login-error/casExpiredPassView.html
 delete mode 100644 src/main/resources/templates_original/login-error/casMustChangePassView.html
 delete mode 100644 src/main/resources/templates_original/login/casConfirmView.html
 delete mode 100644 src/main/resources/templates_original/login/casGenericSuccessView.html
 delete mode 100644 src/main/resources/templates_original/login/casLoginMessageView.html
 delete mode 100644 src/main/resources/templates_original/login/casLoginView.html
 delete mode 100644 src/main/resources/templates_original/logout/casConfirmLogoutView.html
 delete mode 100644 src/main/resources/templates_original/logout/casLogoutView.html
 delete mode 100644 src/main/resources/templates_original/logout/casPropagateLogoutView.html
 delete mode 100644 src/main/resources/templates_original/mfa-trusted-devices/casMfaRegisterDeviceView.html
 delete mode 100644 src/main/resources/templates_original/mfa/casCompositeMfaProviderSelectionView.html
 delete mode 100644 src/main/resources/templates_original/mfa/casMfaDeniedView.html
 delete mode 100644 src/main/resources/templates_original/mfa/casMfaUnavailableView.html
 delete mode 100644 src/main/resources/templates_original/password-reset/casPasswordUpdateSuccessView.html
 delete mode 100644 src/main/resources/templates_original/password-reset/casResetPasswordErrorView.html
 delete mode 100644 src/main/resources/templates_original/password-reset/casResetPasswordSendInstructionsView.html
 delete mode 100644 src/main/resources/templates_original/password-reset/casResetPasswordSentInstructionsView.html
 delete mode 100644 src/main/resources/templates_original/password-reset/casResetPasswordVerifyQuestionsView.html
 delete mode 100644 src/main/resources/templates_original/passwordless/casPasswordlessDisplayView.html
 delete mode 100644 src/main/resources/templates_original/passwordless/casPasswordlessGetUserIdView.html
 delete mode 100644 src/main/resources/templates_original/protocol/2.0/casProxyFailureView.html
 delete mode 100644 src/main/resources/templates_original/protocol/2.0/casProxySuccessView.html
 delete mode 100644 src/main/resources/templates_original/protocol/2.0/casServiceValidationFailure.html
 delete mode 100644 src/main/resources/templates_original/protocol/2.0/casServiceValidationSuccess.html
 delete mode 100644 src/main/resources/templates_original/protocol/3.0/casServiceValidationFailure.html
 delete mode 100644 src/main/resources/templates_original/protocol/3.0/casServiceValidationSuccess.html
 delete mode 100644 src/main/resources/templates_original/protocol/casPostResponseView.html
 delete mode 100644 src/main/resources/templates_original/protocol/oauth/confirm.html
 delete mode 100644 src/main/resources/templates_original/protocol/oauth/deviceCodeApproval.html
 delete mode 100644 src/main/resources/templates_original/protocol/oauth/deviceCodeApproved.html
 delete mode 100644 src/main/resources/templates_original/protocol/oauth/sessionStaleMismatchError.html
 delete mode 100644 src/main/resources/templates_original/protocol/oidc/confirm.html
 delete mode 100644 src/main/resources/templates_original/protocol/openid/casOpenIdAssociationSuccessView.html
 delete mode 100644 src/main/resources/templates_original/protocol/openid/casOpenIdServiceFailureView.html
 delete mode 100644 src/main/resources/templates_original/protocol/openid/casOpenIdServiceSuccessView.html
 delete mode 100644 src/main/resources/templates_original/protocol/openid/user.html
 delete mode 100644 src/main/resources/templates_original/radius/casRadiusLoginView.html
 delete mode 100644 src/main/resources/templates_original/saml2-discovery/casSamlIdPDiscoveryView.html
 delete mode 100644 src/main/resources/templates_original/saml2-idp/casSamlIdPErrorView.html
 delete mode 100644 src/main/resources/templates_original/simple-mfa/casSimpleMfaLoginView.html
 delete mode 100644 src/main/resources/templates_original/storage/casSessionStorageReadView.html
 delete mode 100644 src/main/resources/templates_original/storage/casSessionStorageWriteView.html
 delete mode 100644 src/main/resources/templates_original/surrogate/casSurrogateAuthnListView.html
 delete mode 100644 src/main/resources/templates_original/surrogate/casSurrogateAuthnWildcardView.html
 delete mode 100644 src/main/resources/templates_original/swivel/casSwivelLoginView.html
 delete mode 100644 src/main/resources/templates_original/u2f/casU2fLoginView.html
 delete mode 100644 src/main/resources/templates_original/u2f/casU2fRegistrationView.html
 delete mode 100644 src/main/resources/templates_original/webauthn/casWebAuthnLoginView.html
 delete mode 100644 src/main/resources/templates_original/webauthn/casWebAuthnRegistrationView.html
 delete mode 100644 src/main/resources/templates_original/wsfed/casWsFedStopWebflow.html
 delete mode 100644 src/main/resources/templates_original/yubikey/casYubiKeyLoginView.html
 delete mode 100644 src/main/resources/templates_original/yubikey/casYubiKeyRegistrationView.html

diff --git a/src/main/resources/cas-theme-custom.properties b/src/main/resources/cas-theme-custom.properties
deleted file mode 100644
index 8c8e3e0..0000000
--- a/src/main/resources/cas-theme-custom.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-# Custom theme properties to override the default.
-# This file is intentionally left blank to allow for customizations.
diff --git a/src/main/resources/templates_original/acceptto/casAccepttoRegistrationView.html b/src/main/resources/templates_original/acceptto/casAccepttoRegistrationView.html
deleted file mode 100644
index 6ba30cd..0000000
--- a/src/main/resources/templates_original/acceptto/casAccepttoRegistrationView.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title>Acceptto Registration View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-
-    <script type="text/javascript" src="https://faye.acceptto.com/faye/faye.js"></script>
-    <script type="text/javascript" src="https://dbfp.acceptto.com/bfp.js"></script>
-</head>
-
-<body>
-    <main role="main" class="container mt-3 mb-3">
-        <div layout:fragment="content" id="login" class="mdc-card card p-4 m-auto w-lg-66">
-            <h3>Register Device</h3>
-
-            <ol>
-                <li>Open the app store and search for "Acceptto It's Me".</li>
-                <li>Install the "Acceptto It's Me" application.</li>
-                <li>Open the application and follow the instructions to access the QR Code scanner.</li>
-                <li>Scan this QR Code.</li>
-            </ol>
-
-            <div class="d-flex justify-content-center">
-                <a href="https://itunes.apple.com/us/app/acceptto-itsme/id893534370?mt=8" target="_blank" class="me-2">
-                    <img src="https://s3-us-west-2.amazonaws.com/acceptto-log-and-graphics/Asset+14.png" alt="App Store"
-                        title="App Store" width="151.25" height="50">
-                </a>
-                <a href="https://play.google.com/store/apps/details?id=com.acceptto.mfa&amp;amp;hl=en" target="_blank">
-                    <img src="https://s3-us-west-2.amazonaws.com/acceptto-log-and-graphics/Asset+13.png"
-                        alt="Google Play" title="Google Play" width="151.25" height="50">
-                </a>
-            </div>
-
-            <form method="POST" id="fmAccepttoQRCode">
-                <script type="text/javascript" th:inline="javascript">
-                    /*<![CDATA[*/
-                    $(() => {
-                        var invitationToken = /*[[${accepttoInvitationToken}]]*/;
-                        var hashCode = /*[[${accepttoInvitationTokenQRCodeHash}]]*/;
-                        var src = "https://chart.apis.google.com/chart?cht=qr&chs=250x250&chl=" + hashCode + "&chld=H|0";
-                        $('#qrLoginCode').attr("src", src);
-                        var faye = new Faye.Client("https://faye.acceptto.com/faye");
-                        faye.subscribe("/messages/" + invitationToken,
-                            function (data) {
-                                setTimeout(function () {
-                                    $('#fmAccepttoQRCode').submit();
-                                }, 2500);
-                            }
-                        );
-                    });
-                /*]]>*/
-                </script>
-
-                <input type="hidden" name="_eventId" value="success" />
-                <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-            </form>
-            <div class="d-flex justify-content-center flex-column align-items-center">
-                <img class="autowidth my-4" id="qrLoginCode" width="250" />
-                <div class="progress" style="height: 35px;">
-                    <div class="progress-bar bg-info progress-bar-striped progress-bar-animated" role="progressbar"
-                        aria-valuenow="99" aria-valuemin="0" aria-valuemax="100" style="width: 100%">
-                        <span style="font-size: larger">Waiting for device registration notification...</span>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </main>
-
-
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/acct-mgmt/casAccountSignupView.html b/src/main/resources/templates_original/acct-mgmt/casAccountSignupView.html
deleted file mode 100644
index df8a0a0..0000000
--- a/src/main/resources/templates_original/acct-mgmt/casAccountSignupView.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body id="cas">
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" class="mdc-card p-4 m-auto w-lg-100">
-        <script>
-            function jqueryReady() {
-                document.forms[0].elements[0].focus();
-            }
-        </script>
-
-        <h2 th:utext="#{cas.screen.acct.title}" />
-        <p class="intro" th:utext="#{cas.screen.acct.intro}" />
-                 
-        <form method="post" id="fm1">
-            <div class="banner banner-danger my-2" th:if="${flowRequestContext.messageContext.hasErrorMessages()}">
-                <p th:each="message : ${flowRequestContext.messageContext.allMessages}"
-                   th:utext="${message.text}">Message Text</p>
-            </div>
-
-
-            <section th:each="entry : ${registrationProperties}" class="cas-field my-3">
-                <div>
-                    <label class="mdc-text-field mdc-text-field--outlined"
-                           th:if="${entry.type != 'select'}">
-                        <input class="mdc-text-field__input"
-                               th:id="${entry.name}"
-                               th:name="${entry.name}"
-                               size="25"
-                               th:classappend="${entry.cssClass}"
-                               th:type="${entry.type}"
-                               th:attr="required=${entry.required ? 'true' : 'false'},pattern=${entry.pattern}"
-                               autocapitalize="none"
-                               th:title="#{${entry.title}}"
-                               spellcheck="false"
-                               th:autocomplete="${entry.name}"/>
-                        <span class="mdc-notched-outline">
-                            <span class="mdc-notched-outline__leading"></span>
-                            <span class="mdc-notched-outline__notch">
-                              <span class="mdc-floating-label" th:utext="#{${entry.label}}">Label</span>
-                            </span>
-                            <span class="mdc-notched-outline__trailing"></span>
-                       </span>
-                    </label>
-
-                    <select th:if="${entry.type == 'select'}"
-                            th:id="${entry.name}"
-                            th:title="#{${entry.title}}"
-                            th:name="${entry.name}"
-                            th:classappend="${'custom-select ' + entry.cssClass}">
-                            <option th:each="option,status : ${entry.values}" th:value="${status.index}" th:text="${option}" />
-                    </select>
-                    
-                    <div class="mdc-text-field-helper-line" th:if="${entry.validationMessage != null}">
-                        <div th:id="${'helpertext-' + entry.name}"
-                             class="mdc-text-field-helper-text mdc-text-field-helper-text--validation-msg"
-                             aria-hidden="true">
-                            <span th:if="${entry.validationMessage != null}"
-                                  th:utext="#{${entry.validationMessage}}"></span>
-                        </div>
-                    </div>
-                </div>
-
-            </section>
-            
-            <span th:if="${accountRegistrationCaptchaEnabled}">
-                <div th:replace="fragments/recaptcha :: recaptchaToken" />
-            </span>
-            
-            <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-            <input type="hidden" name="_eventId" value="submit"/>
-            <div class="form-actions d-flex justify-content-center">
-                <button class="mdc-button mdc-button--raised me-2"
-                        name="submit"
-                        th:value="#{cas.screen.acct.button.submit}"
-                        id="submit"
-                        accesskey="s">
-                    <span class="mdc-button__label" th:value="#{cas.screen.acct.button.submit}">Submit</span>
-                </button>
-                &nbsp;
-                <button class="mdc-button mdc-button--outlined"
-                        name="cancel"
-                        th:value="#{cas.screen.acct.button.cancel}"
-                        accesskey="c"
-                        id="cancel"
-                        type="button"
-                        onclick="location.href = location.href;">
-                    <span class="mdc-button__label" th:text="#{cas.screen.acct.button.cancel}">CANCEL</span>
-                </button>
-            </div>
-        </form>
-    </div>
-
-
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/acct-mgmt/casAccountSignupViewComplete.html b/src/main/resources/templates_original/acct-mgmt/casAccountSignupViewComplete.html
deleted file mode 100644
index 4ec1c07..0000000
--- a/src/main/resources/templates_original/acct-mgmt/casAccountSignupViewComplete.html
+++ /dev/null
@@ -1,215 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <script type="text/javascript" th:src="@{#{webjars.zxcvbn.js}}"></script>
-    <script type="text/javascript" th:src="@{/js/passwordMeter.js}"></script>
-
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body id="cas">
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" class="mdc-card p-4 m-auto w-lg-100">
-        <script th:inline="javascript">
-            /*<![CDATA[*/
-
-            let policyPattern = /*[[${passwordPolicyPattern}]]*/;
-            let passwordStrengthI18n = {
-                0: /*[[#{screen.pm.password.strength.0}]]*/,
-                1: /*[[#{screen.pm.password.strength.1}]]*/,
-                2: /*[[#{screen.pm.password.strength.2}]]*/,
-                3: /*[[#{screen.pm.password.strength.3}]]*/,
-                4: /*[[#{screen.pm.password.strength.4}]]*/
-            };
-
-            /*]]>*/
-        </script>
-
-        <h2 th:utext="#{cas.screen.acct.title}"/>
-        <p class="intro" th:utext="#{cas.screen.acct.intro.complete}"/>
-
-        <form method="post" id="fm1">
-            <div class="banner banner-danger my-2" th:if="${flowRequestContext.messageContext.hasErrorMessages()}">
-                <p th:each="message : ${flowRequestContext.messageContext.allMessages}"
-                   th:utext="${message.text}">Message Text</p>
-            </div>
-
-            <div class="cas-field my-3 mdc-input-group">
-                <div class="mdc-input-group-field mdc-input-group-field-append">
-                    <div class="d-flex caps-check">
-                        <label for="password" class="mdc-text-field mdc-text-field--outlined mdc-text-field--with-trailing-icon">
-                            <input class="mdc-text-field__input pwd"
-                                   autocapitalize="none"
-                                   spellcheck="false"
-                                   th:attr="pattern=${passwordPolicyPattern}"
-                                   type="password"
-                                   name="password"
-                                   id="password"
-                                   autocomplete="off" required/>
-                            <span class="mdc-notched-outline">
-                                    <span class="mdc-notched-outline__leading"></span>
-                                    <span class="mdc-notched-outline__notch">
-                                      <span class="mdc-floating-label" th:utext="#{screen.pm.enterpsw}">Enter Password:</span>
-                                    </span>
-                                    <span class="mdc-notched-outline__trailing"></span>
-                            </span>
-                        </label>
-                        <button class="reveal-password mdc-button mdc-button--raised mdc-input-group-append mdc-icon-button"
-                                tabindex="-1"
-                                type="button">
-                            <i class="mdi mdi-eye reveal-password-icon"></i>
-                            <span class="visually-hidden">Toggle Password</span>
-                        </button>
-                    </div>
-                    <div class="mdc-text-field-helper-line">
-                        <div class="mdc-text-field-helper-text mdc-text-field-helper-text--validation-msg"
-                             th:utext="#{cas.screen.acct.error.invalid-value}"
-                             aria-hidden="true"/>
-                    </div>
-
-                    <div class="mdc-text-field-helper-line caps-warn">
-                        <p class="mdc-text-field-helper-text mdc-text-field-helper-text--persistent mdc-text-field-helper-text--validation-msg text-danger">
-                            <span th:utext="#{screen.capslock.on}"/>
-                        </p>
-                    </div>
-                </div>
-            </div>
-
-            <div class="cas-field my-3">
-                <div class="caps-check">
-                    <label for="confirmedPassword" class="mdc-text-field mdc-text-field--outlined mdc-text-field--with-trailing-icon">
-                        <input class="mdc-text-field__input pwd"
-                               type="password"
-                               autocapitalize="none"
-                               spellcheck="false"
-                               th:attr="pattern=${passwordPolicyPattern}"
-                               name="confirmedPassword"
-                               id="confirmedPassword"
-                               autocomplete="off" required/>
-                        <span class="mdc-notched-outline">
-                            <span class="mdc-notched-outline__leading"></span>
-                            <span class="mdc-notched-outline__notch">
-                              <span class="mdc-floating-label" th:utext="#{screen.pm.confirmpsw}">Confirm Password:</span>
-                            </span>
-                            <span class="mdc-notched-outline__trailing"></span>
-                        </span>
-                    </label>
-                    <div class="mdc-text-field-helper-line">
-                        <div class="mdc-text-field-helper-text mdc-text-field-helper-text--validation-msg"
-                             th:utext="#{cas.screen.acct.error.invalid-value}"
-                             aria-hidden="true"/>
-                    </div>
-                    <i class="mdi mdi-alert mdc-text-field__icon text-danger caps-warn"></i>
-                </div>
-            </div>
-
-            <section th:if="${accountRegistrationSecurityQuestionsCount gt 0}">
-                <div class="cas-field my-3" th:each="count : ${#numbers.sequence(1, accountRegistrationSecurityQuestionsCount)}">
-                    <div class="d-flex">
-                        <label class="mdc-text-field mdc-text-field--outlined">
-                            <input class="mdc-text-field__input"
-                                   th:id="${'securityquestion' + count}"
-                                   th:name="${'securityquestion' + count}"
-                                   size="50"
-                                   type="text"
-                                   autocapitalize="none"
-                                   spellcheck="false"/>
-                            <span class="mdc-notched-outline">
-                                    <span class="mdc-notched-outline__leading"></span>
-                                    <span class="mdc-notched-outline__notch">
-                                      <span class="mdc-floating-label"
-                                            th:utext="#{${'screen.acct.label.security.question.' + count}}"></span>
-                                    </span>
-                                    <span class="mdc-notched-outline__trailing"></span>
-                               </span>
-                        </label>
-                    </div>
-
-                    <div class="caps-check my-3">
-                        <label class="mdc-text-field mdc-text-field--outlined mdc-text-field--with-trailing-icon">
-                            <input class="mdc-text-field__input pwd"
-                                   autocapitalize="none"
-                                   spellcheck="false"
-                                   type="password"
-                                   th:id="${'securityanswer' + count}"
-                                   th:name="${'securityanswer' + count}"
-                                   autocomplete="off" required/>
-
-                            <span class="mdc-notched-outline">
-                                    <span class="mdc-notched-outline__leading"></span>
-                                    <span class="mdc-notched-outline__notch">
-                                      <span class="mdc-floating-label" th:utext="#{screen.acct.label.security.answer}"></span>
-                                    </span>
-                                    <span class="mdc-notched-outline__trailing"></span>
-                                </span>
-                        </label>
-                        <i class="mdi mdi-alert mdc-text-field__icon text-danger caps-warn"></i>
-                    </div>
-                </div>
-            </section>
-
-            <div class="cas-field my-3 d-flex flex-column">
-                <div class="d-flex align-items-center">
-                    <span th:text="#{screen.pm.password.strength}">Strength:</span>&nbsp;
-                    <span id="password-strength-icon" class="mdi" aria-hidden="true"></span>
-                </div>
-                <div id="strengthProgressBar" role="progressbar" class="d-none">
-                    <div id="progress-strength-indicator" class="progress-bar-indicator text-center"></div>
-                    <div class="mdc-linear-progress">
-                        <div class="mdc-linear-progress__buffering-dots"></div>
-                        <div class="mdc-linear-progress__buffer"></div>
-                        <div class="mdc-linear-progress__bar mdc-linear-progress__primary-bar" style="transform: scaleX(0);">
-                            <span class="mdc-linear-progress__bar-inner"></span>
-                        </div>
-                        <div class="mdc-linear-progress__bar mdc-linear-progress__secondary-bar">
-                            <span class="mdc-linear-progress__bar-inner"></span>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="cas-field my-3 text-warning" id="password-strength-msg" style="display: none;">
-                <div class="suggestions banner banner-warning p-2 mb-2 d-flex align-items-center" role="alert">
-                    <span class="mdi mdi-information" aria-hidden="true"></span>&nbsp;
-                    <p class="m-0">
-                        <span id="password-strength-warning"></span>&nbsp;
-                        <span id="password-strength-suggestions"></span>
-                    </p>
-                </div>
-            </div>
-            <div class="cas-field my-3 text-danger" id="password-strength-notes">
-                <div id="password-policy-violation-msg" class="banner banner-danger p-2" role="alert" style="display: none;">
-                    <span class="mdi mdi-alert" aria-hidden="true"></span>&nbsp;
-                    <strong th:text="#{screen.pm.password.policyViolation}">Password does not match the password policy
-                        requirement.</strong>
-                </div>
-                <div id="password-confirm-mismatch-msg" class="banner banner-danger p-2" role="alert" style="display: none;">
-                    <span class="mdi mdi-alert" aria-hidden="true"></span>&nbsp;
-                    <strong th:text="#{screen.pm.password.confirmMismatch}">Passwords do not match.</strong>
-                </div>
-            </div>
-
-            <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-            <input type="hidden" name="_eventId" value="submit"/>
-            <div class="form-actions d-flex justify-content-center">
-                <button class="mdc-button mdc-button--raised me-2"
-                        name="submit"
-                        th:value="#{cas.screen.acct.button.submit}"
-                        id="submit"
-                        accesskey="s">
-                    <span class="mdc-button__label" th:value="#{cas.screen.acct.button.submit}">Submit</span>
-                </button>
-                &nbsp;
-                <a class="mdc-button mdc-button--outlined" th:href="@{/login}">
-                    <span class="mdc-button__label" th:text="#{cas.screen.acct.button.cancel}">CANCEL</span>
-                </a>
-            </div>
-        </form>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/acct-mgmt/casAccountSignupViewCompleted.html b/src/main/resources/templates_original/acct-mgmt/casAccountSignupViewCompleted.html
deleted file mode 100644
index b9f5aed..0000000
--- a/src/main/resources/templates_original/acct-mgmt/casAccountSignupViewCompleted.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body id="cas">
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" class="mdc-card p-4 m-auto w-lg-100">
-        <h2 th:utext="#{cas.screen.acct.title}"/>
-        <p class="intro" th:utext="#{cas.screen.acct.intro.completed}"/>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/acct-mgmt/casAccountSignupViewSentInfo.html b/src/main/resources/templates_original/acct-mgmt/casAccountSignupViewSentInfo.html
deleted file mode 100644
index 0149eea..0000000
--- a/src/main/resources/templates_original/acct-mgmt/casAccountSignupViewSentInfo.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body id="cas">
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" class="mdc-card p-4 m-auto w-lg-100">
-        <h2 th:utext="#{cas.screen.acct.title}" />
-        <p class="intro" th:utext="#{cas.screen.acct.infosent}" />
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/acct/casMyAccountProfile.html b/src/main/resources/templates_original/acct/casMyAccountProfile.html
deleted file mode 100644
index 1244c70..0000000
--- a/src/main/resources/templates_original/acct/casMyAccountProfile.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      layout:decorate="~{layout(mainContentClass='container-xxl')}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-
-    <link rel="stylesheet" type="text/css" th:href="@{#{webjars.highlight.css}}" />
-    <script type="text/javascript" th:src="@{#{webjars.highlight.js}}"></script>
-</head>
-
-<body id="cas">
-<main role="main" class="container-xxl mt-3 mb-3">
-    <div layout:fragment="content">
-        <script type="text/javascript">
-            function jqueryReady() {
-                if (window.location.hash) {
-                    console.log(`Fragment ${window.location.hash}`)
-                    showPanel(window.location.hash);
-                } else {
-                    showPanel("#divOverview");
-                }
-            }
-
-            function showPanel(element) {
-                $('div.profile-content').hide();
-                $(element).show();
-            }
-        </script>
-
-
-        <div class="mdc-card card w-lg-100 p-4" style="min-height: 400px">
-            <table>
-                <tr>
-                    <td style="position: fixed;">
-                        <div th:replace="fragments/accountprofilenavigation :: navigation">
-                            <a href="fragments/accountprofilenavigation.html">Fragment goes here</a>
-                        </div>
-                    </td>
-                    <td width="85%">
-                        <div th:replace="fragments/accountprofileoverview :: overview">
-                            <a href="fragments/accountprofileoverview.html">Fragment goes here</a>
-                        </div>
-
-                        <div th:replace="fragments/accountprofilemfadevices :: mfadevices">
-                            <a href="fragments/accountprofilemfadevices.html">Fragment goes here</a>
-                        </div>
-
-                        <div th:replace="fragments/accountprofileauditlog :: auditlog">
-                            <a href="fragments/accountprofileauditlog.html">Fragment goes here</a>
-                        </div>
-                        
-                        <div th:replace="fragments/accountprofilesecurityquestions :: securityquestions">
-                            <a href="fragments/accountprofilesecurityquestions.html">Fragment goes here</a>
-                        </div>
-
-                        <div th:replace="fragments/accountprofileapplications :: applications">
-                            <a href="fragments/accountprofileapplications.html">Fragment goes here</a>
-                        </div>
-                        <div th:replace="fragments/accountprofilesessions :: sessions">
-                            <a href="fragments/accountprofilesessions.html">Fragment goes here</a>
-                        </div>
-
-                        <div th:replace="fragments/accountprofileconsent :: consent">
-                            <a href="fragments/accountprofileconsent.html">Fragment goes here</a>
-                        </div>
-                        
-                        <div th:replace="fragments/accountprofileattributes :: attributes">
-                            <a href="fragments/accountprofileattributes.html">Fragment goes here</a>
-                        </div>
-                        
-                    </td>
-                </tr>
-            </table>
-        </div>
-
-
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/adaptive-authn/casRiskAuthenticationBlockedView.html b/src/main/resources/templates_original/adaptive-authn/casRiskAuthenticationBlockedView.html
deleted file mode 100644
index 096977b..0000000
--- a/src/main/resources/templates_original/adaptive-authn/casRiskAuthenticationBlockedView.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{screen.risk.authnblocked.heading}">Risk Authentication Blocked View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-<div layout:fragment="content" class="banner banner-danger alert alert-danger mdc-card card p-4 m-auto w-lg-66 text-justify">
-    <h2 th:utext="#{screen.risk.authnblocked.heading}">Authentication attempt is blocked.</h2>
-    <p th:utext="#{screen.risk.authnblocked.message}">Your authentication attempt is untrusted and unauthorized from your
-        current workstation.</p>
-</div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/admin/casAdminLoginView.html b/src/main/resources/templates_original/admin/casAdminLoginView.html
deleted file mode 100644
index 85d2d57..0000000
--- a/src/main/resources/templates_original/admin/casAdminLoginView.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{cas.login.pagetitle}">CAS Admin Login View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:href="@{${#themes.code('cas.standard.css.file')}}"/>
-</head>
-
-<body class="login">
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" class="row">
-        <section class="col-lg-6 offset-lg-3 col-xs-12">
-            <div class="card">
-                <div class="card-header text-center d-flex justify-content-center mb-4">
-                    <h2 th:text="#{cas.login.pagetitle}" class="me-2">Login</h2>
-                    <i class="mdi mdi-shield-lock-outline fas fa-shield-alt"></i>
-                </div>
-                <form name="fm1" th:action="@{/adminlogin}" method="post">
-                    <h3 th:utext="#{screen.welcome.instructions}">Enter your Username and Password</h3>
-                    <div th:if="${param.error}" class="banner banner-danger alert alert-danger banner-dismissible">Invalid credentials.
-                    </div>
-                    <section class="cas-field my-3 form-group mdc-input-group">
-                        <div class="mdc-input-group-field mdc-input-group-field-append">
-                            <div class="d-flex caps-check">
-                                <label for="username"
-                                       class="mdc-text-field mdc-text-field--outlined mdc-text-field--with-trailing-icon control-label">
-                                    <span class="mdc-notched-outline">
-                                        <span class="mdc-notched-outline__leading"></span>
-                                        <span class="mdc-notched-outline__notch">
-                                            <span class="mdc-floating-label"
-                                                  th:utext="#{screen.welcome.label.netid}">Username</span>
-                                        </span>
-                                        <span class="mdc-notched-outline__trailing"></span>
-                                    </span>
-                                    <input class="mdc-text-field__input form-control"
-                                           id="username"
-                                           name="username"
-                                           size="25"
-                                           type="text"
-                                           th:accesskey="#{screen.welcome.label.password.accesskey}"
-                                           autocapitalize="none"
-                                           spellcheck="false"
-                                           autocomplete="username"/>
-                                </label>
-                            </div>
-                        </div>
-                    </section>
-
-                    <section class="cas-field form-group my-3 mdc-input-group caps-check">
-                        <div class="mdc-input-group-field mdc-input-group-field-append">
-                            <div class="d-flex caps-check">
-                                <label for="password"
-                                       class="mdc-text-field mdc-text-field--outlined control-label mdc-text-field--with-trailing-icon">
-                                    <span class="mdc-notched-outline">
-                                        <span class="mdc-notched-outline__leading"></span>
-                                        <span class="mdc-notched-outline__notch">
-                                            <span class="mdc-floating-label"
-                                                  th:utext="#{screen.welcome.label.password}">Username</span>
-                                        </span>
-                                        <span class="mdc-notched-outline__trailing"></span>
-                                    </span>
-                                    <input class="mdc-text-field__input form-control pwd" type="password" id="password"
-                                           size="25" name="password" th:accesskey="#{screen.welcome.label.password.accesskey}"
-                                           autocomplete="off"/>
-                                </label>
-                                <button class="reveal-password mdc-button mdc-button--raised mdc-input-group-append mdc-icon-button"
-                                        tabindex="-1"
-                                        type="button">
-                                    <i class="mdi mdi-eye reveal-password-icon"></i>
-                                    <span class="visually-hidden">Toggle Password</span>
-                                </button>
-                            </div>
-                        </div>
-                        <div class="mdc-text-field-helper-line caps-warn">
-                            <p class="mdc-text-field-helper-text form-text text-small mdc-text-field-helper-text--persistent mdc-text-field-helper-text--validation-msg text-danger">
-                                <span th:utext="#{screen.capslock.on}"/>
-                            </p>
-                        </div>
-                    </section>
-
-
-                    <button class="mdc-button mdc-button--raised"
-                            accesskey="l"
-                            th:value="#{screen.welcome.button.login}"
-                            value="Login">
-                        <span class="mdc-button__label" th:value="#{screen.welcome.button.login}">Login</span>
-                    </button>
-                </form>
-            </div>
-        </section>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/aup/casAcceptableUsagePolicyView.html b/src/main/resources/templates_original/aup/casAcceptableUsagePolicyView.html
deleted file mode 100644
index 3775a98..0000000
--- a/src/main/resources/templates_original/aup/casAcceptableUsagePolicyView.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{cas.acceptableusagepolicyview.pagetitle}"></title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body id="cas">
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" id="login" class="mdc-card card p-4 m-auto w-lg-66">
-        <form method="post" id="fm1">
-            <h3 th:text="#{screen.aup.heading}">Acceptable Usage Policy</h3>
-            <div class="aup">
-
-                <div th:if="${aupPolicy}">
-                    <p id="policyTextByCode" th:if="${aupPolicy.code}"
-                       th:utext="#{${aupPolicy.code}}">Policy terms go here</p>
-
-                    <p id='policyDefaultText' th:if="${aupPolicy.defaultText}"
-                       th:utext="${aupPolicy.defaultText}">Policy default text goes here</p>
-                </div>
-
-                <div th:unless="${aupPolicy}">
-                    <p th:utext="#{screen.aup.policyterms}">Policy text goes here</p>
-                </div>
-
-                <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-                <input type="hidden" name="_eventId" value="submit"/>
-                <div class="form-actions d-flex">
-                    <button class="mdc-button mdc-button--raised me-2 btn btn-primary"
-                            name="submit"
-                            id="aupSubmit"
-                            accesskey="s">
-                        <span class="mdc-button__label" th:value="#{screen.aup.button.accept}">ACCEPT</span>
-                    </button>
-                    <button class="mdc-button mdc-button--outlined btn btn-outline-secondary"
-                            name="cancel"
-                            th:value="#{screen.aup.button.cancel}"
-                            accesskey="c"
-                            id="aupCancel"
-                            type="button"
-                            onclick="location.href = location.href;">
-                        <span class="mdc-button__label" th:text="#{screen.aup.button.cancel}">CANCEL</span>
-                    </button>
-                </div>
-            </div>
-        </form>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/authy/casAuthyLoginView.html b/src/main/resources/templates_original/authy/casAuthyLoginView.html
deleted file mode 100644
index 0301a65..0000000
--- a/src/main/resources/templates_original/authy/casAuthyLoginView.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{cas.mfa.authy.pagetitle}">Authy Login View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" class="mdc-card card p-4 m-auto w-lg-66">
-        <form method="post" id="fm1" th:action="@{/login}" th:object="${credential}">
-            <input type="hidden" name="_eventId_submit" value="LOGIN" />
-            <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-            <input type="hidden" name="geolocation" />
-            <div id="msg" class="banner banner-danger alert alert-danger my-2" role="alert"
-                th:if="${#fields.hasErrors('*')}">
-                <span th:each="err : ${#fields.errors('*')}" th:utext="${err + ' '}">this error block and text is only shown
-                    if there are errors</span>
-            </div>
-    
-            <div class="cas-field form-group my-3 mdc-input-group d-flex">
-                <div class="mdc-input-group-field mdc-input-group-field-append">
-                    <div class="d-flex caps-check">
-                        <label for="token"
-                            class="mdc-text-field mdc-text-field--outlined control-label mdc-text-field--with-trailing-icon">
-                            <span class="mdc-notched-outline">
-                                <span class="mdc-notched-outline__leading"></span>
-                                <span class="mdc-notched-outline__notch">
-                                    <span class="mdc-floating-label" th:utext="#{screen.welcome.label.token}">Token</span>
-                                </span>
-                                <span class="mdc-notched-outline__trailing"></span>
-                            </span>
-                            <input class="mdc-text-field__input form-control pwd"
-                                type="password"
-                                name="token"
-                                id="token"
-                                th:field="*{token}"
-                                size="25"
-                                autocomplete="off" required />
-                        </label>
-        
-                    </div>
-                    <button
-                        class="reveal-password align-self-end mdc-button mdc-button--raised btn btn-primary mdc-input-group-append mdc-icon-button"
-                        type="button"
-                        tabindex="-1">
-                        <i class="mdi mdi-eye fas fa-eye reveal-password-icon"></i>
-                        <span class="visually-hidden">Toggle Password</span>
-                    </button>
-                </div>
-        
-                <button class="mdc-button mdc-button--raised" accesskey="l" th:value="#{screen.welcome.button.login}">
-                    <span class="mdc-button__label" th:text="#{screen.welcome.button.login}">Log In</span>
-                </button>
-            </div>
-        </form>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/consent/casConsentView.html b/src/main/resources/templates_original/consent/casConsentView.html
deleted file mode 100644
index 5c3e90f..0000000
--- a/src/main/resources/templates_original/consent/casConsentView.html
+++ /dev/null
@@ -1,267 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{screen.consent.title}">Consent View</title>
-    <link type="text/css" href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-
-    <script th:inline="javascript">
-
-        /*<![CDATA[*/
-        var data = {
-            attributes: /*[[${attributes}]]*/
-        };
-        function jqueryReady() {
-            var consentjs = /*[[@{/js/consent.js}]]*/
-                $.getScript(consentjs, function (data, textStatus, jqxhr) {
-                });
-        }
-
-        /*]]>*/
-    </script>
-
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div id="content" layout:fragment="content">
-        <h2 th:text="#{screen.consent.title}" class="text-center">Attribute Consent</h2>
-
-        <div id="consent-tabs" class="mdc-tab-bar" role="tablist">
-            <div class="mdc-tab-scroller">
-                <div class="mdc-tab-scroller__scroll-area">
-                    <div class="mdc-tab-scroller__scroll-content">
-                        <button id="attributsButton" class="mdc-tab" role="tab" aria-selected="true">
-                            <span class="mdc-tab__content">
-                                <span class="mdc-tab__text-label" th:text="#{screen.consent.attributes}">Attributes</span>
-                            </span>
-                            <span class="mdc-tab-indicator">
-                                <span class="mdc-tab-indicator__content mdc-tab-indicator__content--underline"></span>
-                            </span>
-                            <span class="mdc-tab__ripple"></span>
-                        </button>
-                        <button id="optionsButton" class="mdc-tab" role="tab" aria-selected="true">
-                            <span class="mdc-tab__content">
-                                <span class="mdc-tab__text-label" th:text="#{screen.consent.options}">Options</span>
-                            </span>
-                            <span class="mdc-tab-indicator">
-                                <span class="mdc-tab-indicator__content mdc-tab-indicator__content--underline"></span>
-                            </span>
-                            <span class="mdc-tab__ripple"></span>
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <form method="post" id="fm1" th:action="@{/login}" class="mdc-card card p-4 m-auto d-block mb-4">
-            <section id="consent-tab-0" class="consent-tab">
-                <div class="" id="attributesPanel" role="tabpanel" aria-labelledby="attributes-tab">
-                    <p id="appTitle" th:utext="#{screen.consent.attributes.header(${service.id})}">
-                        The following attributes will be released to application</p>
-
-
-                    <div class="w-100 mdc-data-table table-responsive mx-auto my-4" id="divAttributes">
-                        <table id="attributesTable" class="table table-striped">
-                            <thead>
-                            <tr class="mdc-data-table__header-row">
-                                <th class="mdc-data-table__header-cell" role="columnheader" scope="col"
-                                    th:utext="#{screen.consent.attributes.attribute}">Attribute</th>
-                                <th class="mdc-data-table__header-cell" role="columnheader" scope="col"
-                                    th:utext="#{screen.consent.attributes.values}">Value(s)</th>
-                            </tr>
-                            </thead>
-                            <tbody class="mdc-data-table__content">
-                                <tr th:each="attribute : ${attributes}" class="mdc-data-table__row">
-                                    <td class="mdc-data-table__cell">
-                                        <code th:id="${attribute.name}">
-                                            <span th:if="${attribute.friendlyName}" th:utext="${attribute.friendlyName}"/>
-                                            <span th:unless="${attribute.friendlyName}" th:utext="${attribute.name}"/>
-                                        </code>
-                                    </td>
-                                    <td class="mdc-data-table__cell">
-                                        <code th:id="${attribute.name + '-value'}"><span th:utext="${attribute.values}"/></code>
-                                    </td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </section>
-
-            <section id="consent-tab-1" class="d-none consent-tab">
-                <div class="mb-4">
-                    <h3 class="bg-primary p-2 mdc-typography mdc-typography--headline6 mb-2"
-                        th:text="#{screen.consent.options.header}">
-                        How should I be prompted for consent again?
-                    </h3>
-                    <div class="mdc-check-help">
-                        <div class="mdc-form-field">
-                            <div class="mdc-radio form-check">
-                                <input class="mdc-radio__native-control form-check-input"
-                                       type="radio"
-                                       name="option"
-                                       id="optionAlways"
-                                       value="0"
-                                       th:checked="${option == 0}"
-                                       onclick="optionSelected()"/>
-                                <div class="mdc-radio__background">
-                                    <div class="mdc-radio__outer-circle"></div>
-                                    <div class="mdc-radio__inner-circle"></div>
-                                </div>
-                                <div class="mdc-radio__ripple"></div>
-                            </div>
-                            <label class="form-check-label" for="optionAlways" th:utext="#{screen.consent.options.always}">Always</label>
-                        </div>
-                        <div class="mdc-typography mdc-typography--body2 pl-4 ml-4 consent-option-description" aria-hidden="true"
-                             th:text="#{screen.consent.options.desc.always(${service.id})}">
-                            This will be displayed on your public profile
-                        </div>
-                    </div>
-                    <div class="mdc-check-help">
-                        <div class="mdc-form-field">
-                            <div class="mdc-radio form-check">
-                                <input class="mdc-radio__native-control form-check-input"
-                                       type="radio"
-                                       name="option"
-                                       id="optionAttributeName"
-                                       value="1"
-                                       th:checked="${option == 1}"
-                                       onclick="optionSelected()">
-                                <div class="mdc-radio__background">
-                                    <div class="mdc-radio__outer-circle"></div>
-                                    <div class="mdc-radio__inner-circle"></div>
-                                </div>
-                                <div class="mdc-radio__ripple"></div>
-                            </div>
-                            <label class="form-check-label" for="optionAttributeName" th:utext="#{screen.consent.options.attributename}">Always</label>
-                        </div>
-                        <div class="mdc-typography mdc-typography--body2 pl-4 ml-4 consent-option-description" aria-hidden="true"
-                             th:text="#{screen.consent.options.desc.attributename(${service.id})}">
-                            This will be displayed on your public profile
-                        </div>
-                    </div>
-                    <div class="mdc-check-help">
-                        <div class="mdc-form-field">
-                            <div class="mdc-radio form-check">
-                                <input class="mdc-radio__native-control form-check-input"
-                                       type="radio"
-                                       name="option"
-                                       id="optionAttributeValue"
-                                       value="2"
-                                       th:checked="${option == 2}"
-                                       onclick="optionSelected()">
-                                <div class="mdc-radio__background">
-                                    <div class="mdc-radio__outer-circle"></div>
-                                    <div class="mdc-radio__inner-circle"></div>
-                                </div>
-                                <div class="mdc-radio__ripple"></div>
-                            </div>
-                            <label class="form-check-label" for="optionAttributeValue" th:utext="#{screen.consent.options.attributevalue}">Attribute Value</label>
-                        </div>
-                        <div class="mdc-typography mdc-typography--body2 pl-4 ml-4 consent-option-description" aria-hidden="true"
-                             th:utext="#{screen.consent.options.desc.attributevalue.intro} +
-                                '<ul><li>' +
-                                #{screen.consent.options.desc.attributevalue.first(${service.id})} +
-                                '</li><li>' +
-                                #{screen.consent.options.desc.attributevalue.second(${service.id})} +
-                                '</li><li>' +
-                                #{screen.consent.options.desc.attributevalue.third(${service.id})} +
-                                '</li><ul>'">
-                            This will be displayed on your public profile
-                        </div>
-                    </div>
-
-                </div>
-                <div id="reminderPanel">
-                    <h3 id="reminderTitle" class="bg-primary p-2 mdc-typography mdc-typography--headline6 mb-2"
-                        th:text="#{screen.consent.options.reminder.header}">
-                        How often should I be reminded to consent again?
-                    </h3>
-                    <p class="mdc-typography mdc-typography--body2 mb-4" th:text="#{screen.consent.options.reminder.expl(${service.id})}">
-                        Show the consent screen, as a reminder, in the event that there is no change to the collection of attributes released to {0}.
-                    </p>
-                    <div class="d-flex mt-2">
-                        <div class="me-2">
-
-                            <label for="reminder" class="mdc-text-field mdc-text-field--outlined control-label">
-                                <span class="mdc-notched-outline">
-                                    <span class="mdc-notched-outline__leading"></span>
-                                    <span class="mdc-notched-outline__notch">
-                                        <span class="mdc-floating-label">Reminder</span>
-                                    </span>
-                                    <span class="mdc-notched-outline__trailing"></span>
-                                </span>
-                                <input class="mdc-text-field__input form-control"
-                                       type="number"
-                                       name="reminder"
-                                       id="reminder"
-                                       th:value="${reminder}" />
-                            </label>
-
-                        </div>
-                        <select name="reminderTimeUnit" id="reminderTimeUnit" class="custom-select">
-                            <option value="seconds" th:selected="${#strings.toLowerCase(reminderTimeUnit)  == 'seconds'}"
-                                    th:text="#{screen.consent.options.timeunit.seconds}">Seconds
-                            </option>
-                            <option value="minutes"
-                                    th:selected="${#strings.toLowerCase(reminderTimeUnit)  == 'minutes'}"
-                                    th:text="#{screen.consent.options.timeunit.minutes}">Minutes
-                            </option>
-                            <option value="hours"
-                                    th:selected="${#strings.toLowerCase(reminderTimeUnit)  == 'hours'}"
-                                    th:text="#{screen.consent.options.timeunit.hours}">Hours
-                            </option>
-                            <option value="days"
-                                    th:selected="${#strings.toLowerCase(reminderTimeUnit) == 'days'}"
-                                    th:text="#{screen.consent.options.timeunit.days}">Days
-                            </option>
-                            <option value="weeks"
-                                    th:selected="${#strings.toLowerCase(reminderTimeUnit) == 'weeks'}"
-                                    th:text="#{screen.consent.options.timeunit.weeks}">Weeks
-                            </option>
-                            <option value="months"
-                                    th:selected="${#strings.toLowerCase(reminderTimeUnit)  == 'months'}"
-                                    th:text="#{screen.consent.options.timeunit.months}">Months
-                            </option>
-                            <option value="years"
-                                    th:selected="${#strings.toLowerCase(reminderTimeUnit)  == 'years'}"
-                                    th:text="#{screen.consent.options.timeunit.years}">Years
-                            </option>
-                        </select>
-                    </div>
-            </section>
-            </section>
-            <section class="cas-section">
-                <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-                <input type="hidden" name="_eventId" value="confirm"/>
-            </section>
-            <hr class="my-4"/>
-            <section class="cas-section form-actions mt-4 d-flex justify-content-center">
-                <button class="mdc-button mdc-button--raised btn btn-primary me-2"
-                        name="confirm"
-                        id="confirm"
-                        accesskey="l"
-                        type="submit">
-                    <span class="mdc-button__label" th:text="#{screen.consent.confirm}">Confirm</span>
-                </button>
-                <a class="mdc-button mdc-button--raised btn btn-outline-secondary" id="cancel" name="cancel"
-                   th:href="@{/login}">
-                    <span class="mdc-button__label" th:text="#{screen.consent.cancel}">Cancel</span>
-                </a>
-            </section>
-        </form>
-
-        <script type="text/javascript" th:inline="javascript">
-            if (typeof mdc !== 'undefined') {
-                let div = document.querySelector('#divAttributes');
-                new mdc.dataTable.MDCDataTable(div);
-            }
-        </script>
-
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/delegated-authn/casDelegatedAuthnErrorView.html b/src/main/resources/templates_original/delegated-authn/casDelegatedAuthnErrorView.html
deleted file mode 100644
index 8b8ba2c..0000000
--- a/src/main/resources/templates_original/delegated-authn/casDelegatedAuthnErrorView.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{screen.service.error.header}">Delegated Authentication Error View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" class="banner banner-danger alert alert-danger mdc-card card p-4 m-auto w-lg-66 text-justify">
-        <h2 th:utext="#{screen.delauthn.error.header}">Delegated Authentication Failure</h2>
-        <p th:utext="#{screen.delauthn.error.message}">CAS is unable to complete the delegated authentication scenario,
-            or redirect to the selected identity provider. Please examine the original authentication request and try again.
-            You may need to close your browser and start again.
-        </p>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/delegated-authn/casDelegatedAuthnSelectionView.html b/src/main/resources/templates_original/delegated-authn/casDelegatedAuthnSelectionView.html
deleted file mode 100644
index 7c99be9..0000000
--- a/src/main/resources/templates_original/delegated-authn/casDelegatedAuthnSelectionView.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{screen.pac4j.credential-selection.title}">Delegated Authentication Profile Selection</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" class="mdc-card p-4 m-auto w-lg-75">
-        <script>
-            function jqueryReady() {
-                $('table').DataTable();
-            }
-        </script>
-
-        <div class="col-xs-6 col-xs-offset-2 col-sm-offset-3">
-            <h2 th:utext="#{screen.pac4j.credential-selection.title}">Delegated Authentication Profile Selection</h2>
-            <p class="intro" th:utext="#{screen.pac4j.credential-selection.intro}">Please select your profile:</p>
-            <span th:if="${delegatedAuthenticationCredentials}" th:remove="tag">
-                <div class="mdc-data-table table-responsive w-100">
-                    <table id="profilesTable" class="table table-striped w-100">
-                        <thead>
-                        <tr class="mdc-data-table__header-row">
-                            <th class="mdc-data-table__header-cell">ID</th>
-                            <th class="mdc-data-table__header-cell">Attributes</th>
-                            <th class="mdc-data-table__header-cell"></th>
-                        </tr>
-                        </thead>
-                        <tbody class="mdc-data-table__content">
-                            <tr th:each="principal : ${delegatedAuthenticationCredentials}" class="mdc-data-table__row">
-                                <td class="mdc-data-table__cell">
-                                    <code><kbd th:utext="${principal.id}"/></code>
-                                </td>
-                                <td class="mdc-data-table__cell">
-                                    <code><kbd th:utext="${principal.attributes}"/></code>
-                                </td>
-                                <td class="mdc-data-table__cell">
-                                   <form method="post" th:id="${'form-' + principal.id}">
-                                        <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-                                        <input type="hidden" name="_eventId" value="select"/>
-                                        <input type="hidden" name="key" th:value="${principal.key}"/>
-                                        <button class="mdc-button mdc-button--raised btn btn-primary me-2">
-                                            <span class="mdc-button__label">Select</span>
-                                        </button>
-                                   </form>
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-                <form method="post" id="clientSelectionCancelForm">
-                    <p/>
-                    <section>
-                        <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-                        <input type="hidden" name="_eventId" value="cancel"/>
-                        <button id="cancelButton" class="mdc-button mdc-button--raised btn btn-primary me-2">
-                            <span class="mdc-button__label">Cancel</span>
-                        </button>
-                    </section>
-                </form>
-            </span>
-        </div>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/delegated-authn/casDelegatedAuthnStopWebflow.html b/src/main/resources/templates_original/delegated-authn/casDelegatedAuthnStopWebflow.html
deleted file mode 100644
index f6abed1..0000000
--- a/src/main/resources/templates_original/delegated-authn/casDelegatedAuthnStopWebflow.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title th:text="#{screen.pac4j.unauthz.pagetitle}">Pac4j Stop Webflow View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-    <main role="main" class="container mt-3 mb-3">
-        <div id="content" layout:fragment="content"
-             class="mdc-card card p-4 m-auto w-lg-66 text-justify">
-            <div class="banner banner-danger alert alert-danger">
-                <h2 th:utext="#{screen.pac4j.unauthz.heading}">Unauthorized Access</h2>
-                <p th:utext="#{screen.pac4j.unauthz.message}">Either the authentication request was rejected/cancelled,
-                    or the authentication provider denied access due to permissions, etc. Review logs to find the root
-                    cause of the issue.</p>
-
-                <p>
-                    <i class="mdi mdi-alert fas fa-exclamation-triangle me-2"></i>
-                    <span th:if="${rootCauseException}" th:text="#{${'screen.pac4j.authn.' + rootCauseException.class.simpleName}}">
-                      Authentication response provided to CAS by the external identity provider cannot be accepted.</span>
-                    <span th:unless="${rootCauseException}" th:text="#{screen.pac4j.authn.unknown}">
-                      Authentication response provided to CAS by the external identity provider cannot be accepted.</span>
-                </p>
-                
-                <div class="mdc-data-table table-responsive w-100">
-                    <table id="errorTable" th:if="${error != null or reason != null or code != null or description != null}"
-                        class="table table-striped w-100" aria-label="Error information">
-                        <thead>
-                            <tr class="mdc-data-table__header-row">
-                                <th class="mdc-data-table__header-cell">Error</th>
-                                <th class="mdc-data-table__header-cell">Reason</th>
-                                <th class="mdc-data-table__header-cell">Code</th>
-                                <th class="mdc-data-table__header-cell">Description</th>
-                                <th class="mdc-data-table__header-cell">Provider</th>
-                                <th class="mdc-data-table__header-cell">Destination</th>
-                            </tr>
-                        </thead>
-                        <tbody class="mdc-data-table__content">
-                            <tr class="mdc-data-table__row">
-                                <td class="mdc-data-table__cell" th:text="${error}">Error</td>
-                                <td class="mdc-data-table__cell" th:text="${reason}">reason</td>
-                                <td class="mdc-data-table__cell" th:text="${code}">code</td>
-                                <td class="mdc-data-table__cell" th:text="${description}">description</td>
-                                <td class="mdc-data-table__cell" th:text="${client}">client</td>
-                                <td class="mdc-data-table__cell">
-                                    <a th:href="${service}" th:text="#{screen.pac4j.unauthz.gotoapp}">Goto Application</a>
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-            <br/>
-            <div class="d-flex">
-                <a id="loginLink" class="mdc-button mdc-button--raised btn btn-primary me-2" th:href="@{/login}">
-                    <span class="mdc-button__label" th:text="#{screen.pac4j.unauthz.login}">Back to CAS</span>
-                </a>
-                <a id="appLink" class="mdc-button mdc-button--raised btn btn-primary me-2" th:href="${service}">
-                    <span class="mdc-button__label" th:text="#{screen.pac4j.unauthz.gotoapp}">Goto Application</span>
-                </a>
-                <form method="post" id="fm1">
-                    <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-                    <input type="hidden" name="_eventId" value="retry"/>
-                    <button id="retryButton" class="mdc-button mdc-button--raised btn btn-primary me-2" name="retry" accesskey="r">
-                        <span class="mdc-button__label" th:text="#{screen.pac4j.button.retry}">Try Again</span>
-                    </button>
-                </form>
-            </div>
-        </div>
-    </main>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/delegated-authn/casDynamicDiscoveryView.html b/src/main/resources/templates_original/delegated-authn/casDynamicDiscoveryView.html
deleted file mode 100644
index 2c65830..0000000
--- a/src/main/resources/templates_original/delegated-authn/casDynamicDiscoveryView.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{screen.pac4j.discovery.title}">Delegated Authentication Dynamic Discovery</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" class="mdc-card p-4 m-auto w-lg-66">
-        <div class="col-xs-6 col-xs-offset-2 col-sm-offset-3">
-            <h2 th:utext="#{screen.pac4j.discovery.title}">Delegated Authentication Dynamic Discovery</h2>
-            <p class="intro" th:utext="#{screen.pac4j.discovery.intro}">Please provide your user ID:</p>
-            <div class="banner banner-danger my-2" th:if="${flowRequestContext.messageContext.hasErrorMessages()}">
-                <p th:each="message : ${flowRequestContext.messageContext.allMessages}"
-                   th:utext="${message.text}">Message Text</p>
-            </div>
-
-            <form method="post" id="discoverySelectionForm">
-                <section class="p-4">
-                    <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-                    <input type="hidden" name="_eventId" value="execute"/>
-
-                    <label for="username" class="mdc-text-field mdc-text-field--outlined">
-                        <input class="mdc-text-field__input"
-                               id="username"
-                               name="username"
-                               tabindex="0"
-                               size="25"
-                               type="text"
-                               th:accesskey="#{screen.welcome.label.netid.accesskey}"
-                               autocapitalize="none"
-                               spellcheck="false"
-                               autocomplete="username"
-                               th:value="${username}" required/>
-
-                        <span class="mdc-notched-outline">
-                            <span class="mdc-notched-outline__leading"></span>
-                            <span class="mdc-notched-outline__notch">
-                              <span class="mdc-floating-label" th:utext="#{screen.welcome.label.netid}">Username</span>
-                            </span>
-                            <span class="mdc-notched-outline__trailing"></span>
-                        </span>
-                    </label>
-
-                    <p>
-                        <button class="mdc-button mdc-button--raised" accesskey="s" type="submit">
-                            <span class="mdc-button__label" th:text="#{screen.welcome.button.login}">Login</span>
-                        </button>
-                        <button class="mdc-button mdc-button--outlined"
-                                name="cancel"
-                                th:value="cancel"
-                                accesskey="c"
-                                id="aupCancel"
-                                type="button"
-                                onclick="location.href = location.href;">
-                            <span class="mdc-button__label">Cancel</span>
-                        </button>
-                </section>
-            </form>
-        </div>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/duo-security/casDuoLoginView.html b/src/main/resources/templates_original/duo-security/casDuoLoginView.html
deleted file mode 100644
index 043650f..0000000
--- a/src/main/resources/templates_original/duo-security/casDuoLoginView.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-    <title th:text="#{cas.mfa.duologin.pagetitle}">Duo Login View</title>
-    <script th:src="@{/js/duo/Duo-Web-v2.min.js}"></script>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-    <main role="main" class="container mt-3 mb-3">
-        <div layout:fragment="content" class="m-auto w-lg-66">
-            <form method="post" id="duo_form" th:object="${credential}" th:action="@{/login}">
-                <div id="msg" class="alert alert-danger alert-dismissible fade show" role="alert" th:if="${#fields.hasErrors('*')}">
-                <span th:each="err : ${#fields.errors('*')}" th:utext="${err + ' '}">this error block and text is only shown if there are errors</span>
-            </div>
-
-            <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-            <input type="hidden" name="_eventId" value="submit"/>
-            <input type="hidden" name="geolocation"/>
-
-            <div id="login" class="m-0 p-0">
-                <iframe id="duo_iframe"
-                        class="mdc-elevation--z1"
-                        frameborder="0"
-                        th:attr="data-host=${apiHost},data-sig-request=${sigRequest}"
-                        data-post-argument="signedDuoResponse">
-                </iframe>
-            </div>
-        </form>
-    </div>
-</main>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates_original/error.html b/src/main/resources/templates_original/error.html
deleted file mode 100644
index 4208582..0000000
--- a/src/main/resources/templates_original/error.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{screen.unavailable.header}">CAS Error View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-
-    <script th:inline="javascript">
-        /*<![CDATA[*/
-
-        function showErrorDetails() {
-            $("#errorMsg").hide();
-            $("#errorDetails").empty();
-            $("#errorDetails").append("<p><pre style='white-space: pre-wrap;'>" + /*[[${#strings.escapeXml(trace)}]]*/ +"</pre></p>");
-        }
-        /*]]>*/
-    </script>
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-<div layout:fragment="content">
-    <div class="mdc-card card p-4 banner banner-danger alert alert-danger">
-        <h2 th:utext="#{screen.unavailable.heading(${status},${error})}">CAS is unable to process this request: "{0}:{1}"</h2>
-        <div th:utext="#{screen.unavailable.message}">screen.unavailable.message would go here</div>
-        <pre id="errorMsg" class="mt-4" style="white-space: pre-wrap;" th:text="${'Error: ' + message}">error message would go here</pre>
-        <p id="errorDetails" class="word-break-all" th:if="${trace}">
-            <button type="button" class="mdc-button mdc-button--raised btn btn-primary"
-                    onclick="showErrorDetails();">
-                <span class="mdc-button__label">View Details</span>
-            </button>
-        </p>
-    </div>
-</div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/error/400.html b/src/main/resources/templates_original/error/400.html
deleted file mode 100644
index 47e2369..0000000
--- a/src/main/resources/templates_original/error/400.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{screen.error.page.title.accessdenied}">Error - 401</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content"  class="mdc-card p-4 w-lg-66 m-auto">
-        <h2 th:utext="#{screen.error.page.invalidrequest.title}">Invalid Request</h2>
-        <p th:utext="#{screen.error.page.invalidrequest.desc}">You do not have permission to view this page.</p>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/error/401.html b/src/main/resources/templates_original/error/401.html
deleted file mode 100644
index da8bc79..0000000
--- a/src/main/resources/templates_original/error/401.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{screen.error.page.title.accessdenied}">Error - 401</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content"  class="mdc-card card p-4 w-lg-66 m-auto">
-        <h2 th:utext="#{screen.error.page.accessdenied}">Access Denied</h2>
-        <p th:utext="#{screen.error.page.permissiondenied}">You do not have permission to view this page.</p>
-        <a class="mdc-button mdc-button-raised" th:href="@{/login}">
-            <span class="mdc-button__label" th:utext="#{screen.error.page.loginagain}">Login Again</span>
-        </a>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/error/403.html b/src/main/resources/templates_original/error/403.html
deleted file mode 100644
index 7d7c138..0000000
--- a/src/main/resources/templates_original/error/403.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{screen.error.page.title.permissiondenied}">Error - Permission Denied</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" class="mdc-card card p-4 w-lg-66 m-auto">
-        <h2>
-            <i class="mdi mdi-close-box"></i>
-            <span th:utext="#{screen.error.page.authdenied}">Authorization Denied</span>
-        </h2>
-
-        <p th:utext="#{screen.error.page.permissiondenied}">You do not have permission to view this page.</p>
-        <a class="mdc-button mdc-button--raised me-2 btn btn-primary" th:href="@{/login}">
-            <span class="mdc-button__label" th:utext="#{screen.error.page.loginagain}">Login Again</span>
-        </a>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/error/404.html b/src/main/resources/templates_original/error/404.html
deleted file mode 100644
index ad04661..0000000
--- a/src/main/resources/templates_original/error/404.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{screen.error.page.title.pagenotfound}">Error - Page Not Found</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" class="mdc-card card p-4 w-lg-66 m-auto">
-        <h2 th:utext="#{screen.error.page.notfound}">Page Not Found</h2>
-        <p th:utext="#{screen.error.page.doesnotexist}">The page you are attempting to access does not exist at the
-            moment.</p>
-        <a class="mdc-button" th:href="@{/login}">
-            <span class="mdc-button__label" th:utext="#{screen.error.page.loginagain}">Login Again</span>
-        </a>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/error/405.html b/src/main/resources/templates_original/error/405.html
deleted file mode 100644
index a3d1423..0000000
--- a/src/main/resources/templates_original/error/405.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{screen.error.page.title.requestunsupported}">Error - Unsupported Request</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" class="mdc-card card p-4 w-lg-66 m-auto">
-        <h2 th:utext="#{screen.error.page.requestunsupported}">The request type or syntax is not supported.</h2>
-        <p th:utext="#{screen.error.page.permissiondenied}">You do not have permission to view this page.</p>
-        <a class="mdc-button" th:href="@{/login}">
-            <span class="mdc-button__label" th:utext="#{screen.error.page.loginagain}">Login Again</span>
-        </a>
-    </div>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/error/423.html b/src/main/resources/templates_original/error/423.html
deleted file mode 100644
index 62e530f..0000000
--- a/src/main/resources/templates_original/error/423.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{screen.error.page.title.blocked}">Error - Permission Denied</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" class="mdc-card card p-4 w-lg-66 m-auto">
-        <h2 th:utext="#{screen.blocked.header}">Access Denied</h2>
-        <p th:utext="#{screen.blocked.message}">You've entered the wrong password for the user too many times.
-            You've been throttled.</p>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/error/casServiceErrorView.html b/src/main/resources/templates_original/error/casServiceErrorView.html
deleted file mode 100644
index 2571a0c..0000000
--- a/src/main/resources/templates_original/error/casServiceErrorView.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{screen.service.error.header}">Service Error View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" class="banner banner-danger alert alert-danger mdc-card card p-4 m-auto w-lg-66 text-justify">
-        <h2 th:utext="#{screen.service.error.header}">Application Not Authorized to Use CAS</h2>
-        <p th:if="${rootCauseException != null and rootCauseException.code != null}"
-           th:utext="#{${rootCauseException.code}}">
-            rootCauseException.code</p>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/error/casWebflowConfigErrorView.html b/src/main/resources/templates_original/error/casWebflowConfigErrorView.html
deleted file mode 100644
index a641d74..0000000
--- a/src/main/resources/templates_original/error/casWebflowConfigErrorView.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{screen.service.error.header}">Service Error View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" class="banner banner-danger mdc-card p-4 m-auto w-lg-66 text-justify">
-        <h2>Invalid/Unknown Webflow Configuration</h2>
-        <p>You are seeing this error because the authentication flow cannot locate or validate the sequence
-            of requested events and transitions and does not know how to route the flow to the next step.
-            Current flow identifier is <code th:text="${flowExecutionException.flowId}">unknown</code> and the current
-            state identifier is <code th:text="${flowExecutionException.stateId}">unknown</code>.
-        </p>
-        <p>The error message is:</p>
-        <code id="exceptionMessage" th:text="${rootCauseException.message}">unknown</code>
-        
-        <p>Please examine the CAS server logs to find the root cause and additional details.</p>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/forgot-username/casForgotUsernameSendInfoView.html b/src/main/resources/templates_original/forgot-username/casForgotUsernameSendInfoView.html
deleted file mode 100644
index 0a5d668..0000000
--- a/src/main/resources/templates_original/forgot-username/casForgotUsernameSendInfoView.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title th:text="#{screen.pm.forgotusername.title}">Forgot Username Instructions View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-    <main role="main" class="container mt-3 mb-3">
-        <div layout:fragment="content" id="reset">
-            <div class="row">
-                <div class="col-lg-6 offset-lg-3">
-                    <div class="mdc-card card">
-                        <form method="post" id="fm1">
-                            <section class="p-4">
-                                <h3 th:utext="#{screen.pm.forgotusername.title}">Forgot your username?</h3>
-                                <div th:utext="#{screen.pm.forgotusername.instructions}" class="my-4">Please provide
-                                    your email address. You will receive an email with your username.</div>
-
-                                <div class="banner banner-danger alert alert-danger alert-dismissible mb-4"
-                                    th:if="${flowRequestContext.messageContext.hasErrorMessages()}">
-                                    <p th:each="message : ${flowRequestContext.messageContext.allMessages}"
-                                        th:utext="${message.text}">Message Text
-                                    </p>
-                                </div>
-                                
-                                <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-                                <input type="hidden" name="_eventId" value="findUsername" />
-                                <div class="d-flex">
-                                    <label for="email" class="mdc-text-field mdc-text-field--outlined control-label">
-                                        <span class="mdc-notched-outline">
-                                            <span class="mdc-notched-outline__leading"></span>
-                                            <span class="mdc-notched-outline__notch">
-                                                <span class="mdc-floating-label" th:utext="#{screen.pm.reset.email}">Email</span>
-                                            </span>
-                                            <span class="mdc-notched-outline__trailing"></span>
-                                        </span>
-                                        <input class="mdc-text-field__input form-control"
-                                               type="text"
-                                               name="email"
-                                               id="email"
-                                               size="45"
-                                               autocomplete="off" required />
-                                    </label>
-
-                                </div>
-                            </section>
-
-                            <span class="mdc-card__actions_actions p-4" th:if="${recaptchaForgotUsernameEnabled}">
-                                <div th:replace="fragments/recaptcha :: recaptchaToken" />
-                            </span>
-
-                            <div class="mdc-card__actions_actions p-4">
-                                <button
-                                    class="mdc-button mdc-button--raised btn btn-primary mdc-card__actions_action mdc-card__actions_action--button me-2"
-                                    accesskey="s" th:value="#{screen.pm.button.submit}" type="submit" value="SUBMIT">
-                                    <span class="mdc-button__label" th:text="#{screen.pm.button.submit}">Submit</span>
-                                </button>
-                                <button class="mdc-button mdc-button--outline btn btn-outline-secondary mdc-card__actions_action mdc-card__actions_action--button"
-                                    name="cancel" accesskey="c" th:value="#{screen.pm.button.cancel}" type="button"
-                                    onclick="location.href = location.href;" value="CANCEL">
-                                    <span class="mdc-button__label" th:text="#{screen.pm.button.cancel}">CANCEL</span>
-                                </button>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <script type="text/javascript" th:inline="javascript">
-            var i = [[#{ screen.welcome.button.loginwip }]];
-            $('#fm1').submit(function () {
-                $(':submit').attr('disabled', true);
-                $(':submit').attr('value', i);
-                return true;
-            });
-        </script>
-        </div>
-    </main>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/forgot-username/casForgotUsernameSentInfoView.html b/src/main/resources/templates_original/forgot-username/casForgotUsernameSentInfoView.html
deleted file mode 100644
index 3dbebf6..0000000
--- a/src/main/resources/templates_original/forgot-username/casForgotUsernameSentInfoView.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title th:text="#{screen.pm.reset.title}">Forgot Username Instructions View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-    <main role="main" class="container mt-3 mb-3">
-        <div id="content" layout:fragment="content" class="mdc-card card p-4 m-auto w-lg-66">
-            <h2 th:utext="#{screen.pm.forgotusername.sent}">Instructions Sent Successfully.</h2>
-            <p th:utext="#{screen.pm.forgotusername.sentInstructions}">You should shortly receive an email with
-                follow-instructions to how to retrieve your username.</p>
-        </div>
-    </main>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/fragments/accepttoQRCode.html b/src/main/resources/templates_original/fragments/accepttoQRCode.html
deleted file mode 100644
index d3c954a..0000000
--- a/src/main/resources/templates_original/fragments/accepttoQRCode.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title>loginProviders Fragment</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div th:fragment="accepttoQRCode" th:remove="tag">
-
-        <script type="text/javascript" src="https://faye.acceptto.com/faye/faye.js"></script>
-        <script type="text/javascript" src="https://dbfp.acceptto.com/bfp.js"></script>
-        <div class="card bg-light">
-
-            <div class="card-body pb-4">
-                <div class="card-title">
-                    <div class="text-center">
-                        <h3 class="mt-md-0 mt-4">
-                            <i class="mdi mdi-qrcode-scan fas fa-qrcode"></i>
-                            <span>Login with QR Code</span>
-                        </h3>
-                        <p>Scan the QR code below, receive a push notification on your device. Approve and sign in!</p>
-
-                        <div>
-                            <a href="https://itunes.apple.com/us/app/acceptto-itsme/id893534370?mt=8" target="_blank">
-                                <img src="https://s3-us-west-2.amazonaws.com/acceptto-log-and-graphics/Asset+14.png" alt="App Store" title="App Store" width="151.25" height="50">
-                            </a>
-                            <a href="https://play.google.com/store/apps/details?id=com.acceptto.mfa&amp;amp;hl=en" target="_blank">
-                                <img src="https://s3-us-west-2.amazonaws.com/acceptto-log-and-graphics/Asset+13.png" alt="Google Play" title="Google Play" width="151.25" height="50">
-                            </a>
-                        </div>
-                    </div>
-                </div>
-                <div class="card-text">
-                    <form method="post" id="fmAccepttoQRCode">
-                        <script type="text/javascript" th:inline="javascript">
-                            /*<![CDATA[*/
-                            $(function () {
-                                var uid = /*[[${accepttoApplicationId}]]*/;
-                                var hex1 = Math.floor(Math.random() * 16777215).toString(16);
-                                var hex2 = Math.floor(Math.random() * 16777215).toString(16);
-                                var date = new Date();
-                                var time_since_epoch = date.getTime();
-                                var channel = time_since_epoch + hex1 + hex2;
-                                var qrcodeJSON = '{ "app_uid":"' + uid + '", "channel":"' + channel + '" }';
-                                var qrcode = window.btoa(qrcodeJSON);
-                                var src = "https://chart.apis.google.com/chart?cht=qr&chs=250x250&chl=" + qrcode + "#&chld=H|0";
-                                $('#login_qrcode').attr("src", src);
-
-                                var faye = new Faye.Client("https://faye.acceptto.com/faye");
-                                faye.subscribe("/messages/" + channel,
-                                    function (data) {
-                                        $('#channel').val(channel);
-                                        $('#fmAccepttoQRCode').submit();
-                                    }
-                                );
-                            });
-                            /*]]>*/
-                        </script>
-
-                        <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-                        <input type="hidden" id="channel" name="channel"/>
-                        <input type="hidden" name="_eventId" value="accepttoQRLogin"/>
-                    </form>
-
-                    <div class="d-flex justify-content-center">
-                        <img id="login_qrcode" alt="QR Code" class="autowidth" width="250">
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/fragments/accountprofileapplications.html b/src/main/resources/templates_original/fragments/accountprofileapplications.html
deleted file mode 100644
index 5a75b98..0000000
--- a/src/main/resources/templates_original/fragments/accountprofileapplications.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title>Account Profile</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body>
-<span th:fragment="applications">
-        <script type="text/javascript">
-            (material => {
-                document.addEventListener('DOMContentLoaded', () => {
-                    $('#applicationsTable').DataTable();
-                });
-            })(mdc);
-        </script>
-
-
-        <div class="profile-content w-100 mdc-data-table table-responsive"
-             th:if="${authorizedServices}"
-             style="display: none; border-width: 0px;"
-             id="divApplications">
-
-            <h2>
-                <i class="mdi mdi-door-open fas fa-door-open"></i>
-                <span>Hello, <span th:utext="${authentication.principal.id}"></span>!</span>
-
-            </h2>
-            <div class="text-justify">
-                <p th:utext="#{screen.account.applications}">Applications</p>
-            </div>
-
-            <table id="applicationsTable" class="mdc-data-table__table table table-striped noborder">
-                <thead>
-                <tr class="mdc-data-table__header-row">
-                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">Service</th>
-                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">Description</th>
-                </tr>
-                </thead>
-                <tbody class="mdc-data-table__content">
-
-                <tr th:each="service : ${authorizedServices}" class="mdc-data-table__row">
-                    <td class="mdc-data-table__cell">
-                        <a th:id="${'service' + service.id}" th:title="${service.name}" th:alt="${service.description}" th:utext="${service.name}"/>
-
-                        <script th:inline="javascript">
-                            /*<![CDATA[*/
-                            let serviceId = /*[[${service.serviceId}]]*/;
-                            if (isValidURL(serviceId)) {
-                                let id = /*[[${'service' + service.id}]]*/;
-                                $(`a#${id}`).attr("href", serviceId);
-                            }
-                            /*]]>*/
-                        </script>
-                    </td>
-                    <td class="mdc-data-table__cell">
-                        <span th:utext="${service.description}"/>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-
-
-    </span>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/fragments/accountprofileattributes.html b/src/main/resources/templates_original/fragments/accountprofileattributes.html
deleted file mode 100644
index bd930d6..0000000
--- a/src/main/resources/templates_original/fragments/accountprofileattributes.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title>Account Profile</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-    <span th:fragment="attributes">
-        <script type="text/javascript">
-            (material => {
-                document.addEventListener('DOMContentLoaded', () => {
-                    $('#attributesTable').DataTable();
-                });
-            })(mdc);
-        </script>
-
-        <div class="profile-content w-100 mdc-data-table table-responsive noborder"
-                                     id="divAttributes">
-                            <h2>
-                                <i class="mdi mdi-door-open fas fa-door-open"></i>
-                                <span>Hello, <span th:utext="${authentication.principal.id}"></span>!</span>
-
-                            </h2>
-                            <div class="text-justify">
-                                <p th:utext="#{screen.account.attributes}">Attributes</p>
-                            </div>
-
-                            <table id="attributesTable" class="table table-striped" style="white-space: unset">
-                                <thead>
-                                <tr class="mdc-data-table__header-row">
-                                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">Attribute</th>
-                                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">Value(s)</th>
-                                </tr>
-                                </thead>
-                                <tbody class="mdc-data-table__content">
-                                <tr th:each="attribute : ${authentication.principal.attributes}" class="mdc-data-table__row">
-                                    <td class="mdc-data-table__cell"><code><kbd th:utext="${attribute.key}"/></code></td>
-                                    <td class="mdc-data-table__cell">
-                                        <code><kbd th:utext="${#strings.abbreviate(attribute.value, 80)}"/></code>
-                                    </td>
-                                </tr>
-                                <tr th:each="attribute : ${authentication.attributes}" class="mdc-data-table__row">
-                                    <td class="mdc-data-table__cell"><code><kbd th:utext="${attribute.key}"/></code></td>
-                                    <td class="mdc-data-table__cell">
-                                        <code><kbd th:utext="${#strings.abbreviate(attribute.value, 80)}"/></code>
-                                    </td>
-                                </tr>
-                                </tbody>
-                            </table>
-        </div>
-
-    </span>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/fragments/accountprofileauditlog.html b/src/main/resources/templates_original/fragments/accountprofileauditlog.html
deleted file mode 100644
index 75a469e..0000000
--- a/src/main/resources/templates_original/fragments/accountprofileauditlog.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title>Account Profile</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-    <span th:fragment="auditlog">
-        <script type="text/javascript">
-            (material => {
-                document.addEventListener('DOMContentLoaded', () => {
-                    $('#auditLogTable').DataTable();
-                    let auditDialog = material.dialog.MDCDialog.attachTo(document.getElementById('audit-dialog'));
-                    document.getElementsByName("viewAuditEntryDetails").forEach(btn => {
-                        btn.addEventListener('click', event => {
-                            let caller = event.target || event.srcElement;
-                            let json = $(caller).next("span").text().trim();
-                            $("#auditEntryDetails").text(json);
-                            hljs.highlightAll();
-                            auditDialog.open();
-                            event.preventDefault();
-                        }, false);
-                    });
-                });
-            })(mdc);
-        </script>
-
-        <div class="mdc-dialog" id="audit-dialog" role="alertdialog"
-             aria-modal="true" aria-labelledby="audit-dialog-title" aria-describedby="audit-dialog-content">
-            <div class="mdc-dialog__container w-100">
-                <div class="mdc-dialog__surface mw-100">
-                    <h1 class="mdc-dialog__title mt-lg-2" id="audit-dialog-title">
-                        Audit Entry Details
-                    </h1>
-                    <div class="mdc-dialog__content" id="audit-dialog-content">
-                        <p>Here are the details for this audit record entry.</p>
-                        <pre><code id="auditEntryDetails" class="border-rounded language-json">Text</code></pre>
-                    </div>
-                    <footer class="mdc-dialog__actions">
-                        <button type="button" class="mdc-button mdc-button--outline btn btn-outline-secondary"
-                                data-mdc-dialog-action="accept" data-mdc-dialog-button-default>
-                            <span class="mdc-button__label">Close</span>
-                        </button>
-                    </footer>
-                </div>
-            </div>
-            <div class="mdc-dialog__scrim"></div>
-        </div>
-
-        <div id="divAuditLog"
-             class="profile-content w-100"
-             style="display: none;">
-            <h2>
-                <i class="mdi mdi-account-reactivate fas fa-door-open"></i>
-                <span th:utext="#{screen.account.auditlog.title}">Audit Log</span>
-            </h2>
-            <p th:utext="#{screen.account.auditlog.subtitle}">Examine the CAS audit log here.</p>
-
-            <table id="auditLogTable" class="mdc-data-table__table table table-striped noborder">
-                <thead>
-                <tr class="mdc-data-table__header-row">
-                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">Activity</th>
-                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">Date</th>
-                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">Resource</th>
-                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">IP Address</th>
-                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">User Agent</th>
-                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col"></th>
-                </tr>
-                </thead>
-                <tbody class="mdc-data-table__content">
-                <tr th:each="entry : ${auditLog}" class="mdc-data-table__row">
-
-                    <td class="mdc-data-table__cell"><code th:utext="${entry.actionPerformed}">Value</code></td>
-                    <td class="mdc-data-table__cell"
-                        th:utext="${#dates.format(entry.whenActionWasPerformed, 'MMMM dd, yyyy')}">Value
-                    </td>
-                    <td class="mdc-data-table__cell"
-                        th:utext="${entry.resourceOperatedUpon}">Value
-                    </td>
-                    <td class="mdc-data-table__cell" th:utext="${entry.clientIpAddress}">Value</td>
-                    <td class="mdc-data-table__cell"
-                        th:utext="${entry.userAgent}">Value
-                    </td>
-                    <td class="mdc-data-table__cell">
-                        <a name="viewAuditEntryDetails" href="#">
-                            <i class="mdi mdi-account-details fas fa-add"></i>
-                            <span style="display: none" th:utext="${entry.json}" />
-                        </a>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-
-
-    </span>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/fragments/accountprofileconsent.html b/src/main/resources/templates_original/fragments/accountprofileconsent.html
deleted file mode 100644
index f2076e7..0000000
--- a/src/main/resources/templates_original/fragments/accountprofileconsent.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title>Account Profile</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body>
-<span th:fragment="consent">
-        <script type="text/javascript">
-            (material => {
-                document.addEventListener('DOMContentLoaded', () => {
-                    $('#consentTable').DataTable();
-                    let consentDialog = material.dialog.MDCDialog.attachTo(document.getElementById('attribute-consent-dialog'));
-                    document.getElementsByName("viewConsentEntryDetails").forEach(btn => {
-                        btn.addEventListener('click', event => {
-                            let caller = event.target || event.srcElement;
-                            let json = $(caller).next("span").text().trim();
-                            $("#consentEntryDetails").text(json);
-                            hljs.highlightAll();
-                            consentDialog.open();
-                            event.preventDefault();
-                        }, false);
-                    });
-                });
-            })(mdc);
-        </script>
-
-        <div class="mdc-dialog" id="attribute-consent-dialog" role="alertdialog"
-         aria-modal="true" aria-labelledby="attribute-consent-dialog-title" aria-describedby="attribute-consent-dialog-content">
-            <div class="mdc-dialog__container w-100">
-                <div class="mdc-dialog__surface mw-100">
-                    <h1 class="mdc-dialog__title mt-lg-2" id="attribute-consent-dialog-title">
-                        Attribute Consent Entry Details
-                    </h1>
-                    <div class="mdc-dialog__content" id="attribute-consent-dialog-content">
-                        <p>Here are the details for this attribute-consent record entry.</p>
-                        <pre><code id="consentEntryDetails" class="border-rounded language-json">Text</code></pre>
-                    </div>
-                    <footer class="mdc-dialog__actions">
-                        <button type="button" class="mdc-button mdc-button--outline btn btn-outline-secondary"
-                                data-mdc-dialog-action="accept" data-mdc-dialog-button-default>
-                            <span class="mdc-button__label">Close</span>
-                        </button>
-                    </footer>
-                </div>
-            </div>
-            <div class="mdc-dialog__scrim"></div>
-        </div>
-
-        <div id="divConsentDecisions"
-             class="profile-content w-100"
-             style="display: none;">
-            <h2>
-                <i class="mdi mdi-head-check-outline fas fa-door-open"></i>
-                <span th:utext="#{screen.account.consent.title}">Attribute Consent Decisions</span>
-            </h2>
-            <p th:utext="#{screen.account.consent.subtitle}">Examine the CAS Attribute Consent Decisions here.</p>
-
-            <table id="consentTable" class="mdc-data-table__table table table-striped noborder">
-                <thead>
-                <tr class="mdc-data-table__header-row">
-<!--                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">ID</th>-->
-                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">Service</th>
-                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">Attributes</th>
-                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">Date/Time</th>
-                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">Options</th>
-                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">Reminder</th>
-                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col"></th>
-                </tr>
-                </thead>
-                <tbody class="mdc-data-table__content">
-                <tr th:each="entry : ${consentDecisions}" class="mdc-data-table__row">
-<!--                    <td class="mdc-data-table__cell" th:utext="${entry.id}">Value</td>-->
-                    <td class="mdc-data-table__cell"><code th:utext="${entry.service}">Value</code></td>
-                    <td class="mdc-data-table__cell" th:utext="${entry.attributes}">Value</td>
-                    <td class="mdc-data-table__cell"
-                        th:utext="${#temporals.format(entry.createdDateTime, 'MMMM dd, yyyy HH:nn:ss')}">Value
-                    </td>
-                    <td class="mdc-data-table__cell" th:utext="#{${entry.options}}">Value
-                    </td>
-                    <td class="mdc-data-table__cell" th:utext="${entry.reminder}">Value</td>
-                    <td class="mdc-data-table__cell">
-                        <a name="viewConsentEntryDetails" href="#">
-                            <i class="mdi mdi-account-details fas fa-add"></i>
-                            <span style="display: none" th:utext="${entry.json}"/>
-                        </a>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-    </span>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/fragments/accountprofilemfadevices.html b/src/main/resources/templates_original/fragments/accountprofilemfadevices.html
deleted file mode 100644
index 4f48964..0000000
--- a/src/main/resources/templates_original/fragments/accountprofilemfadevices.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title>Account Profile</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body>
-<span th:fragment="mfadevices">
-        <script type="text/javascript">
-            (material => {
-                document.addEventListener('DOMContentLoaded', () => {
-                    $('#mfaDevicesTable').DataTable();
-                    let mfaDeviceDialog = material.dialog.MDCDialog.attachTo(document.getElementById('mfaDevice-dialog'));
-
-                    document.getElementsByName("viewMfaDeviceDetails").forEach(btn => {
-                        btn.addEventListener('click', event => {
-                            let caller = event.target || event.srcElement;
-                            let json = $(caller).next("span").text().trim();
-                            $("#mfaDeviceDetails").text(json);
-                            hljs.highlightAll();
-                            mfaDeviceDialog.open();
-                            event.preventDefault();
-                        }, false);
-                    });
-                });
-            })(mdc);
-        </script>
-
-       <div class="mdc-dialog" id="mfaDevice-dialog" role="alertdialog"
-            aria-modal="true" aria-labelledby="mfa-dialog-title" aria-describedby="mfa-dialog-content">
-            <div class="mdc-dialog__container w-100">
-                <div class="mdc-dialog__surface mw-100">
-                    <h1 class="mdc-dialog__title mt-lg-2" id="mfa-dialog-title">
-                        Entry Details
-                    </h1>
-                    <div class="mdc-dialog__content" id="mfa-dialog-content">
-                        <p>Here are the details for this record entry.</p>
-                        <pre><code id="mfaDeviceDetails" class="border-rounded language-json">Text</code></pre>
-                    </div>
-                    <footer class="mdc-dialog__actions">
-                        <button type="button" class="mdc-button mdc-button--outline btn btn-outline-secondary"
-                                data-mdc-dialog-action="accept" data-mdc-dialog-button-default>
-                            <span class="mdc-button__label">Close</span>
-                        </button>
-                    </footer>
-                </div>
-            </div>
-            <div class="mdc-dialog__scrim"></div>
-        </div>
-
-        <div id="divMfaRegisteredAccounts"
-             th:if="${multifactorRegisteredAccounts}"
-             class="profile-content w-100"
-             style="display: none;">
-            <h2>
-                <i class="mdi mdi-account-reactivate fas fa-door-open"></i>
-                <span th:utext="#{screen.account.mfadevices.title}">MFA Devices</span>
-            </h2>
-            <p th:utext="#{screen.account.mfadevices.subtitle}">MFA Devices are listed here</p>
-
-            <table id="mfaDevicesTable" class="mdc-data-table__table table table-striped noborder">
-                <thead>
-                <tr class="mdc-data-table__header-row">
-                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">Source</th>
-                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">ID</th>
-                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">Name</th>
-                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">Type</th>
-                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">Model</th>
-                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">Number</th>
-                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col"></th>
-                </tr>
-                </thead>
-                <tbody class="mdc-data-table__content">
-                <tr th:each="entry : ${multifactorRegisteredAccounts}" class="mdc-data-table__row">
-                    <td class="mdc-data-table__cell" th:utext="${entry.source}">Value</td>
-                    <td class="mdc-data-table__cell"><code th:utext="${entry.id}">Value</code></td>
-                    <td class="mdc-data-table__cell" th:utext="${entry.name}">Value</td>
-                    <td class="mdc-data-table__cell" th:title="${entry.type}" th:utext="*{entry.type}?: 'N/A'">Value</td>
-                    <td class="mdc-data-table__cell" th:title="${entry.model}" th:utext="*{entry.model}?: 'N/A'">Value</td>
-                    <td class="mdc-data-table__cell" th:title="${entry.number}" th:utext="*{entry.number}?: 'N/A'">Value</td>
-                    <td class="mdc-data-table__cell">
-                        <a name="viewMfaDeviceDetails" href="#" th:if="${entry.payload}">
-                            <i class="mdi mdi-account-details fas fa-add"></i>
-                            <span style="display: none" th:utext="${entry.payload}"/>
-                        </a>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-
-    </span>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/fragments/accountprofilenavigation.html b/src/main/resources/templates_original/fragments/accountprofilenavigation.html
deleted file mode 100644
index c7969ee..0000000
--- a/src/main/resources/templates_original/fragments/accountprofilenavigation.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title>Account Profile</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body>
-<span th:fragment="navigation">
-       <div>
-            <div class="mdc-drawer__header">
-                <h3 class="mdc-drawer__title" th:text="${authentication.principal.id}">Username</h3>
-                <code class="mdc-drawer__subtitle"
-                      th:if="${authentication.principal.attributes['displayName'] != null}"
-                      th:text="${authentication.principal.attributes['displayName'][0]}">Display Name</code>
-                <kbd class="mdc-drawer__subtitle"
-                     th:if="${authentication.principal.attributes['email'] != null}"
-                     th:text="${authentication.principal.attributes['email'][0]}">Display Name</kbd>
-            </div>
-            <div class="mdc-drawer__content">
-                <nav class="mdc-list" id="navigationMenu">
-                    <a class="mdc-list-item list-group-item list-group-item-action"
-                       onclick="showPanel('#divOverview');"
-                       id="linkOverview"
-                       href="#divOverview">
-                        <i class="mdi mdi-form-textbox-password fa fa-key"></i>&nbsp;
-                        <span class="mdc-list-item__text">Overview</span>
-                    </a>
-                    <a class="mdc-list-item list-group-item list-group-item-action"
-                       onclick="showPanel('#divAttributes');"
-                       id="linkAttributes"
-                       href="#divAttributes">
-                        <i class="mdi mdi-account-details fa fa-key"></i>&nbsp;
-                        <span class="mdc-list-item__text">Attributes</span>
-                    </a>
-                    <a class="mdc-list-item list-group-item list-group-item-action"
-                       id="linkSessions"
-                       onclick="showPanel('#divSessions');"
-                       href="#divSessions">
-                        <i class="mdi mdi-account-clock fa fa-key"></i>&nbsp;
-                        <span class="mdc-list-item__text">Sessions</span>
-                    </a>
-
-                    <a class="mdc-list-item list-group-item list-group-item-action"
-                       th:if="${authorizedServices}"
-                       id="linkServices"
-                       onclick="showPanel('#divApplications');"
-                       href="#divApplications">
-                        <i class="mdi mdi-apps fa fa-key"></i>&nbsp;
-                        <span class="mdc-list-item__text">Applications</span>
-                    </a>
-
-                    <a class="mdc-list-item list-group-item list-group-item-action"
-                       onclick="showPanel('#divAuditLog');"
-                       id="linkAuditLog"
-                       th:if="${auditLog}"
-                       href="#divAuditLog">
-                        <i class="mdi mdi-account-reactivate fa fa-key"></i>&nbsp;
-                        <span class="mdc-list-item__text">Audit Log</span>
-                    </a>
-
-                    <a class="mdc-list-item list-group-item list-group-item-action"
-                       onclick="showPanel('#divMfaRegisteredAccounts');"
-                       id="linkMfaRegisteredAccounts"
-                       th:if="${multifactorRegisteredAccounts}"
-                       href="#divMfaRegisteredAccounts">
-                        <i class="mdi mdi-account-reactivate fa fa-key"></i>&nbsp;
-                        <span class="mdc-list-item__text">Multifactor Devices</span>
-                    </a>
-
-                    <a class="mdc-list-item list-group-item list-group-item-action"
-                       onclick="showPanel('#divConsentDecisions');"
-                       id="linkConsentDecisions"
-                       th:if="${consentDecisions}"
-                       href="#divConsentDecisions">
-                        <i class="mdi mdi-head-check-outline fa fa-key"></i>&nbsp;
-                        <span class="mdc-list-item__text">Attribute Consent</span>
-                    </a>
-
-                    <hr align="left" width="85%">
-                    <form method="post" id="fmChangePsw" name="fmChangePsw">
-                        <a class="mdc-list-item list-group-item list-group-item-action"
-                           th:if="${passwordManagementEnabled != null && passwordManagementEnabled}"
-                           aria-describedby="tooltip-change-password"
-                           onclick="document.forms.fmChangePsw.submit()"
-                           id="linkPasswordManagement"
-                           href="javascript:void(0);">
-                            <i class="mdi mdi-form-textbox-password fa fa-key"></i>&nbsp;
-                            <span class="mdc-list-item__text">Change Password</span>
-                        </a>
-                        <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-                        <input type="hidden" name="_eventId" value="resetPassword"/>
-                    </form>
-
-                    <a class="mdc-list-item list-group-item list-group-item-action"
-                       th:if="${securityQuestionsEnabled}"
-                       onclick="showPanel('#divSecurityQuestions');"
-                       id="linkSecurityQuestions"
-                       href="#divSecurityQuestions">
-                        <i class="mdi mdi-security fa fa-key"></i>&nbsp;
-                        <span class="mdc-list-item__text">Security Questions</span>
-                    </a>
-                    <a class="mdc-list-item list-group-item list-group-item-action" th:href="@{/logout}">
-                        <i class="mdi mdi-logout-variant fa fa-key"></i>&nbsp;
-                        <span class="mdc-list-item__text">Logout</span>
-                    </a>
-                </nav>
-            </div>
-        </div>
-        <div id="tooltip-change-password" class="mdc-tooltip" role="tooltip" aria-hidden="true">
-            <div class="mdc-tooltip__surface mdc-tooltip__surface-animation" th:text="#{screen.account.tooltip.logout}">
-                This operation forces a logout.
-            </div>
-        </div>
-    </span>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/fragments/accountprofileoverview.html b/src/main/resources/templates_original/fragments/accountprofileoverview.html
deleted file mode 100644
index fb2d52e..0000000
--- a/src/main/resources/templates_original/fragments/accountprofileoverview.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title>Account Profile</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body>
-<span th:fragment="overview">
-        <div id="divOverview"
-             class="profile-content p-1 text-justify"
-             style="display: none;">
-            <h2>
-                <i class="mdi mdi-door-open fas fa-door-open"></i>
-                <span>Hello, <span th:text="${authentication.principal.id}"></span>!</span>
-            </h2>
-            <p th:utext="#{screen.account.success(${authentication.principal.id})}">You,
-                <strong>username</strong>, have successfully logged into the Central Authentication Service.</p>
-            <p th:utext="#{screen.account.security}">
-                When you are finished, for security reasons, please <a href="logout">log out</a> and exit your web browser.
-            </p>
-        </div>
-
-    </span>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/fragments/accountprofilesecurityquestions.html b/src/main/resources/templates_original/fragments/accountprofilesecurityquestions.html
deleted file mode 100644
index 3507bdf..0000000
--- a/src/main/resources/templates_original/fragments/accountprofilesecurityquestions.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title>Account Profile</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body>
-<span th:fragment="securityquestions">
-        <script type="text/javascript">
-            function addSecurityQuestionRow(element) {
-                // let lastRow = $('#securityQuestionsTable tr:last');
-                let currentRow = $(element).parent().parent();
-                let newRow = currentRow.clone();
-                newRow.insertAfter(currentRow);
-            }
-
-            function removeSecurityQuestionRow(element) {
-                console.log("Removing row");
-                if ($("#securityQuestionsTable tr").length > 1) {
-                    $(element).parent().parent().remove();
-                }
-            }
-        </script>
-
-        <div id="divSecurityQuestions"
-             th:if="${securityQuestionsEnabled}"
-             class="profile-content w-100"
-             style="display: none;">
-
-            <h2>
-                <i class="mdi mdi-door-open fas fa-door-open"></i>
-                <span th:utext="#{screen.account.securityquestions.title}">Security Questions</span>
-            </h2>
-            <p th:utext="#{screen.account.securityquestions.subtitle}">
-                You can review and update your security questions here.</p>
-
-            <span th:remove="tag"
-                  th:if="${flowRequestContext.messageContext.allMessages.length > 0}">
-                <div class="banner banner-danger my-2" th:if="${flowRequestContext.messageContext.hasErrorMessages()}">
-                    <h2 th:utext="#{screen.account.failure}">Failure</h2>
-                    <span th:each="message : ${flowRequestContext.messageContext.allMessages}"
-                          th:if="${message.severity.name() == 'ERROR'}"
-                          th:utext="${message.text}">Message Text</span>
-                </div>
-                <div class="banner banner-success my-2"
-                     th:unless="${flowRequestContext.messageContext.hasErrorMessages()}">
-                    <span th:each="message : ${flowRequestContext.messageContext.allMessages}"
-                          th:utext="${message.text}">Message Text</span>
-                </div>
-            </span>
-
-            <div class="mdc-data-table table-responsive p-2 w-100 noborder">
-                <form method="post" id="updateQuestionsForm">
-                    <table id="securityQuestionsTable" class="table table-striped w-100">
-                        <tbody class="mdc-data-table__content">
-                        <tr th:each="entry,iterStat : ${questions}" class="mdc-data-table__header-row py-1">
-                            <td class="mdc-data-table__cell pad-0">
-                                <a href="#divSecurityQuestions" onclick="addSecurityQuestionRow(this)"/>
-                                <i class="mdi mdi-account-multiple-plus-outline fas fa-add"></i>
-                            </td>
-                            <td class="mdc-data-table__cell pad-0">
-                                <a href="#divSecurityQuestions" onclick="removeSecurityQuestionRow(this)"/>
-                                <i class="mdi mdi-delete fas fa-delete"></i>
-                            </td>
-
-                            <td class="mdc-data-table__cell w-50 pad-0">
-                                <div class="cas-field form-group my-3">
-                                    <label class="mdc-text-field mdc-text-field--outlined control-label">
-                                        <span class="mdc-notched-outline">
-                                            <span class="mdc-notched-outline__leading"></span>
-                                            <span class="mdc-notched-outline__notch">
-                                                <span class="mdc-floating-label"
-                                                      th:utext="#{screen.pm.reset.question(${iterStat.count})}">Question</span>
-                                            </span>
-                                            <span class="mdc-notched-outline__trailing"></span>
-                                        </span>
-                                        <input class="mdc-text-field__input form-control"
-                                               type="text"
-                                               th:name="questions"
-                                               th:value="${entry.key}"
-                                               autocomplete="off" required/>
-                                    </label>
-                                </div>
-                            </td>
-                            <td class="mdc-data-table__cell pad-0">
-                                <div class="cas-field form-group my-3">
-                                    <label class="mdc-text-field mdc-text-field--outlined control-label">
-                                        <span class="mdc-notched-outline">
-                                            <span class="mdc-notched-outline__leading"></span>
-                                            <span class="mdc-notched-outline__notch">
-                                                <span class="mdc-floating-label"
-                                                      th:utext="#{screen.pm.reset.answer(${iterStat.count})}">Answer</span>
-                                            </span>
-                                            <span class="mdc-notched-outline__trailing"></span>
-                                        </span>
-                                        <input class="mdc-text-field__input form-control"
-                                               type="text"
-                                               th:value="${entry.value}"
-                                               th:name="answers"
-                                               autocomplete="off" required/>
-                                    </label>
-                                </div>
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                    <div>
-                        <p/>
-                        <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-                        <input type="hidden" name="_eventId" value="updateSecurityQuestions"/>
-                        <button class="mdc-button mdc-button--raised btn btn-primary" accesskey="l" type="submit">
-                            <span class="mdc-button__label" th:utext="#{cas.screen.acct.button.update}">Submit</span>
-                        </button>
-                    </div>
-                </form>
-            </div>
-        </div>
-
-    </span>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/fragments/accountprofilesessions.html b/src/main/resources/templates_original/fragments/accountprofilesessions.html
deleted file mode 100644
index f5e751d..0000000
--- a/src/main/resources/templates_original/fragments/accountprofilesessions.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title>Account Profile</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body>
-<span th:fragment="sessions">
-        <script type="text/javascript">
-            (material => {
-                document.addEventListener('DOMContentLoaded', () => {
-                    $('#sessionsTable').DataTable();
-                    let sessionsDialog = material.dialog.MDCDialog.attachTo(document.getElementById('sessions-dialog'));
-
-                    document.getElementsByName("viewSessionDetails").forEach(btn => {
-                        btn.addEventListener('click', event => {
-                            let caller = event.target || event.srcElement;
-                            let json = $(caller).next("span").text().trim();
-                            $("#sessionDetails").text(json);
-                            hljs.highlightAll();
-                            sessionsDialog.open();
-                            event.preventDefault();
-                        }, false);
-                    });
-                });
-            })(mdc);
-        </script>
-
-        <div class="mdc-dialog" id="sessions-dialog" role="alertdialog"
-             aria-modal="true" aria-labelledby="session-dialog-title" aria-describedby="session-dialog-content">
-            <div class="mdc-dialog__container w-100">
-                <div class="mdc-dialog__surface mw-100">
-                    <h1 class="mdc-dialog__title mt-lg-2" id="session-dialog-title">
-                        Entry Details
-                    </h1>
-                    <div class="mdc-dialog__content" id="session-dialog-content">
-                        <p>Here are the details for this record entry.</p>
-                        <pre><code id="sessionDetails" class="border-rounded language-json">Text</code></pre>
-                    </div>
-                    <footer class="mdc-dialog__actions">
-                        <button type="button" class="mdc-button mdc-button--outline btn btn-outline-secondary"
-                                data-mdc-dialog-action="accept" data-mdc-dialog-button-default>
-                            <span class="mdc-button__label">Close</span>
-                        </button>
-                    </footer>
-                </div>
-            </div>
-            <div class="mdc-dialog__scrim"></div>
-        </div>
-
-        <div class="profile-content w-100 mdc-data-table table-responsive"
-             style="display: none; border-width: 0px;"
-             id="divSessions">
-
-            <h2>
-                <i class="mdi mdi-door-open fas fa-door-open"></i>
-                <span>Hello, <span th:utext="${authentication.principal.id}"></span>!</span>
-            </h2>
-            <div class="text-justify">
-                <p th:utext="#{screen.account.sessions}">Sessions</p>
-            </div>
-
-            <table id="sessionsTable" class="mdc-data-table__table table table-striped noborder">
-                <thead>
-                <tr class="mdc-data-table__header-row">
-                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">Principal</th>
-                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">IP Address</th>
-                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">Location</th>
-                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">User Agent</th>
-                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">Date</th>
-                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col"></th>
-                </tr>
-                </thead>
-                <tbody class="mdc-data-table__content">
-
-                <tr th:each="entry : ${singleSignOnSessions}" class="mdc-data-table__row">
-                    <td class="mdc-data-table__cell" th:utext="${entry.principal}">Value</td>
-                    <td class="mdc-data-table__cell" th:utext="${entry.clientIpAddress}">Value</td>
-                    <td class="mdc-data-table__cell" th:utext="${#strings.abbreviate(entry.geoLocation, 30)}">Value</td>
-                    <td class="mdc-data-table__cell" th:utext="${#strings.abbreviate(entry.userAgent, 30)}">Value</td>
-                    <td class="mdc-data-table__cell" th:utext="${entry.authenticationDate}"></td>
-
-                    <td class="mdc-data-table__cell">
-                        <a name="viewSessionDetails" href="#" th:if="${entry.payload}">
-                            <i class="mdi mdi-account-details fas fa-add"></i>
-                            <span style="display: none" th:utext="${entry.payload}"/>
-                        </a>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-
-
-    </span>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/fragments/footer.html b/src/main/resources/templates_original/fragments/footer.html
deleted file mode 100644
index 67d1518..0000000
--- a/src/main/resources/templates_original/fragments/footer.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<footer class="py-3 d-flex justify-content-center align-items-center cas-footer">
-    <span id="copyright" th:utext="#{copyright}" class="me-2 d-inline-block">Copyright Date Apereo, Inc</span>
-    <span class="px-3 d-inline-block">Powered by <a href="https://github.com/apereo/cas">Apereo CAS</a></span>
-    <code class="version" th:text="${T(org.apereo.cas.util.CasVersion).getVersion() + ' ' + T(org.apereo.cas.util.CasVersion).getDateTime()}"></code>
-</footer>
diff --git a/src/main/resources/templates_original/fragments/googleanalytics.html b/src/main/resources/templates_original/fragments/googleanalytics.html
deleted file mode 100644
index 93fafae..0000000
--- a/src/main/resources/templates_original/fragments/googleanalytics.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<script th:fragment="ga" th:inline="javascript" th:if="${not #strings.isEmpty(googleAnalyticsTrackingId)}">
-    /*<![CDATA[*/
-    var googleAnalyticsTrackingId = /*[[${googleAnalyticsTrackingId}]]*/;
-
-    (function (i, s, o, g, r, a, m) {
-        i['GoogleAnalyticsObject'] = r;
-        i[r] = i[r] || function () {
-            (i[r].q = i[r].q || []).push(arguments)
-        }, i[r].l = 1 * new Date();
-        a = s.createElement(o),
-            m = s.getElementsByTagName(o)[0];
-        a.async = 1;
-        a.src = g;
-        m.parentNode.insertBefore(a, m)
-    })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
-
-    ga('create', googleAnalyticsTrackingId, 'auto');
-    ga('send', 'pageview');
-    /*]]>*/
-</script>
\ No newline at end of file
diff --git a/src/main/resources/templates_original/fragments/header.html b/src/main/resources/templates_original/fragments/header.html
deleted file mode 100644
index 2aa7cc9..0000000
--- a/src/main/resources/templates_original/fragments/header.html
+++ /dev/null
@@ -1,237 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title>Header Fragment</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body>
-<div th:fragment="header">
-
-    <header id="app-bar" class="mdc-top-app-bar mdc-top-app-bar--fixed mdc-elevation--z4 shadow-sm">
-        <nav class="mdc-top-app-bar__row navbar navbar-dark bg-dark">
-            <div class="container-fluid container-fluid d-flex align-items-center justify-content-between">
-                <section class="mdc-top-app-bar__section mdc-top-app-bar__section--align-start">
-                    <button th:if="${'true' == #strings.defaultString(#themes.code('cas.drawer-menu.enabled'), 'true')}"
-                            class="mdc-icon-button mdc-top-app-bar__navigation-icon  btn btn-outline-light"
-                            id="drawerButton"
-                            data-bs-toggle="offcanvas"
-                            data-bs-target="#app-drawer">
-                        <span class="mdi mdi-menu fa fa-bars"></span>
-                        <span class="visually-hidden">menu</span>
-                    </button>
-                </section>
-                <section class="mdc-top-app-bar__section">
-                    <span class="cas-brand mx-auto">
-                        <span class="visually-hidden" th:text="${#strings.defaultString(#themes.code('cas.theme.name'), 'CAS')}">CAS</span>
-                        <a th:href="@{/}">
-                            <img id="cas-logo" class="cas-logo"
-                                 th:title="${#strings.defaultString(#themes.code('cas.theme.name'), 'CAS')}"
-                                 th:src="@{${#strings.defaultString(#themes.code('cas.logo.file'), '/images/cas-logo.png')}}"
-                            />
-                        </a>
-                    </span>
-                </section>
-                <section class="mdc-top-app-bar__section mdc-top-app-bar__section--align-end">
-                    <button id="cas-notifications-menu"
-                            th:if="${'true' == #strings.defaultString(#themes.code('cas.notifications-menu.enabled'), 'true')}"
-                            class="mdc-icon-button mdc-top-app-bar__action-item cas-notification-toggle btn btn-outline-light"
-                            aria-label="Bookmark this page"
-                            data-bs-toggle="modal"
-                            data-bs-target="#cas-notification-dialog">
-                        <span class="mdi mdi-bell-alert fa fa-bell"></span>
-                        <span class="visually-hidden">notifications</span>
-                        <i id="notifications-count" class="notifications-count count">2</i>
-                    </button>
-
-                    <a id="cas-user-account"
-                       th:href="@{/account}"
-                       th:if="${accountProfileManagementEnabled != null
-                        && accountProfileManagementEnabled
-                        && ticketGrantingTicketId != null}"
-                       class="mdc-icon-button mdc-top-app-bar__action-item"
-                       aria-label="User Account">
-                        <span class="mdi mdi-account-group"></span>
-                        <span class="visually-hidden">user account</span>
-                    </a>
-                </section>
-            </div>
-        </nav>
-    </header>
-
-    <div th:replace="fragments/logindrawer :: logindrawer"/>
-
-    <script>var countMessages = 0;</script>
-    <div
-            th:if="${'true' == #strings.defaultString(#themes.code('cas.notifications-menu.enabled'), 'true')}"
-            class="mdc-dialog cas-notification-dialog modal"
-            id="cas-notification-dialog" role="alertdialog"
-            aria-modal="true" aria-labelledby="notif-dialog-title"
-            aria-describedby="notif-dialog-content">
-        <div class="mdc-dialog__container modal-dialog">
-            <div class="mdc-dialog__surface modal-content">
-                <h1 class="mdc-dialog__title mt-lg-2 modal-header modal-title" id="notif-dialog-title">
-                    Notifications
-                </h1>
-                <div class="mdc-dialog__content modal-body" id="notif-dialog-content">
-                    <div class="cas-notification-message mdc-typography--body1" th:if="${staticAuthentication}">
-                        <script>countMessages++;</script>
-                        <h6 class="mdc-typography--headline6 mdi mdi-alert-circle fas fa-exclamation-circle"
-                            th:utext="#{screen.defaultauthn.title}"/>
-                        <p class="text text-wrap small" th:utext="#{screen.defaultauthn.heading}">
-                            <i class="mdi mdi-google fas fa-google"></i>
-                            Static AuthN is ONLY useful for demo purposes. It is recommended that you connect CAS to
-                            LDAP,
-                            JDBC, etc
-                            instead.
-                        </p>
-                    </div>
-                    <div class="cas-notification-message mdc-typography--body1"
-                         th:if="${not #httpServletRequest.secure}">
-                        <h6 class="mdc-typography--headline6 mdi mdi-alert-circle fas fa-exclamation-circle"
-                            th:utext="#{screen.nonsecure.title}"/>
-                        <script>countMessages++;</script>
-                        <p class="text-wrap small" th:utext="#{screen.nonsecure.message}">
-                            Unsure Connection
-                        </p>
-                    </div>
-
-                    <div id="cookiesSupportedDiv" class="cas-notification-message mdc-typography--body1" style="display: none">
-                        <h6 class="mdc-typography--headline6 mdi mdi-alert-circle fas fa-exclamation-circle"
-                            th:utext="#{screen.cookies.disabled.title}"></h6>
-                        <p class="text-wrap small" th:utext="#{screen.cookies.disabled.message}">
-                            Cookies are not supported by this browser.
-                        </p>
-                    </div>
-
-                </div>
-                <footer class="mdc-dialog__actions modal-footer">
-                    <button type="button" class="mdc-button mdc-button--raised mdc-dialog__button btn btn-primary"
-                            data-mdc-dialog-action="accept"
-                            data-mdc-dialog-button-default
-                            data-bs-dismiss="modal">
-                        <span class="mdc-button__label">OK</span>
-                    </button>
-                </footer>
-            </div>
-        </div>
-        <div class="mdc-dialog__scrim"></div>
-    </div>
-
-    <script type="text/javascript">
-
-        (material => {
-            let header = {
-                init: () => {
-                    header.attachTopbar();
-                    material.autoInit();
-                },
-                attachDrawer: () => {
-                    let elm = document.getElementById('app-drawer');
-                    if (elm != null) {
-                        let drawer = material.drawer.MDCDrawer.attachTo(elm);
-                        let closeDrawer = evt => {
-                            drawer.open = false;
-                        };
-                        drawer.foundation.handleScrimClick = closeDrawer;
-                        document.onkeydown = evt => {
-                            evt = evt || window.event;
-                            if (evt.keyCode == 27) {
-                                closeDrawer();
-                            }
-                        };
-                        header.drawer = drawer;
-                        return drawer;
-                    }
-                    return undefined;
-                },
-                attachTopbar: drawer => {
-
-                    drawer = header.attachDrawer();
-                    let dialog = header.attachNotificationDialog();
-
-                    if (drawer != undefined) {
-                        header.attachDrawerToggle(drawer);
-                    }
-                    if (dialog != undefined) {
-                        header.attachNotificationToggle(dialog);
-                    }
-                },
-                checkCaps: ev => {
-                    let s = String.fromCharCode(ev.which);
-                    if (s.toUpperCase() === s && s.toLowerCase() !== s && !ev.shiftKey) {
-                        ev.target.parentElement.classList.add('caps-on');
-                    } else {
-                        ev.target.parentElement.classList.remove('caps-on');
-                    }
-                },
-                attachDrawerToggle: drawer => {
-                    let appBar = document.getElementById('app-bar');
-                    if (appBar != null) {
-                        let topAppBar = material.topAppBar.MDCTopAppBar.attachTo(appBar);
-                        topAppBar.setScrollTarget(document.getElementById('main-content'));
-                        topAppBar.listen('MDCTopAppBar:nav', () => {
-                            drawer.open = !drawer.open;
-                        });
-                        return topAppBar;
-                    }
-                    return undefined;
-                },
-                attachNotificationDialog: () => {
-                    let element = document.getElementById('cas-notification-dialog');
-                    if (element != null) {
-                        return material.dialog.MDCDialog.attachTo(element);
-                    }
-                    return undefined;
-                },
-                attachNotificationToggle: dialog => {
-                    let btn = document.getElementById('cas-notifications-menu');
-                    if (btn != null) {
-                        btn.addEventListener('click', () => {
-                            dialog.open();
-                        });
-                    }
-                }
-            }
-            function supportsCookies() {
-                try {
-                    document.cookie = 'testcookie=1';
-                    let ret = document.cookie.indexOf('testcookie=') !== -1;
-                    document.cookie = 'testcookie=1; expires=Thu, 01-Jan-1970 00:00:01 GMT';
-                    return ret;
-                } catch (e) {
-                    console.log(e);
-                    return false;
-                }
-            }
-
-            document.addEventListener('DOMContentLoaded', () => {
-                if (material) {
-                    header.init();
-                }
-
-                if (!supportsCookies()) {
-                    countMessages++;
-                    window.jQuery('#cookiesSupportedDiv').show();
-                }
-
-                if (countMessages === 0) {
-                    window.jQuery('#notifications-count').remove();
-                    window.jQuery('#cas-notifications-menu').remove();
-                } else {
-                    window.jQuery('#notifications-count').text(`(${countMessages})`)
-                }
-            });
-        })(typeof mdc !== 'undefined' && mdc);
-    </script>
-</div>
-
-
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/fragments/includes.html b/src/main/resources/templates_original/fragments/includes.html
deleted file mode 100644
index ac54152..0000000
--- a/src/main/resources/templates_original/fragments/includes.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<span th:fragment="javascript" th:remove="tag">
-    <script type="text/javascript" th:src="@{#{webjars.es5shim.js}}"></script>
-    <script type="text/javascript" th:src="@{#{webjars.cssVarsPonyfill.js}}"></script>
-    <script type="text/javascript" th:src="@{#{webjars.material-components.js}}"></script>
-</span>
-
-<span th:fragment="stylesheets" th:remove="tag">
-    <link rel="stylesheet" type="text/css" href="../static/css/normalize.css" th:href="@{#{webjars.normalize.css}}" />
-    <link rel="stylesheet" type="text/css" href="../static/css/bootstrap-grid.min.css"
-        th:href="@{#{webjars.bootstrap-grid.css}}" />
-    <link rel="stylesheet" type="text/css" href="../static/css/material-components-web.min.css"
-        th:href="@{#{webjars.material-components.css}}" />
-    <link rel="stylesheet" type="text/css" href="../static/css/mdi-font.css" th:href="@{#{webjars.mdi-font.css}}" />
-    <link rel="stylesheet" type="text/css" href="../static/css/dataTables.css" th:href="@{#{webjars.dataTables.css}}" />
-</span>
diff --git a/src/main/resources/templates_original/fragments/loginProviders.html b/src/main/resources/templates_original/fragments/loginProviders.html
deleted file mode 100644
index 1ec5645..0000000
--- a/src/main/resources/templates_original/fragments/loginProviders.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title>loginProviders Fragment</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div th:fragment="loginProviders" th:remove="tag" class="login-providers">
-        <div th:if="${#bools.isFalse(delegatedAuthenticationDynamicProviderSelection)}">
-            <script type="text/javascript">
-                let providers = [];
-            </script>
-            <div th:if="${delegatedAuthenticationProviderConfigurations}">
-
-                <h3 class="text-center mt-md-0 mt-4">
-                    <i class="fas fa-user-shield"></i>
-                    <span th:if="${delegatedAuthenticationProviderPrimary == null}"
-                          th:utext="#{screen.welcome.label.loginwith}">External Identity Providers</span>
-                </h3>
-
-                <div class="card-title" th:if="${delegatedAuthenticationProviderPrimary != null}">
-                    <div class="alert alert-info" role="alert">
-                        <span th:utext="#{screen.welcome.label.navto(${delegatedAuthenticationProviderPrimary.name})}" />
-                        <p>
-                        <div role="progressbar" class="mdc-linear-progress mdc-linear-progress--indeterminate">
-                            <div class="mdc-linear-progress__buffer">
-                                <div class="mdc-linear-progress__buffer-bar"></div>
-                                <div class="mdc-linear-progress__buffer-dots"></div>
-                            </div>
-                            <div class="mdc-linear-progress__bar mdc-linear-progress__primary-bar">
-                                <span class="mdc-linear-progress__bar-inner"></span>
-                            </div>
-                            <div class="mdc-linear-progress__bar mdc-linear-progress__secondary-bar">
-                                <span class="mdc-linear-progress__bar-inner"></span>
-                            </div>
-                        </div>
-
-                        </p>
-                        <script>new mdc.linearProgress.MDCLinearProgress(document.querySelector('.mdc-linear-progress'));</script>
-                    </div>
-                </div>
-
-                <div class="d-flex justify-content-center"
-                     th:style="'visibility:' + ${delegatedAuthenticationProviderPrimary != null ? 'hidden' : 'visible'}">
-                    <ul class="list-unstyled d-flex flex-column m-0 flex-fill">
-                        <li class="p-1 login-provider-item"
-                            th:each="entry: ${delegatedAuthenticationProviderConfigurations}"
-                            th:switch="${entry.type}">
-
-                            <form method="post" th:id="${'form' + entry.name}" th:action="@{/login}">
-                                <button class="mdc-button mdc-button--raised me-2 btn btn-primary d-block w-100"
-                                        name="submitButton"
-                                        id="submitButton"
-                                        type="submit"
-                                        th:attr="autoRedirectType=${#strings.toLowerCase(entry.autoRedirectType)},redirectUrl=@{${entry.redirectUrl}}"
-                                        th:title="${entry.name + ' ' + entry.type}"
-                                        th:id="${entry.name}"
-                                        th:classappend="'mdc-button-' + ${entry.type}"
-                                        accesskey="s">
-                                    <span class="mdc-button__label">[[${#strings.defaultString(entry.title,entry.name)}]]</span>
-                                </button>
-
-                                <input type="hidden" name="client_name" th:value="${entry.name}" />
-                                <input type="hidden" name="_eventId" value="delegatedAuthenticationRedirect" />
-                                <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-                            </form>
-
-                            <script th:inline="javascript">
-                                /*<![CDATA[*/
-                                providers.push({
-                                    name: /*[[${entry.name}]]*/ ,
-                                    type: /*[[${entry.type}]]*/ ,
-                                    url: /*[[@{${entry.redirectUrl}}]]*/
-                                });
-
-                                function jqueryReady() {
-                                    $("#fm1 #username").on("focusout", () => {
-                                        let user = $("#fm1 #username").val();
-                                        /*
-                                        if (user.endsWith("@example.org")) {
-                                            let provider = providers.find(element => element.name === "ClientName");
-                                            $("#passwordSection").hide();
-                                            location.href = provider.url;
-                                        }
-                                        */
-                                    });
-                                }
-                                /*]]>*/
-                            </script>
-
-                        </li>
-                        <li th:if="${identityProviderDiscoveryEnabled}">
-                            <script type="text/javascript" th:inline="javascript">
-                                /*<![CDATA[*/
-                                let url = /*[[@{/idp/discovery}]]*/ ;
-
-                                let returnUrl = /*[[${cas.server.name} + @{/idp/discovery/redirect}]]*/ ;
-
-                                if (window.location.search) {
-                                    returnUrl += encodeURIComponent(window.location.search);
-                                }
-                                url += `?return=${returnUrl}`;
-                                let link = `<a href='${url}' id="saml2IdPDiscovery" class='mdc-button mdc-button--raised d-block'>
-                                   <i class='mdi mdi-shield' aria-hidden='true'></i>
-                                   <span class="mdc-button__label">SAML2 Identity Provider Discovery</span></a>`;
-                                document.write(link);
-                                /*]]>*/
-                            </script>
-                        </li>
-                    </ul>
-                </div>
-            </div>
-
-            <div th:if="${wsfedUrls}" id="list-providers"
-                 th:class="${delegatedAuthenticationProviderPrimary == null ? 'card d-sm-none d-md-block bg-light' : ''}">
-
-                <div class="card-body">
-                    <h3 class="card-title" th:utext="#{screen.welcome.label.loginwith}"
-                        th:if="${delegatedAuthenticationProviderPrimary == null}">Login with:</h3>
-                    <div class="card-title" th:if="${delegatedAuthenticationProviderPrimary != null}">
-                        <div class="alert alert-info">
-                            <span th:utext="#{screen.welcome.label.navto(${delegatedAuthenticationProviderPrimary.name})}" />
-                        </div>
-                    </div>
-
-                    <div class="card-text"
-                         th:style="'display:' + ${delegatedAuthenticationProviderPrimary != null ? 'none' : 'block'}">
-                        <ul>
-                            <li class="p-1 login-provider-item" th:each="entry: ${wsfedUrls}">
-                                <a class="mdc-button mdc-button--raised w-100"
-                                   th:href="@{${entry.redirectUrl}}"
-                                   th:inline="text" onload=""
-                                   th:attr="autoRedirectType=${#strings.toLowerCase(entry.autoRedirectType)}"
-                                   th:title="${entry.name}">
-
-                                    <i class="mdi mdi-microsoft-windows"></i>
-                                    <span class="mdc-button__label">[[${entry.name}]]</span>
-                                </a>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-            
-            <script type="text/javascript" th:inline="javascript">
-                /*<![CDATA[*/
-
-                let primaryUrl = /*[[${delegatedAuthenticationProviderPrimary?.redirectUrl}]]*/;
-                let primaryName = /*[[${delegatedAuthenticationProviderPrimary?.name}]]*/;
-
-                const redirectTo = $("button[autoRedirectType=client]").attr("id");
-                if (primaryUrl != null) {
-                    console.log(`Redirecting to primary identity provider ${primaryName} via URL ${primaryUrl}`)
-                    let form = document.getElementById(`form${primaryName}`);
-                    form.submit();
-                }
-                else if (redirectTo !== null && redirectTo !== undefined) {
-                    console.log(`Redirecting to identity provider URL ${redirectTo}`)
-                    let form = document.getElementById(`form${redirectTo}`);
-                    form.submit();
-                } else {
-                    console.log("No identity provider is configured for auto redirection.");
-                }
-                /*]]>*/
-            </script>
-        </div>
-
-    </div>
-</main>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/fragments/logindrawer.html b/src/main/resources/templates_original/fragments/logindrawer.html
deleted file mode 100644
index caad492..0000000
--- a/src/main/resources/templates_original/fragments/logindrawer.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title>Login Sidebar Fragment</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div th:fragment="logindrawer" id="logindrawer">
-        <aside id="app-drawer"
-               th:if="${'true' == #strings.defaultString(#themes.code('cas.drawer-menu.enabled'), 'true')}"
-               class="mdc-drawer mdc-drawer--dismissible mdc-drawer--modal offcanvas offcanvas-start">
-            <div class="mdc-drawer__header offcanvas-header flex-column">
-                <h3 class="mdc-drawer__title offcanvas-title" th:text="${#strings.defaultString(#themes.code('cas.theme.name'), 'CAS')}">
-                    CAS</h3>
-                <h6 class="mdc-drawer__subtitle offcanvas-title"
-                    th:text="${#strings.defaultString(#themes.code('cas.theme.description'), 'Central Authentication Service')}">
-                    Central Authentication Service</h6>
-            </div>
-            <div class="mdc-drawer__content offcanvas-body">
-                <nav class="mdc-list list-group list-group-flush" th:with="serverprefix=${cas.server.prefix}">
-                    <a id="halbrowser"
-                       th:href="@{${'/webjars/hal-explorer/index.html#hkey0=Content-Type&hval0=application/json&uri=' + serverprefix + '/actuator'}}"
-                       class="mdc-list-item list-group-item list-group-item-action">
-                        <i class="mdi mdi-cogs fa fa-cogs"></i>&nbsp;
-                        <span class="mdc-list-item__text">HAL Explorer</span>
-                    </a>
-
-                    <a th:href="@{/actuator}" class="mdc-list-item list-group-item list-group-item-action">
-                        <i class="mdi mdi-cogs fa fa-cogs"></i>&nbsp;
-                        <span class="mdc-list-item__text">[[#{cas.login.resources.endpoints}]]</span>
-                    </a>
-                    <hr class="mdc-list-divider bs-hide"/>
-                    <a class="mdc-list-item list-group-item list-group-item-action" href="https://apereo.github.io/cas">
-                        <i class="mdi mdi-file-code-outline fas fa-file-code"></i>&nbsp;
-                        <span class="mdc-list-item__text">[[#{cas.login.resources.wiki}]]</span>
-                    </a>
-                    <a class="mdc-list-item list-group-item list-group-item-action" href="https://github.com/apereo/cas/pulls">
-                        <i class="mdi mdi-call-merge fas fa-code-branch"></i>&nbsp;
-                        <span class="mdc-list-item__text">[[#{cas.login.resources.pulls}]]</span>
-                    </a>
-                    <a class="mdc-list-item list-group-item list-group-item-action"
-                       href="https://apereo.github.io/cas/developer/Contributor-Guidelines.html">
-                        <i class="mdi mdi-information fas fa-info-circle"></i>&nbsp;
-                        <span class="mdc-list-item__text">[[#{cas.login.resources.contribguide}]]</span>
-                    </a>
-                    <a class="mdc-list-item list-group-item list-group-item-action" href="https://apereo.github.io/cas/Support.html">
-                        <i class="mdi mdi-help-circle fas fa-question-circle"></i>&nbsp;
-                        <span class="mdc-list-item__text">[[#{cas.login.resources.support}]]</span>
-                    </a>
-                    <a class="mdc-list-item list-group-item list-group-item-action" href="https://apereo.github.io/cas/Mailing-Lists.html">
-                        <i class="mdi mdi-email-newsletter fas fa-envelope-open-text"></i>&nbsp;
-                        <span class="mdc-list-item__text">[[#{cas.login.resources.mailinglist}]]</span>
-                    </a>
-                    <a class="mdc-list-item list-group-item list-group-item-action" href="https://gitter.im/apereo/cas">
-                        <i class="mdi mdi-message-text fas fa-comment-dots"></i>&nbsp;
-                        <span class="mdc-list-item__text">[[#{cas.login.resources.chat}]]</span>
-                    </a>
-                    <a class="mdc-list-item list-group-item list-group-item-action" href="https://apereo.github.io/">
-                        <i class="mdi mdi-post fas fa-newspaper"></i>&nbsp;
-                        <span class="mdc-list-item__text">[[#{cas.login.resources.blog}]]</span>
-                    </a>
-                </nav>
-            </div>
-        </aside>
-    </div>
-</main>
-</body>
-
-</html>
-
diff --git a/src/main/resources/templates_original/fragments/loginform.html b/src/main/resources/templates_original/fragments/loginform.html
deleted file mode 100644
index ed65e00..0000000
--- a/src/main/resources/templates_original/fragments/loginform.html
+++ /dev/null
@@ -1,361 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title>Login Form Fragment</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-
-    <div th:fragment="loginform" class="d-flex flex-column justify-content-between m-auto"
-         th:with="loginFormEnabled=${#strings.defaultString(#themes.code('cas.login-form.enabled'), 'true') == 'true'},
-                loginFormViewable=${@casThymeleafLoginFormDirector.isLoginFormViewable(#vars)}">
-
-        <div th:if="${delegatedAuthenticationProviderPrimary == null}">
-            <div th:if="${!#strings.isEmpty(#themes.code('cas.hero-banner.file'))}">
-                <p>
-                    <img id="heroimg"
-                         th:title="${#strings.defaultString(#themes.code('cas.theme.name'), 'CAS')}"
-                         th:src="@{${#themes.code('cas.hero-banner.file')}}"/>
-                </p>
-            </div>
-            <div class="service-ui" th:replace="fragments/serviceui :: serviceUI">
-                <a href="fragments/serviceui.html">service ui fragment</a>
-            </div>
-        </div>
-
-        <div class="form-wrapper">
-
-            <form method="post" id="fm1" th:object="${credential}" action="login">
-                <div id="login-form-controls" th:unless="${loginFormViewable or loginFormEnabled}">
-                    <div id="loginErrorsPanel" class="alert alert-danger banner banner-danger banner-dismissible"
-                         th:if="${#fields.hasErrors('*')}">
-                        <p th:each="err : ${#fields.errors('*')}" th:utext="${err + ' '}">Example error</p>
-                        <!--<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>-->
-                    </div>
-                </div>
-
-                <div id="login-form-controls" th:if="${loginFormViewable and loginFormEnabled}">
-                    <div th:if="${existingSingleSignOnSessionAvailable}">
-                        <i class="mdi mdi-alert-decagram fas fa-exclamation-triangle"></i>&nbsp;
-                        <span id="existingSsoMsg" th:if="${registeredService}" class="mdc-button__label"
-                              th:utext="#{screen.welcome.forcedsso(${existingSingleSignOnSessionPrincipal?.id},${registeredService.name})}"/>
-                        <span id="existingSsoMsg" th:unless="${registeredService}" class="mdc-button__label"
-                              th:utext="#{screen.welcome.forcedsso(${existingSingleSignOnSessionPrincipal?.id}, 'CAS')}"/>
-                    </div>
-                    <h3 th:unless="${existingSingleSignOnSessionAvailable}" class="text-center">
-                        <i class="mdi mdi-security fas fa-shield-alt"></i>
-                        <span th:utext="#{screen.welcome.instructions}">Enter your Username and Password:</span>
-                    </h3>
-
-                    <div id="loginErrorsPanel" class="banner banner-danger alert alert-danger banner-dismissible"
-                         th:if="${#fields.hasErrors('*')}">
-                        <p th:each="err : ${#fields.errors('*')}" th:utext="${err + ' '}">Example error</p>
-                        <!--<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>-->
-                    </div>
-                    <section class="cas-field form-group my-3" id="usernameSection">
-                        <label for="username"
-                               class="mdc-text-field mdc-text-field--outlined control-label w-100">
-                            <span class="mdc-notched-outline">
-                                <span class="mdc-notched-outline__leading"></span>
-                                <span class="mdc-notched-outline__notch">
-                                    <span class="mdc-floating-label"
-                                          th:utext="#{screen.welcome.label.netid}">Username</span>
-                                </span>
-                                <span class="mdc-notched-outline__trailing"></span>
-                            </span>
-                            <input class="mdc-text-field__input form-control" id="username"
-                                   size="25"
-                                   type="text"
-                                   th:readonly="!${@casThymeleafLoginFormDirector.isLoginFormUsernameInputVisible(#vars)}"
-                                   th:field="*{username}"
-                                   th:accesskey="#{screen.welcome.label.netid.accesskey}"
-                                   autocapitalize="none"
-                                   spellcheck="false"
-                                   autocomplete="username" required/>
-                        </label>
-
-                        <div class="mdc-text-field-helper-line">
-                            <div class="mdc-text-field-helper-text mdc-text-field-helper-text--validation-msg" aria-hidden="true">
-                                <span id="usernameValidationMessage" th:utext="#{username.required}"></span>
-                            </div>
-                        </div>
-
-                        <script type="text/javascript" th:inline="javascript">
-                            /*<![CDATA[*/
-                            var username = /*[[${@casThymeleafLoginFormDirector.getLoginFormUsername(#vars)}]]*/;
-                            var disabled = /*[[${@casThymeleafLoginFormDirector.isLoginFormUsernameInputDisabled(#vars)}]]*/;
-
-                            if (username != null && username !== '') {
-                                $('#username').val(username);
-                                if (disabled) {
-                                    $('#usernameSection').hide();
-                                }
-                            }
-                            /*]]>*/
-                        </script>
-                    </section>
-                    <section class="cas-field form-group my-3 mdc-input-group form-group" id="passwordSection">
-                        <div class="mdc-input-group-field mdc-input-group-field-append">
-                            <div class="caps-check">
-                                <label for="password"
-                                       class="mdc-text-field caps-check mdc-text-field--outlined control-label mdc-text-field--with-trailing-icon control-label w-100">
-                                    <span class="mdc-notched-outline">
-                                        <span class="mdc-notched-outline__leading"></span>
-                                        <span class="mdc-notched-outline__notch">
-                                            <span class="mdc-floating-label" th:utext="#{screen.welcome.label.password}">Password</span>
-                                        </span>
-                                        <span class="mdc-notched-outline__trailing"></span>
-                                    </span>
-                                    <input class="mdc-text-field__input form-control pwd"
-                                           type="password"
-                                           id="password"
-                                           size="25"
-                                           required
-                                           th:accesskey="#{screen.welcome.label.password.accesskey}"
-                                           th:field="*{password}"
-                                           autocomplete="off"/>
-                                    <button
-                                            class="reveal-password align-self-end mdc-button mdc-button--unelevated mdc-input-group-append mdc-icon-button btn btn-primary"
-                                            tabindex="-1" type="button">
-                                        <i class="mdi mdi-eye reveal-password-icon fas fa-eye"></i>
-                                        <span class="visually-hidden">Toggle Password</span>
-                                    </button>
-                                </label>
-                                <div class="mdc-text-field-helper-line">
-                                    <div
-                                            class="mdc-text-field-helper-text mdc-text-field-helper-text--validation-msg"
-                                            aria-hidden="true">
-                                        <span id="passwordValidationMessage" th:utext="#{password.required}"></span>
-                                    </div>
-                                </div>
-                                <div class="mdc-text-field-helper-line caps-warn">
-                                    <div
-                                            class="mdc-text-field-helper-text mdc-text-field-helper-text--persistent mdc-text-field-helper-text--validation-msg text-danger">
-                                        <span th:utext="#{screen.capslock.on}"/>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </section>
-
-                    <section id="authnSourceSection" class="cas-field form-group my-3"
-                             th:if="${availableAuthenticationHandlerNames != null}">
-                        <div class="d-flex">
-                            <div th:if="${availableAuthenticationHandlerNames.size() > 1}"
-                                 class="mdc-select mdc-select--outlined mdc-select--required mdc-menu-surface--fullwidth authn-source">
-                                <div class="mdc-select__anchor"
-                                     role="button"
-                                     aria-required="true"
-                                     aria-haspopup="listbox"
-                                     aria-expanded="false">
-                                    <span class="mdc-line__ripple"></span>
-                                    <span class="mdc-notched-outline">
-                                        <span class="mdc-notched-outline__leading"></span>
-                                        <span class="mdc-notched-outline__notch">
-                                            <span id="outlined-select-label" class="mdc-floating-label"
-                                                  th:utext="#{screen.welcome.label.source}">Source</span>
-                                        </span>
-                                        <span class="mdc-notched-outline__trailing"></span>
-                                    </span>
-                                    <span class="mdc-select__selected-text-container">
-                                        <span class="mdc-select__selected-text"/>
-                                    </span>
-                                    <span class="mdc-select__dropdown-icon">
-                                        <svg class="mdc-select__dropdown-icon-graphic" viewBox="7 10 10 5"
-                                             focusable="false">
-                                            <polygon class="mdc-select__dropdown-icon-inactive" stroke="none"
-                                                     fill-rule="evenodd" points="7 10 12 15 17 10">
-                                            </polygon>
-                                            <polygon class="mdc-select__dropdown-icon-active" stroke="none"
-                                                     fill-rule="evenodd" points="7 15 12 10 17 15">
-                                            </polygon>
-                                        </svg>
-                                    </span>
-                                    <span class="mdc-line-ripple"></span>
-                                </div>
-
-                                <div class="mdc-select__menu mdc-menu mdc-menu-surface mdc-menu-surface--fullwidth">
-                                    <ul class="mdc-list" role="listbox">
-                                        <li th:each="handler,iter : ${availableAuthenticationHandlerNames}"
-                                            class="mdc-list-item " th:id="${handler + '-authnSource'}"
-                                            th:classappend="${iter.index == 0 ? 'mdc-list-item--selected' : ''}"
-                                            th:data-value="${handler}" role="option">
-                                            <span class="mdc-list-item__ripple"></span>
-                                            <span class="mdc-list-item__text" th:utext="${handler}">Option</span>
-                                        </li>
-                                    </ul>
-                                </div>
-                                <input type="hidden" id="source" th:field="*{source}" name="source"/>
-                            </div>
-
-                            <span th:if="${availableAuthenticationHandlerNames.size() == 1}">
-                                <input type="hidden" id="source" name="source"
-                                       th:value="${availableAuthenticationHandlerNames.get(0)}"/>
-                            </span>
-                        </div>
-                    </section>
-
-                    <section class="cas-field form-group my-3">
-                        <div th:each="entry: ${customLoginFormFields}">
-                            <label class="mdc-text-field mdc-text-field--outlined control-label">
-                                <input class="mdc-text-field__input form-control"
-                                       th:id="${entry.key + '-customField'}" th:name="${entry.key + '-customField'}"
-                                       size="25" type="text" th:field="*{customFields[__${entry.key}__]}"
-                                       autocomplete="off"/>
-                                <span class="mdc-notched-outline">
-                                    <span class="mdc-notched-outline__leading"></span>
-                                    <span class="mdc-notched-outline__notch">
-                                        <span class="mdc-floating-label"
-                                              th:text="#{${entry.value.messageBundleKey}}">Label</span>
-                                    </span>
-                                    <span class="mdc-notched-outline__trailing"></span>
-                                </span>
-                            </label>
-                        </div>
-                    </section>
-
-
-                    <section class="cas-field form-group"
-                             th:if="${passwordManagementEnabled != null && passwordManagementEnabled && param.doChangePassword != null}">
-                        <p>
-                            <input type="checkbox" name="doChangePassword" id="doChangePassword"
-                                   value="true" th:checked="${param.doChangePassword != null}"/>
-                            <label for="doChangePassword" th:text="#{screen.button.changePassword}">Change Password</label>
-                        </p>
-                    </section>
-
-                    <section class="cas-field form-check" th:if="${rememberMeAuthenticationEnabled}">
-                        <div class="mdc-form-field ">
-                            <div class="mdc-checkbox">
-                                <input type="checkbox"
-                                       class="mdc-checkbox__native-control form-check-input"
-                                       name="rememberMe"
-                                       id="rememberMe"/>
-                                <div class="mdc-checkbox__background">
-                                    <svg class="mdc-checkbox__checkmark"
-                                         viewBox="0 0 24 24">
-                                        <path class="mdc-checkbox__checkmark-path"
-                                              fill="none"
-                                              d="M1.73,12.91 8.1,19.28 22.79,4.59"/>
-                                    </svg>
-                                    <div class="mdc-checkbox__mixedmark"></div>
-                                </div>
-                                <div class="mdc-checkbox__ripple"></div>
-                            </div>
-                            <label class="form-check-label" for="rememberMe" th:text="#{screen.rememberme.checkbox.title}">Remember
-                                Me</label>
-                        </div>
-                        <p/>
-                    </section>
-
-                    <section class="cas-field">
-
-                        <span th:if="${recaptchaLoginEnabled}">
-                            <div th:replace="fragments/recaptcha :: recaptchaToken"/>
-                        </span>
-
-                        <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-                        <input type="hidden" name="_eventId" value="submit"/>
-                        <input type="hidden" name="geolocation"/>
-
-                        <p th:if="${#request.getMethod().equalsIgnoreCase('POST')}">
-                            <span th:each="entry : ${httpRequestInitialPostParameters}" th:remove="tag">
-                                <span th:each="entryValue : ${entry.value}" th:remove="tag">
-                                    <input type="hidden" th:name="${entry.key}" th:value="${entryValue}"/>
-                                </span>
-                            </span>
-                        </p>
-                    </section>
-
-                    <div th:replace="fragments/submitbutton :: submitButton (messageKey='screen.welcome.button.login')"/>
-                </div>
-            </form>
-
-            <div id="selectIdentityProvider"
-                 th:if="${#bools.isTrue(delegatedAuthenticationDynamicProviderSelection) and loginFormViewable and loginFormEnabled}">
-                <p>
-                <form method="post" id="providerDiscoveryForm">
-                    <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-                    <input type="hidden" name="_eventId" value="discovery"/>
-                    <span class="fa fa-unlock"></span>
-                    <button th:id="selectProviderButton"
-                            class="mdc-button mdc-button--raised"
-                            onclick="$('#providerDiscoveryForm').submit();"
-                            th:value="#{screen.pac4j.button.selectprovider}">
-                        <span class="mdc-button__label" th:text="#{screen.pac4j.button.selectprovider}">Select</span>
-                    </button>
-                </form>
-            </div>
-
-            <div id="x509Login" th:if="${x509ClientAuthLoginEndpointUrl}">
-                <span th:if="${loginFormViewable and loginFormEnabled}">
-                    <hr class="my-4"/>
-                    <script th:inline="javascript">
-                        /*<![CDATA[*/
-                        function x509login() {
-                            var url =  /*[[${x509ClientAuthLoginEndpointUrl}]]*/;
-                            url += window.location.search;
-                            window.location.assign(url)
-                        }
-
-                        /*]]>*/
-                    </script>
-                    <a class="mdc-button mdc-button--raised btn btn-primary"
-                       onclick="javascript:x509login();"
-                       th:text="#{screen.welcome.button.loginx509}">X509 Login</a>
-                </span>
-            </div>
-
-            <hr th:if="${loginFormViewable and loginFormEnabled}" class="my-4"/>
-
-            <span id="webauthnLoginPanel" th:if="${webAuthnPrimaryAuthenticationEnabled}">
-                <script type="text/javascript">
-                    $('#webauthnLoginPanel').show();
-                </script>
-
-                <div th:replace="fragments/webAuthnLogin :: webAuthnLogin"/>
-                <hr class="my-4"/>
-            </span>
-
-
-            <span th:if="${loginFormViewable and loginFormEnabled}">
-                <span th:remove="tag"
-                      th:if="${'true' == #strings.defaultString(#themes.code('cas.pm-links.enabled'), 'true')}">
-                    <div th:replace="fragments/pmlinks :: pmlinks"/>
-                </span>
-            </span>
-
-            <script type="text/javascript" th:inline="javascript">
-                /*<![CDATA[*/
-                var i = /*[[@{#{screen.welcome.button.loginwip}}]]*/
-                var j = /*[[@{#{screen.welcome.button.login}}]]*/
-                    /*]]>*/
-                    $(window).on('pageshow', function () {
-                        $(':submit').prop('disabled', false);
-                        $(':submit').attr('value', j);
-                    });
-                $(document).ready(function () {
-                    $("#fm1").submit(function () {
-                        $(":submit").attr("disabled", true);
-                        $(":submit").attr("value", i);
-                        return true;
-                    });
-                });
-            </script>
-        </div>
-
-        <span th:if="${loginFormViewable and loginFormEnabled}">
-            <div th:replace="fragments/loginsidebar :: loginsidebar"/>
-        </span>
-    </div>
-</main>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/fragments/loginsidebar.html b/src/main/resources/templates_original/fragments/loginsidebar.html
deleted file mode 100644
index ce201c2..0000000
--- a/src/main/resources/templates_original/fragments/loginsidebar.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title>Login Sidebar Fragment</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-    <main role="main" class="container mt-3 mb-3">
-        <div th:fragment="loginsidebar" id="sidebar">
-            <div class="sidebar-content">
-                <p th:utext="#{screen.welcome.security}">For security reasons, please <a href="logout">log out</a> and
-                    exit your web browser when you are done accessing services that require authentication!</p>
-            </div>
-        </div>
-    </main>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/fragments/pmlinks.html b/src/main/resources/templates_original/fragments/pmlinks.html
deleted file mode 100644
index 6d05bac..0000000
--- a/src/main/resources/templates_original/fragments/pmlinks.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title>Password Management Links Fragment</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-    <div th:fragment="pmlinks" id="pmlinks" class="my-2">
-        <form th:if="${accountRegistrationEnabled}" method="post" id="accountMgmtSignupForm">
-            <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-            <input type="hidden" name="_eventId" value="signup" />
-            <span class="mdi mdi-account-group"></span>
-            <a id="accountSignUpLink" th:utext="#{screen.acct.button.signUp}" href="javascript:void(0)"
-               onclick="document.getElementById('accountMgmtSignupForm').submit()" />
-            <br><br>
-        </form>
-        <form th:if="${passwordManagementEnabled}" method="post" id="passwordManagementForm">
-            <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-            <input type="hidden" name="_eventId" value="resetPassword" />
-            <span class="mdi mdi-lock-open"></span>
-            <a id="forgotPasswordLink" th:utext="#{screen.pm.button.resetPassword}" href="javascript:void(0)"
-                onclick="document.getElementById('passwordManagementForm').submit();" />
-            <br><br>
-        </form>
-        <form th:if="${passwordManagementEnabled}" method="post" id="passwordManagementUserForm">
-            <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-            <input type="hidden" name="_eventId" value="forgotUsername" />
-            <span class="mdi mdi-account-question"></span>
-            <a id="forgotUsernameLink" th:utext="#{screen.pm.button.forgotUsername}" href="javascript:void(0)"
-                onclick="document.getElementById('passwordManagementUserForm').submit();" />
-            <br><br>
-        </form>
-        <div th:unless="${passwordManagementEnabled}">
-            <br />
-            <span class="mdi mdi-account-question"></span>
-            <span th:utext="#{screen.pm.button.forgotpwd('https://pwd.example.org')}">Forgot your password?</span>
-        </div>
-    </div>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/fragments/pwdupdateform.html b/src/main/resources/templates_original/fragments/pwdupdateform.html
deleted file mode 100644
index c70b783..0000000
--- a/src/main/resources/templates_original/fragments/pwdupdateform.html
+++ /dev/null
@@ -1,165 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title>Password Update Form</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div id="pwdmain" th:fragment="pwdupdateform">
-        <script th:inline="javascript">
-            /*<![CDATA[*/
-
-            var policyPattern = /*[[${passwordPolicyPattern}]]*/;
-            var passwordStrengthI18n = {
-                0: /*[[#{screen.pm.password.strength.0}]]*/,
-                1: /*[[#{screen.pm.password.strength.1}]]*/,
-                2: /*[[#{screen.pm.password.strength.2}]]*/,
-                3: /*[[#{screen.pm.password.strength.3}]]*/,
-                4: /*[[#{screen.pm.password.strength.4}]]*/
-            };
-            var passwordMinimumStrength = 0;
-
-            /*]]>*/
-        </script>
-        <h3 th:utext="${expiredPass}
-        ? #{screen.expiredpass.heading(${credential.id})}
-        : #{screen.mustchangepass.heading(${credential.id})}">
-            Change Password Heading</h3>
-
-        <form id="passwordManagementForm" th:if="${passwordManagementEnabled}" method="post"
-              th:object="${password}">
-            <div class="banner banner-danger alert alert-danger banner-dismissible my-4" th:if="${#fields.hasErrors('*')}">
-
-                <span th:each="err : ${#fields.errors('*')}" th:utext="${err}">Error text</span>
-            </div>
-
-            <div class="cas-field my-3 mdc-input-group form-group d-flex">
-                <div class="mdc-input-group-field mdc-input-group-field-append flex-grow-1">
-                    <div class="d-flex caps-check">
-
-                        <label for="password"
-                               class="mdc-text-field caps-check mdc-text-field--outlined control-label mdc-text-field--with-trailing-icon">
-                            <input class="mdc-text-field__input form-control pwd"
-                                   autocapitalize="none"
-                                   spellcheck="false"
-                                   type="password"
-                                   name="password"
-                                   id="password"
-                                   th:field="*{password}"
-                                   autocomplete="off" required/>
-                            <span class="mdc-notched-outline">
-                                <span class="mdc-notched-outline__leading"></span>
-                                <span class="mdc-notched-outline__notch">
-                                    <span class="mdc-floating-label" th:utext="#{screen.pm.enterpsw}">Enter Password:</span>
-                                </span>
-                                <span class="mdc-notched-outline__trailing"></span>
-                            </span>
-                        </label>
-                        <i class="mdi mdi-alert mdc-text-field__icon text-danger caps-warn"></i>
-                    </div>
-                </div>
-                <button class="reveal-password align-self-end mdc-button mdc-button--raised mdc-input-group-append mdc-icon-button btn btn-primary"
-                    tabindex="-1" type="button">
-                    <i class="mdi mdi-eye reveal-password-icon fas fa-eye"></i>
-                    <span class="visually-hidden">Toggle Password</span>
-                </button>
-            </div>
-
-            <div class="cas-field form-group mdc-input-group my-3">
-                <div class="d-flex caps-check">
-                    <label for="confirmedPassword" class="mdc-text-field mdc-text-field--outlined mdc-text-field--with-trailing-icon control-label">
-                        <input class="mdc-text-field__input form-control pwd"
-                               type="password"
-                               autocapitalize="none"
-                               spellcheck="false"
-                               name="confirmedPassword"
-                               id="confirmedPassword"
-                               th:field="*{confirmedPassword}"
-                               autocomplete="off" required/>
-
-                        <span class="mdc-notched-outline">
-                            <span class="mdc-notched-outline__leading"></span>
-                            <span class="mdc-notched-outline__notch">
-                                <span class="mdc-floating-label" th:utext="#{screen.pm.confirmpsw}">Confirm Password:</span>
-                            </span>
-                            <span class="mdc-notched-outline__trailing"></span>
-                        </span>
-                    </label>
-                    <i class="mdi mdi-alert mdc-text-field__icon bs-hide text-danger caps-warn"></i>
-                </div>
-            </div>
-
-            <div class="cas-field form-group my-3 d-flex flex-column">
-                <div class="d-flex align-items-center">
-                    <span th:text="#{screen.pm.password.strength}">Strength:</span>&nbsp;
-                    <span id="password-strength-icon" class="mdi" aria-hidden="true"></span>
-                </div>
-                <div id="strengthProgressBar" role="progressbar" class="d-none progress">
-                    <div id="progress-strength-indicator" class="progress-bar progress-bar-indicator text-center"></div>
-                    <div class="mdc-linear-progress">
-                        <div class="mdc-linear-progress__buffering-dots"></div>
-                        <div class="mdc-linear-progress__buffer"></div>
-                        <div class="mdc-linear-progress__bar mdc-linear-progress__primary-bar" style="transform: scaleX(0);">
-                            <span class="mdc-linear-progress__bar-inner"></span>
-                        </div>
-                        <div class="mdc-linear-progress__bar mdc-linear-progress__secondary-bar">
-                            <span class="mdc-linear-progress__bar-inner"></span>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="cas-field form-group my-3 text-warning" id="password-strength-msg" style="display: none;">
-                <div class="suggestions banner banner-warning alert alert-warning p-2 mb-2 d-flex align-items-center" role="alert">
-                    <span class="mdi mdi-information fas fa-info-circle" aria-hidden="true"></span>&nbsp;
-                    <p class="m-0">
-                        <span id="password-strength-warning"></span>&nbsp;
-                        <span id="password-strength-suggestions"></span>
-                    </p>
-                </div>
-            </div>
-            <div class="cas-field form-group my-3 text-danger" id="password-strength-notes">
-                <div id="password-policy-violation-msg" class="banner banner-danger alert alert-danger p-2" role="alert" style="display: none;">
-                    <span class="mdi mdi-alert fas fa-exclamation-triangle" aria-hidden="true"></span>&nbsp;
-                    <strong th:text="#{screen.pm.password.policyViolation}">Password does not match the password policy
-                        requirement.</strong>
-                </div>
-                <div id="password-confirm-mismatch-msg" class="banner banner-danger alert alert-danger p-2" role="alert" style="display: none;">
-                    <span class="mdi mdi-alert fas fa-exclamation-triangle" aria-hidden="true"></span>&nbsp;
-                    <strong th:text="#{screen.pm.password.confirmMismatch}">Passwords do not match.</strong>
-                </div>
-            </div>
-
-            <div class="cas-field form-group">
-                <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-                <input type="hidden" name="_eventId" value="submit"/>
-                <button class="mdc-button mdc-button--raised btn btn-primary me-2"
-                        name="submit"
-                        accesskey="s"
-                        th:value="#{screen.pm.button.submit}"
-                        th:attr="data-processing-text=#{screen.welcome.button.loginwip}"
-                        value="SUBMIT"
-                        id="submit"
-                        type="submit"
-                        disabled="true">
-                    <span class="mdc-button__label" th:text="#{screen.pm.button.submit}">Submit</span>
-                </button>
-                <a class="mdc-button mdc-button--outline btn btn-outline-secondary" th:href="@{/login}">
-                    <span class="mdc-button__label" th:text="#{screen.pm.button.cancel}">CANCEL</span>
-                </a>
-            </div>
-        </form>
-
-        <p id="pwddesc" th:unless="${passwordManagementEnabled}"
-           th:utext="${expiredPass} ? #{screen.expiredpass.message('https://pwd.example.org')} : #{screen.mustchangepass.message('https://pwd.example.org')}">Expired/Must Change Password text</p>
-        
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/fragments/qrAuthentication.html b/src/main/resources/templates_original/fragments/qrAuthentication.html
deleted file mode 100644
index 25bf8f0..0000000
--- a/src/main/resources/templates_original/fragments/qrAuthentication.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title>loginProviders Fragment</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div th:fragment="qrAuthentication" th:remove="tag">
-
-        <script type="text/javascript" th:src="@{#{webjars.socket.js}}"></script>
-        <script type="text/javascript" th:src="@{#{webjars.stomp.js}}"></script>
-
-        <div class="card bg-light">
-            <div class="card-body pb-4">
-                <div class="card-title">
-                    <div class="text-center">
-                        <h3 class="mt-md-0 mt-4">
-                            <i class="mdi mdi-qrcode-scan fas fa-qrcode"></i>
-                            <span>Login with QR Code</span>
-                        </h3>
-                        <section>
-                            <div id="qrerror" class="banner banner-danger alert alert-danger banner-dismissible" style="display:none;">
-                                <p th:utext="#{cas.authn.qr.fail}">Error</p>
-                            </div>
-                        </section>
-                        <p>Scan the QR code with your mobile device to begin the login flow. If your credentials
-                            are accepted, you will automatically proceed to the next step.</p>
-                    </div>
-                </div>
-                <div class="card-text">
-                    <div class="d-flex justify-content-center flex-column">
-                        <img id="qrcode" th:src="@{'data:image/jpeg;base64,' + ${qrCode}}"/>
-                        <p>Your mobile device must communicate with CAS using the following channel id.</p>
-
-                        <section class="cas-field form-group my-3 mdc-input-group d-flex">
-                            <div class="mdc-input-group-field mdc-input-group-field-append">
-                                <label for="token" class="mdc-text-field mdc-text-field--outlined control-label mdc-text-field--with-trailing-icon">
-                                    <span class="mdc-notched-outline">
-                                        <span class="mdc-notched-outline__leading"></span>
-                                        <span class="mdc-notched-outline__notch">
-                                            <span class="mdc-floating-label" />ID</span>
-                                    </span>
-                                    <span class="mdc-notched-outline__trailing"></span>
-                                    </span>
-                                    <input class="mdc-text-field__input form-control pwd" type="text" name="qrchannel" id="qrchannel"
-                                        th:value="${qrChannel}" size="50" readonly autocomplete="off" required />
-                                </label>
-                            </div>
-                            <button onclick="copyClipboard(document.getElementById('qrchannel'))"
-                                    class="mdc-button mdc-button--raised btn btn-primary mdc-input-group-append mdc-icon-button align-self-end"
-                                    type="button">
-                                <i class="mdi mdi-content-copy fas fa-copy"></i>
-                                <span class="visually-hidden">Copy</span>
-                            </button>
-                        </section>
-                    </div>
-                </div>
-            </div>
-        </div>
-        
-        <form method="post" id="qrform">
-            <input id="token" name="token" type="hidden" />
-            <input id="deviceId" name="deviceId" type="hidden" />
-            <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-            <input type="hidden" name="_eventId" value="validate"/>
-        </form>
-        
-        <script th:inline="javascript">
-            /*<![CDATA[*/
-            var endpoint = /*[[@{/qr-websocket}]]*/  ;
-            var topic = /*[[${qrChannel}]]*/  ;
-            var prefix = /*[[${qrPrefix}]]*/  ;
-
-            var stompClient = null;
-            $(function () {
-                var socket = new SockJS(endpoint);
-                stompClient = Stomp.over(socket);
-                stompClient.connect({}, function (frame) {
-                    stompClient.subscribe(prefix + '/' + topic + '/verify', function (result) {
-                        console.log(result.body);
-                        let body = JSON.parse(result.body);
-                        if (body.error) {
-                            $("#qrerror").show();
-                        } else if (body.success) {
-                            stompClient.disconnect();
-                            $("#qrerror").hide();
-                            $("#qrform #token").val(body.token);
-                            $("#qrform #deviceId").val(body.deviceId);
-                            $("#qrform").submit();
-                        }
-                    });
-                });
-            });
-
-            /*]]>*/
-        </script>
-
-        <form method="post" id="submitForm" th:action="@{/login}">
-            <input type="hidden" id="eventId" name="_eventId" value="submit"/>
-            <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-        </form>
-        
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/fragments/recaptcha.html b/src/main/resources/templates_original/fragments/recaptcha.html
deleted file mode 100644
index d499488..0000000
--- a/src/main/resources/templates_original/fragments/recaptcha.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title>Service UI Fragment</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body>
-    <main role="main" class="container mt-3 mb-3">
-        <div th:fragment="recaptchaToken">
-            <span th:if="${recaptchaSiteKey != null AND #strings.equalsIgnoreCase(recaptchaVersion, 'GOOGLE_RECAPTCHA_V2')}" th:remove="tag">
-                <script src="https://www.google.com/recaptcha/api.js"></script>
-                <script type="text/javascript"
-                        th:if="${recaptchaInvisible != null AND recaptchaInvisible}"
-                        th:inline="javascript">
-                    function onRecaptchaV2Submit(token) {
-                        document.getElementById('fm1').submit();
-                    }
-                </script>
-                <section id="recaptchaV2Section"
-                         class="form-group"
-                         th:unless="${recaptchaInvisible != null AND recaptchaInvisible}">
-                    <div id="g-recaptcha" class="g-recaptcha" th:attr="data-sitekey=${recaptchaSiteKey}"></div>
-                </section>
-            </span>
-            
-            <span th:if="${recaptchaSiteKey != null AND #strings.equalsIgnoreCase(recaptchaVersion, 'GOOGLE_RECAPTCHA_V3')}" id="recaptchaV3Section">
-                <script th:src="${'//www.google.com/recaptcha/api.js?render=' + recaptchaSiteKey}"></script>
-                <input type="hidden" id="g-recaptcha-token" name="g-recaptcha-token"/>
-
-                <script type="text/javascript" th:inline="javascript">
-                    grecaptcha.ready(function () {
-                        grecaptcha.execute(/*[[${recaptchaSiteKey}]]*/, { action: 'login' })
-                            .then(function (token) {
-                                $('#g-recaptcha-token').val(token);
-                            });
-                    });
-                </script>
-            </span>
-
-            <span th:if="${recaptchaSiteKey != null AND #strings.equalsIgnoreCase(recaptchaVersion, 'HCAPTCHA')}" th:remove="tag">
-                <script src="https://hcaptcha.com/1/api.js" async defer></script>
-                <section id="hcaptchaSection" class="form-group">
-                    <div class="h-captcha" th:attr="data-sitekey=${recaptchaSiteKey}"></div>
-                </section>
-            </span>
-        </div>
-    </main>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/fragments/scripts.html b/src/main/resources/templates_original/fragments/scripts.html
deleted file mode 100644
index 85a5965..0000000
--- a/src/main/resources/templates_original/fragments/scripts.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<script type="text/javascript" th:src="@{#{webjars.jquery.js}}"></script>
-<script type="text/javascript" th:src="@{#{webjars.dataTables.js}}"></script>
-
-<span th:remove="tag" th:if="${'true' == #strings.defaultString(#themes.code('cas.js.core.enabled'), 'true')}">
-    <span th:replace="fragments/includes :: javascript">
-        <a href="fragments/includes.html">Theme</a> fragment will go here
-    </span>
-</span>
-
-<span th:remove="tag" th:each="file : ${#strings.arraySplit(#themes.code('cas.standard.js.file'), ',')}">
-    <script type="text/javascript" th:src="@{${file}}"></script>
-</span>
-
-<script th:inline="javascript">
-    if (typeof resourceLoadedSuccessfully === "function") {
-        resourceLoadedSuccessfully();
-    }
-    $(() => {
-        typeof cssVars === "function" && cssVars({onlyLegacy: true});
-    })
-    var trackGeoLocation = /*[[${trackGeoLocation}]]*/ === "true";
-</script>
-
-<script th:replace="fragments/googleanalytics :: ga"></script>
diff --git a/src/main/resources/templates_original/fragments/serviceui.html b/src/main/resources/templates_original/fragments/serviceui.html
deleted file mode 100644
index e2d6130..0000000
--- a/src/main/resources/templates_original/fragments/serviceui.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title>Service UI Fragment</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div th:fragment="serviceUI" th:if="${registeredService}" id="serviceui" class="mb-4">
-        <div th:if="${serviceUIMetadata}" class="d-flex align-items-center p-2">
-            <img id="serviceUIMetadataLogo" th:if="${serviceUIMetadata.logoUrl}" th:title="${serviceUIMetadata.displayName}"
-                 th:alt="${serviceUIMetadata.displayName}" th:src="${serviceUIMetadata.logoUrl}"
-                 th:width="${serviceUIMetadata.logoWidth}" th:height="${serviceUIMetadata.logoHeight}"/>
-
-            <img th:unless="${serviceUIMetadata.logoUrl}" th:title="${serviceUIMetadata.displayName}"
-                 th:alt="${serviceUIMetadata.displayName}" th:src="@{images/webapp.png}"
-                 th:width="${serviceUIMetadata.logoWidth}" th:height="${serviceUIMetadata.logoHeight}"/>
-            <div class="ml-2">
-                <h2 id="serviceUIMetadataDisplayName" th:text="${serviceUIMetadata.displayName}">serviceUIMetadata.displayName</h2>
-                <p id="serviceUIMetadataDescription" th:text="${serviceUIMetadata.description}">serviceUIMetadata.description</p>
-
-                <p id="serviceUIMetadataInformationUrl"
-                   th:if="${serviceUIMetadata.informationURL}"
-                   th:utext="#{screen.mdui.infolink.text(${serviceUIMetadata.informationURL})}">
-                    screen.mdui.infolink.text</p>
-                <p id="serviceUIMetadataPrivacyUrl"
-                   th:if="${serviceUIMetadata.privacyStatementURL}"
-                   th:utext="#{screen.mdui.privacylink.text(${serviceUIMetadata.privacyStatementURL})}">
-                    serviceUIMetadata.privacyStatementURL</p>
-            </div>
-        </div>
-
-        <div th:unless="${serviceUIMetadata}" class="d-flex align-items-center p-2">
-            <img th:if="${registeredService.logo}" th:src="${registeredService.logo}"/>
-            <div id="servicedesc" class="ml-2">
-                <h5><i class="mdi mdi-web"></i>[[${registeredService.name}]]</h5>
-                <p th:text="${registeredService.description}">Registered Service Description</p>
-            </div>
-        </div>
-    </div>
-</main>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/fragments/submitbutton.html b/src/main/resources/templates_original/fragments/submitbutton.html
deleted file mode 100644
index 4a7cfe4..0000000
--- a/src/main/resources/templates_original/fragments/submitbutton.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title>Service UI Fragment</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <th:block th:fragment="submitButton (messageKey)">
-
-        <button
-                class="mdc-button mdc-button--raised btn btn-primary btn-primary"
-                th:if="${recaptchaSiteKey == null}"
-                name="submitBtn"
-                accesskey="l"
-                type="submit">
-            <span class="mdc-button__label" th:text="#{${messageKey}}">Login</span>
-        </button>
-
-        <span th:unless="${recaptchaSiteKey == null}">
-             <span th:if="${#strings.equalsIgnoreCase(recaptchaVersion, 'GOOGLE_RECAPTCHA_V2')}">
-                <button th:unless="${recaptchaInvisible != null AND recaptchaInvisible}"
-                        class="mdc-button mdc-button--raised btn btn-primary btn btn-primary"
-                        name="submitBtn"
-                        accesskey="l"
-                        type="submit"
-                        value="Login3">
-                    <span class="mdc-button__label" th:text="#{${messageKey}}">Login</span>
-                </button>
-                <button th:if="${recaptchaInvisible != null AND recaptchaInvisible}"
-                        class="mdc-button mdc-button--raised g-recaptcha btn btn-primary btn btn-primary"
-                        th:attr="data-sitekey=${recaptchaSiteKey}, data-badge=${recaptchaPosition}"
-                        data-callback="onRecaptchaV2Submit"
-                        name="submitBtn"
-                        accesskey="l">
-                    <span class="mdc-button__label" th:text="#{${messageKey}}" ></span>
-                </button>
-            </span>
-
-            <span th:if="${#strings.equalsIgnoreCase(recaptchaVersion, 'GOOGLE_RECAPTCHA_V3')}">
-                <button class="mdc-button mdc-button--raised btn btn-primary btn btn-primary"
-                        name="submitBtn"
-                        th:attr="data-sitekey=${recaptchaSiteKey}"
-                        accesskey="l"
-                        th:value="#{screen.welcome.button.login}"
-                        type="submit"
-                        value="Login3">
-                    <span class="mdc-button__label" th:text="#{${messageKey}}" />
-                </button>
-             </span>
-
-
-            <span th:if="${#strings.equalsIgnoreCase(recaptchaVersion, 'HCAPTCHA')}" th:remove="tag">
-                <button class="mdc-button mdc-button--raised btn btn-primary btn btn-primary"
-                        name="submitBtn"
-                        accesskey="l"
-                        type="submit"
-                        value="Login3">
-                    <span class="mdc-button__label" th:text="#{${messageKey}}">Login</span>
-                </button>
-            </span>
-            
-        </span>
-
-    </th:block>
-</main>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/fragments/unlockaccount.html b/src/main/resources/templates_original/fragments/unlockaccount.html
deleted file mode 100644
index 196ce80..0000000
--- a/src/main/resources/templates_original/fragments/unlockaccount.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<div th:fragment="unlock">
-    <style>
-        .captcha-area .captcha-img {
-            display: flex;
-            margin-right: 5px;
-            height: 65px;
-            align-items: center;
-            justify-content: space-between;
-            height: 100%;
-            width: 345px;
-            user-select: none;
-            background: #000;
-            border-radius: 5px;
-            position: relative;
-        }
-
-        .captcha-img img {
-            width: 100%;
-            height: 100%;
-            object-fit: cover;
-            border-radius: 5px;
-            opacity: 0.95;
-        }
-
-        .captcha-img .captcha {
-            position: absolute;
-            left: -10%;
-            top: 1%;
-            width: 100%;
-            color: black;
-            font-family: cursive !important;
-            font-style: italic !important;
-            font-size: 55px !important;
-            text-align: center;
-            font-weight: bold;
-            letter-spacing: 10px;
-            transform-origin: top left;
-            transform: skew(30deg, 10deg);
-            text-shadow: 0px 0px 2px #b1b1b1;
-        }
-    </style>
-
-    <div class="banner banner-danger my-2" th:if="${flowRequestContext.messageContext.hasErrorMessages()}">
-        <p th:each="message : ${flowRequestContext.messageContext.allMessages}"
-           th:utext="${message.text}">Message Text</p>
-    </div>
-    <p/>
-
-    <div class="d-flex justify-content-center flex-md-row flex-column mdc-card-content flex-grow-1">
-        <section>
-            <div class="captcha-area">
-                <div class="captcha-img">
-                    <img id="captchaImage" th:src="@{/images/captcha.png}">
-                    <span id="captcha" class="captcha" />
-                </div>
-            </div>
-        </section>
-        <section>
-            <div>
-                <form id="fm1" method="post" th:action="@{/login}">
-                    <label class="mdc-text-field mdc-text-field--outlined">
-                        <input class="mdc-text-field__input"
-                               id="captchaValue"
-                               name="captchaValue"
-                               size="50"
-                               type="text"
-                               autocomplete="false"
-                               autocapitalize="none"
-                               spellcheck="false" required/>
-                        <span class="mdc-notched-outline">
-                            <span class="mdc-notched-outline__leading"></span>
-                            <span class="mdc-notched-outline__notch">
-                              <span class="mdc-floating-label" th:utext="#{screen.account.unlock.label}"></span>
-                            </span>
-                            <span class="mdc-notched-outline__trailing"></span>
-                        </span>
-                    </label>
-                    <p/>
-                    <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-                    <input type="hidden" name="_eventId" value="submit"/>
-                    <div th:replace="fragments/submitbutton :: submitButton (messageKey='screen.pm.button.submit')"/>
-                </form>
-            </div>
-        </section>
-
-        <script th:inline="javascript">
-            $("body").on("contextmenu", e => false);
-            $('.captcha').text(/*[[${captchaValue}]]*/);
-        </script>
-    </div>
-</div>
diff --git a/src/main/resources/templates_original/fragments/webAuthnLogin.html b/src/main/resources/templates_original/fragments/webAuthnLogin.html
deleted file mode 100644
index c27f14c..0000000
--- a/src/main/resources/templates_original/fragments/webAuthnLogin.html
+++ /dev/null
@@ -1,152 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-    <meta name="_csrf" th:content="${_csrf.token}"/>
-    <meta name="_csrf_header" th:content="${_csrf.headerName}"/>
-    <title>Service UI Fragment</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div th:fragment="webAuthnLogin">
-
-        <script type="text/javascript" th:src="@{#{webjars.text-encoding.js}}"></script>
-        <script type="text/javascript" th:src="@{#{webjars.text-encoding-indexes.js}}"></script>
-        <script type="text/javascript" th:src="@{#{webjars.whatwg-fetch.js}}"></script>
-        <script type="text/javascript" th:src="@{#{webjars.base64.js}}"></script>
-        
-        <script type="text/javascript" th:inline="javascript">
-            /*<![CDATA[*/
-            var appId = /*[[${webauthnApplicationId}]]*/;
-            /*]]>*/
-        </script>
-
-        <script type="text/javascript" th:inline="javascript">
-            let authFailTitle = [[#{ screen.authentication.webauthn.authn.fail.title }]];
-            let authFailDesc = [[#{ screen.authentication.webauthn.authn.fail.desc }]];
-        </script>
-
-        <script th:src="@{/js/webauthn/webauthn.js}"></script>
-
-        <div style="display: none" id="diagnostics">
-            <p>
-                <button class="btn btn-primary" type="button" data-toggle="collapse"
-                        data-target="#serverResponse" aria-expanded="false" aria-controls="serverResponse">
-                    Server Response
-                </button>
-                <button class="btn btn-primary" type="button" data-toggle="collapse"
-                        data-target="#authenticatorResponse" aria-expanded="false" aria-controls="authenticatorResponse">
-                    Authenticator Response
-                </button>
-                <button class="btn btn-primary" type="button" data-toggle="collapse"
-                        data-target="#requestPanel" aria-expanded="false" aria-controls="requestPanel">
-                    Request
-                </button>
-            </p>
-            <div class="collapse" id="serverResponse">
-                <div class="card card-body">
-                    <h4>Server Response:</h4>
-                    <pre id="session"></pre>
-                    <pre id="server-response"></pre>
-                </div>
-            </div>
-            <div class="collapse" id="authenticatorResponse">
-                <div class="card card-body">
-                    <h4>Authenticator Response:</h4>
-                    <pre id="authenticator-response"></pre>
-                </div>
-            </div>
-            <div class="collapse" id="requestPanel">
-                <div class="card card-body">
-                    <h4>WebAuthN Request:</h4>
-                    <pre id="request"></pre>
-                </div>
-            </div>
-        </div>
-
-        <div class="d-flex justify-content-center flex-column">
-            <div class="d-flex justify-content-center flex-column align-items-center">
-                <h2 id="status" th:text="#{screen.authentication.webauthn.login.title}" />
-            </div>
-            <p th:text="#{screen.authentication.webauthn.login.desc}">Login</p>
-            
-            <div id="errorPanel" class="banner banner-danger alert alert-danger alert-dismissible mb-4"
-                 th:if="${flowRequestContext.messageContext.hasErrorMessages()}">
-                <p th:each="message : ${flowRequestContext.messageContext.allMessages}"
-                   th:utext="#{${message.text}}">
-                    Error Message Text
-                </p>
-            </div>
-
-            <div id="messages"></div>
-            <div id="device-info">
-                <div class="d-flex justify-content-center flex-column align-items-center">
-                    <br>
-                    <img id="device-icon"/>
-                    <br>
-                    <span id="device-name"></span>
-                </div>
-            </div>
-            <div class="d-flex justify-content-center flex-column align-items-center">
-                <button class="mdc-button mdc-button--raised btn btn-primary me-2"
-                        name="authnButton" id="authnButton" accesskey="a" type="button">
-                    <i class="mdi mdi-fingerprint fas fa-fingerprint"></i>
-                    <span id="authnButtonText" class="mdc-button__label"
-                          th:text="#{screen.welcome.button.login}">Login</span>
-                </button>
-            </div>
-        </div>
-        <div>
-            <div class="w-100 mdc-data-table table-responsive mx-auto my-4" id="divDeviceInfo" style="display: none">
-                <table id="deviceTable" class="table table-striped" style="white-space: unset">
-                    <thead>
-                    <tr class="mdc-data-table__header-row">
-                        <th class="w-50 mdc-data-table__header-cell" role="columnheader" scope="col">Attribute</th>
-                        <th class="w-50 mdc-data-table__header-cell" role="columnheader" scope="col">Value(s)</th>
-                    </tr>
-                    </thead>
-                    <tbody class="mdc-data-table__content">
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <form method="POST" id="webauthnLoginForm" class="fm-v clearfix" th:action="@{/login}">
-            <input type="hidden" name="_eventId" value="validate"/>
-            <input type="hidden" id="token" name="token"/>
-            <input type="hidden" name="geolocation"/>
-            <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-        </form>
-
-        <input type="hidden" id="loginCsrfToken" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
-
-        <script type="text/javascript">
-            const csrfToken = $('#loginCsrfToken').val();
-
-            let div = document.querySelector('#divDeviceInfo');
-            new mdc.dataTable.MDCDataTable(div);
-
-            var btn = document.getElementById('authnButton');
-            btn.addEventListener('click', function (event) {
-                $("#errorPanel").hide();
-                var username = '[[${principal?.id}]]';
-                if (username === '') {
-                   username = $("#fm1 #username").val();
-                }
-                authenticate(username);
-            }, false);
-
-        </script>
-
-    </div>
-</main>
-</body>
-
-</html>
-
-
diff --git a/src/main/resources/templates_original/gauth/casGoogleAuthenticatorConfirmRegistrationView.html b/src/main/resources/templates_original/gauth/casGoogleAuthenticatorConfirmRegistrationView.html
deleted file mode 100644
index 1eb71e4..0000000
--- a/src/main/resources/templates_original/gauth/casGoogleAuthenticatorConfirmRegistrationView.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title th:text="#{cas.mfa.googleauth.pagetitle}">Google Authentication Registration Review View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body id="cas">
-    <main role="main" class="container mt-3 mb-3">
-        <div layout:fragment="content" id="login" class="mdc-card card p-4 m-auto w-lg-66">
-            <p>The following devices are registered for <code th:text="${principal.id}"></code>:</p>
-            
-            <div class="card-text">
-                <div th:each="device: ${registeredDevices}" class="border-bottom py-4">
-                    <form th:name="${'form-' + device.id}" th:id="${'form-' + device.id}" method="post">
-                        <h4 class="d-flex align-items-center">
-                            <ul style="list-style: none">
-                                <code>
-                                <li><i class="mdi mdi-laptop fas fa-laptop me-2"></i>
-                                    <span th:id="${'name-' + device.name}" th:utext="${device.name}">Device Name</span>
-                                </li>
-                                <li><i class="mdi mdi-account-clock fas fa-user-clock me-2"></i>
-                                    <span th:utext="${device.registrationDate}">Device Date</span>
-                                </li>
-                                <li><i class="mdi mdi-account-details fas fa-user-tag me-2"></i>
-                                    <span th:id="${'id-' + device.id}" th:utext="${device.id}">Device Id</span>
-                                </li>
-                                </code>
-                            </ul>
-                        </h4>
-                        <button th:id="${'useButton-' + device.id}"
-                                class="mdc-button mdc-button--raised btn btn-primary" th:value="#{screen.authentication.gauth.selectdevice}">
-                            <span class="mdc-button__label" th:text="#{screen.authentication.gauth.selectdevice}">Use</span>
-                        </button>
-                        <button th:id="${'delButton-' + device.id}"
-                                onclick="$(this).parent('form').find('input[name=_eventId]').val('delete'); $(this).parent('form').submit();"
-                                class="mdc-button mdc-button--raised" th:value="#{screen.authentication.gauth.deletedevice}">
-                            <span class="mdc-button__label" th:text="#{screen.authentication.gauth.deletedevice}">Use</span>
-                        </button>
-                        <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-                        <input type="hidden" name="accountId" th:value="${device.id}" />
-                        <input type="hidden" name="_eventId" value="select" />
-                    </form>
-                </div>
-            </div>
-
-            <form method="post" id="fm2" th:if="${gauthMultipleDeviceRegistrationEnabled}">
-                <p>
-                <p th:utext="#{screen.authentication.gauth.reganotherdevice}"></p>
-                <input type="hidden" name="_eventId_register" value="Register"/>
-                <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-                <button id="register" class="mdc-button mdc-button--raised btn btn-primary me-2" name="register" accesskey="r" value="Register">
-                    <span class="mdc-button__label" th:text="#{screen.welcome.button.register}">Register</span>
-                </button>
-            </form>
-            </p>
-            
-        </div>
-    </main>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/gauth/casGoogleAuthenticatorLoginView.html b/src/main/resources/templates_original/gauth/casGoogleAuthenticatorLoginView.html
deleted file mode 100644
index 69d87cf..0000000
--- a/src/main/resources/templates_original/gauth/casGoogleAuthenticatorLoginView.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{cas.mfa.googleauth.pagetitle}">Google Authentication View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" id="login" class="mdc-card card mdc-card-content w-lg-50 p-4 m-auto">
-
-        <p th:utext="#{screen.authentication.gauth.selecteddevice(${registeredDevice.name})}"></p>
-
-        <form method="post" id="fm1" th:object="${credential}" th:action="@{/login}">
-            <div id="msg" class="banner banner-danger alert alert-danger my-2" th:if="${#fields.hasErrors('*')}">
-                <span th:each="err : ${#fields.errors('*')}" th:utext="${err + ' '}"/>
-            </div>
-            <input type="hidden" name="_eventId_submit" value="Login"/>
-            <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-            <input type="hidden" name="geolocation"/>
-            <section class="cas-field form-group my-3 mdc-input-group">
-                <div class="d-flex">
-                    <div class="mdc-input-group-field mdc-input-group-field-append">
-                        <div class="d-flex">
-                            <input type="hidden" id="accountId" name="accountId" size="25" autocomplete="off" th:field="*{accountId}" />
-                    
-                            <label for="token"
-                                class="mdc-text-field caps-check mdc-text-field--outlined control-label mdc-text-field--with-trailing-icon">
-                                <span class="mdc-notched-outline">
-                                    <span class="mdc-notched-outline__leading"></span>
-                                    <span class="mdc-notched-outline__notch">
-                                        <span class="mdc-floating-label" th:utext="#{cas.mfa.googleauth.label.token}">Token</span>
-                                    </span>
-                                    <span class="mdc-notched-outline__trailing"></span>
-                                </span>
-                                <input class="mdc-text-field__input form-control pwd" type="password" name="token" id="token"
-                                    th:field="*{token}" size="25" autocomplete="off" required />
-                            </label>
-                    
-                    
-                            <script type="text/javascript" th:inline="javascript">
-                                /*<![CDATA[*/
-                                let accountId = /*[[${registeredDevice.id}]]*/;
-                                document.getElementById("accountId").value = accountId;
-                                                /*]]>*/
-                            </script>
-                        </div>
-                    </div>
-                    <button
-                        class="reveal-password align-self-end mdc-button mdc-button--raised btn btn-primary mdc-input-group-append mdc-icon-button"
-                        tabindex="-1"
-                        type="button">
-                        <i class="mdi mdi-eye fas fa-eye reveal-password-icon"></i>
-                        <span class="visually-hidden">Toggle Token</span>
-                    </button>
-                </div>
-                <div class="mdc-text-field-helper-line caps-warn">
-                    <p
-                        class="mdc-text-field-helper-text form-text text-small mdc-text-field-helper-text--persistent mdc-text-field-helper-text--validation-msg text-danger">
-                        <span th:utext="#{screen.capslock.on}" />
-                    </p>
-                </div>
-            </section>
-            <button id="login" class="mdc-button mdc-button--raised btn btn-primary" accesskey="l">
-                <span class="mdc-button__label" th:text="#{screen.welcome.button.login}">Login</span>
-            </button>
-            <a class="mdc-button mdc-button--raised btn btn-primary" id="cancel" name="cancel"
-               onclick="location.href = location.href;">
-                <span class="mdc-button__label" th:utext="#{screen.authentication.gauth.cancel}">Cancel</span>
-            </a>
-        </form>
-        <span th:if="${registeredDevices}">
-            <p>
-            <hr width="75%">
-            <p th:utext="#{screen.authentication.gauth.selanotherdevice(${registeredDevice.name})}"></p>
-            <form method="post" id="fm3">
-                <input type="hidden" name="_eventId_select" value="select"/>
-                <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-                <button id="selectDeviceButton" class="mdc-button mdc-button--raised btn btn-primary me-2" accesskey="s">
-                    <span class="mdc-button__label" th:text="#{screen.authentication.gauth.selectdevice}">Select Device</span>
-                </button>
-            </form>
-        </span>
-        
-        <form method="post" id="fm2" th:if="${gauthMultipleDeviceRegistrationEnabled}">
-            <p>
-            <hr width="75%">
-            <p th:utext="#{screen.authentication.gauth.reganotherdevice}"></p>
-            <input type="hidden" name="_eventId_register" value="register"/>
-            <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-            <button class="mdc-button mdc-button--raised btn btn-primary me-2" id="register" type="submit" name="register" accesskey="r" value="Register">
-                <span class="mdc-button__label" th:text="#{screen.welcome.button.register}">Register</span>
-            </button>
-        </form>
-        </p>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/gauth/casGoogleAuthenticatorRegistrationView.html b/src/main/resources/templates_original/gauth/casGoogleAuthenticatorRegistrationView.html
deleted file mode 100644
index e96a2fe..0000000
--- a/src/main/resources/templates_original/gauth/casGoogleAuthenticatorRegistrationView.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{cas.mfa.googleauth.pagetitle}">Google Authentication Registration Review View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body id="cas">
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" id="login" class="mdc-card card p-4 m-auto w-lg-66">
-        <h4 th:text="#{screen.authentication.gauth.register}">Your account is not registered.</h4>
-
-        <!-- Confirmation Dialog -->
-        <div class="mdc-dialog" id="confirm-reg-dialog" role="alertdialog"
-             aria-modal="true" aria-labelledby="notif-dialog-title" aria-describedby="notif-dialog-content">
-            <form method="post" id="fm1" class="fm-v clearfix" th:action="@{/login}">
-                <div class="mdc-dialog__container">
-                    <div class="mdc-dialog__surface">
-                        <h1 class="mdc-dialog__title mt-lg-2" id="notif-dialog-title"
-                            th:utext="#{screen.authentication.gauth.confirm.title}">
-                            Confirm Account Registration
-                        </h1>
-                        <div class="mdc-dialog__content" id="notif-dialog-content">
-                            <div class="mdc-typography--body1">
-                                <div class="banner banner-danger alert alert-danger banner-dismissible"
-                                     style="display: none" id="errorPanel">
-                                    <p th:utext="#{screen.authentication.gauth.invalidtoken}">
-                                </div>
-
-                                <p th:utext="#{screen.authentication.gauth.confirm.desc}">Description</p>
-
-                                <input type="hidden" name="_eventId_submit" value="Confirm"/>
-                                <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-                                <input type="hidden" name="geolocation"/>
-
-                                <section class="cas-field form-group my-3 mdc-input-group">
-                                    <div class="mdc-input-group-field mdc-input-group-field-append">
-                                        <div class="d-flex caps-check">
-                                            <label for="token"
-                                                   class="mdc-text-field mdc-text-field--outlined control-label mdc-text-field--with-trailing-icon">
-                                                <span class="mdc-notched-outline">
-                                                    <span class="mdc-notched-outline__leading"></span>
-                                                    <span class="mdc-notched-outline__notch">
-                                                        <span class="mdc-floating-label"
-                                                              th:utext="#{cas.mfa.googleauth.label.token}">Token</span>
-
-                                                    </span>
-                                                    <span class="mdc-notched-outline__trailing"></span>
-                                                </span>
-                                                <input class="mdc-text-field__input form-control pwd"
-                                                       type="password"
-                                                       name="token"
-                                                       id="token"
-                                                       size="25"
-                                                       required
-                                                       autocomplete="off"/>
-                                            </label>
-                                            <button class="reveal-password align-self-end mdc-button mdc-button--raised btn btn-primary mdc-input-group-append mdc-icon-button"
-                                                    tabindex="-1"
-                                                    type="button">
-                                                <i class="mdi mdi-eye fas fa-eye reveal-password-icon"></i>
-                                                <span class="visually-hidden">Toggle Token</span>
-                                            </button>
-                                        </div>
-                                        <br>
-                                        <div class="d-flex">
-                                            <label for="accountName"
-                                                   class="mdc-text-field mdc-text-field--outlined control-label">
-                                                <span class="mdc-notched-outline">
-                                                    <span class="mdc-notched-outline__leading"></span>
-                                                    <span class="mdc-notched-outline__notch">
-                                                        <span class="mdc-floating-label" th:utext="#{screen.authentication.gauth.name}">Account Name</span>
-                                                    </span>
-                                                    <span class="mdc-notched-outline__trailing"></span>
-                                                </span>
-                                                <input class="mdc-text-field__input form-control"
-                                                       type="text"
-                                                       name="accountName"
-                                                       id="accountName"
-                                                       size="50"
-                                                       autocomplete="off"/>
-                                            </label>
-                                            <script>document.getElementById("accountName").value = randomWord();</script>
-                                        </div>
-                                    </div>
-                                </section>
-                            </div>
-                        </div>
-                        <footer class="mdc-dialog__actions">
-                            <button class="mdc-button mdc-button--raised btn btn-primary me-2" name="registerButton" id="registerButton">
-                                <span class="mdc-button__label" th:text="#{screen.welcome.button.register}">Register</span>
-                            </button>
-                            <button type="button" class="mdc-button mdc-button--outline btn btn-outline-secondary"
-                                    data-mdc-dialog-action="accept" data-mdc-dialog-button-default>
-                                <span class="mdc-button__label">Cancel</span>
-                            </button>
-                        </footer>
-                    </div>
-                </div>
-                <div class="mdc-dialog__scrim"></div>
-            </form>
-
-            <script type="text/javascript">
-                var btn = document.getElementById('registerButton');
-                btn.addEventListener('click', function (event) {
-                    var endpoint = $('#fm1').attr('action');
-                    event.preventDefault();
-                    $('#errorPanel').hide();
-
-                    var formData = $("#fm1").serializeArray();
-                    formData.push({
-                        name: "validate",
-                        value: true
-                    });
-                    $.post(endpoint, formData)
-                        .done(function (data, status, jqxhr) {
-                            $('#errorPanel').hide();
-                            $("#fm1").submit();
-                        })
-                        .fail(function (data, status, jqxhr) {
-                            $('#errorPanel').show("fast", "swing");
-                        });
-                }, false);
-            </script>
-        </div>
-        <!-- Confirmation Dialog -->
-
-
-        <!-- Account Information -->
-        <table>
-            <tr>
-                <td>
-                    <img th:src="@{'data:image/jpeg;base64,' + ${QRcode}}"/>
-                </td>
-
-                <td>
-                    <div class="my-2" id="seckeypanel">
-                        <p th:utext="#{screen.authentication.gauth.key(${key.getSecretKey()})}">Secret key to register is...</p>
-                    </div>
-                    <hr>
-                    <p th:text="#{screen.authentication.gauth.scratchcodes}">Scratch codes:</p>
-                    <div class="d-flex align-items-start mb-4">
-                        <div class="mdc-chip-set" role="grid" id="scratchcodes">
-                            <div th:each="code : ${key.getScratchCodes()}" class="mdc-chip" role="row">
-                                <div class="mdc-chip__ripple"></div>
-                                <span role="gridcell">
-                                  <span class="mdc-chip__text" th:text="${code}">Chip One</span>
-                                </span>
-                            </div>
-                        </div>
-                    </div>
-                </td>
-            </tr>
-        </table>
-        <div class="d-flex flex-column align-items-center">
-            <div class="d-flex justify-content-center">
-                <button class="mdc-button mdc-button--raised btn btn-primary me-2" name="confirm" id="confirm" accesskey="f"
-                        value="Confirm">
-                    <span class="mdc-button__label" th:text="#{screen.welcome.button.confirm}">Confirm</span>
-                </button>
-                <button class="mdc-button mdc-button--raised btn btn-primary me-2" name="print" accesskey="p" type="button"
-                        onclick="window.print();">
-                    <span class="mdc-button__label" th:text="#{screen.welcome.button.print}">Print</span>
-                </button>
-                <button class="mdc-button mdc-button--outline btn btn-outline-secondary" name="back" accesskey="c" type="button"
-                        value="Cancel"
-                        onclick="location.href = location.href;"
-                        th:value="#{screen.pm.button.cancel}">
-                    <span class="mdc-button__label" th:text="#{screen.pm.button.cancel}">Cancel</span>
-                </button>
-            </div>
-        </div>
-
-        <script type="text/javascript">
-            (material => {
-                document.addEventListener('DOMContentLoaded', () => {
-                    var element = document.getElementById('confirm-reg-dialog');
-                    var dialog = material.dialog.MDCDialog.attachTo(element);
-                    var btn = document.getElementById('confirm');
-                    btn.addEventListener('click', event => {
-                        dialog.open();
-                        event.preventDefault();
-                    }, false);
-                });
-            })(mdc);
-        </script>
-    </div>
-</main>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/gua/casGuaDisplayUserGraphicsView.html b/src/main/resources/templates_original/gua/casGuaDisplayUserGraphicsView.html
deleted file mode 100644
index 6531783..0000000
--- a/src/main/resources/templates_original/gua/casGuaDisplayUserGraphicsView.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title th:text="#{cas.login.pagetitle}">Gua Display User Graphics View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-    <main role="main" class="container mt-3 mb-3">
-        <div layout:fragment="content" id="login" class="d-flex justify-content-center">
-            <div class="mdc-card card mdc-card-content w-lg-50 p-4">
-                <h2 class="text-center" th:text="${guaUsername}">guaUsername</h2>
-                <div id="guaInfo" class="banner banner-danger alert alert-danger d-flex m-4 p-4" role="alert">
-                    <i class="mdi mdi-alert-octagon fas fa-exclamation-circle"></i>
-                    <strong th:utext="#{screen.gua.confirm.message}">
-                        If you do not recognize this image as yours, do NOT continue.</strong>
-                </div>
-
-                <div class="d-flex align-items-center flex-column">
-                    <div class="my-3">
-                        <img id="guaImage" style="width:130px;height:130px;border-radius:20%;
-                                box-shadow: 0 0 2px 1px rgba(0, 140, 186, 0.5);
-                                border: 1px solid #ddd;border-radius: 4px;"
-                            th:src="@{'data:image/jpeg;base64,' + ${guaUserImage}}" />
-                    </div>
-                    <form method="post" id="fm1" class="fm-v clearfix" th:action="@{/login}">
-                        <input type="hidden" name="username" th:value="${guaUsername}" />
-                        <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-                        <input type="hidden" name="_eventId_submit" value="Continue" />
-                        <button class="mdc-button mdc-button--raised btn btn-primary" accesskey="l">
-                            <span class="mdc-button__label" th:text="#{screen.button.continue}">Login</span>
-                        </button>
-                    </form>
-                </div>
-            </div>
-
-        </div>
-    </main>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/gua/casGuaGetUserIdView.html b/src/main/resources/templates_original/gua/casGuaGetUserIdView.html
deleted file mode 100644
index 3c56d13..0000000
--- a/src/main/resources/templates_original/gua/casGuaGetUserIdView.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title th:text="#{cas.login.pagetitle}">Gua Get User Id View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-    <main role="main" class="container mt-3 mb-3">
-        <div layout:fragment="content" id="login" class="d-flex justify-content-center">
-            <div class="mdc-card card mdc-card-content w-lg-50 p-4">
-                <form method="post" id="fm1" th:action="@{/login}">
-                    <input type="hidden" name="_eventId_submit" value="LOGIN" />
-                    <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-                    <div class="cas-field form-group my-3">
-                        <div class="w-100">
-
-                            <label for="username" class="mdc-text-field mdc-text-field--outlined control-label">
-                                <span class="mdc-notched-outline">
-                                    <span class="mdc-notched-outline__leading"></span>
-                                    <span class="mdc-notched-outline__notch">
-                                        <span class="mdc-floating-label" th:utext="#{screen.welcome.label.netid}">Username</span>
-                                    </span>
-                                    <span class="mdc-notched-outline__trailing"></span>
-                                </span>
-                                <input class="mdc-text-field__input form-control"
-                                       name="username"
-                                       id="username"
-                                       size="25"
-                                       th:accesskey="#{screen.welcome.label.netid.accesskey}"
-                                       autocapitalize="none"
-                                       spellcheck="false"
-                                       autocomplete="username" required />
-                            </label>
-
-                        </div>
-                    </div>
-                    <button class="mdc-button mdc-button--raised btn btn-primary" accesskey="l" type="submit">
-                        <span class="mdc-button__label" th:text="#{screen.welcome.button.login}">Login</span>
-                    </button>
-
-                </form>
-            </div>
-        </div>
-    </main>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/interrupt/casInterruptView.html b/src/main/resources/templates_original/interrupt/casInterruptView.html
deleted file mode 100644
index 1ca30dc..0000000
--- a/src/main/resources/templates_original/interrupt/casInterruptView.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{cas.login.pagetitle}">CAS Interrupt View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-
-    <script th:inline="javascript" th:if="${interrupt.autoRedirect}">
-        /*<![CDATA[*/
-
-        var autoRedirect = /*[[${interrupt.autoRedirect}]]*/;
-        var emptyLinks = /*[[${#maps.isEmpty(interrupt.links)}]]*/;
-
-        if (autoRedirect && !emptyLinks) {
-
-            var link = /*[[${interrupt.links.values().iterator().next()}]]*/;
-            var redirectTimeout = /*[[${interrupt.autoRedirectAfterSeconds}]]*/;
-
-            setTimeout(function () {
-                window.location = link;
-            }, redirectTimeout <= 0 ? 0 : redirectTimeout * 1000);
-
-        }
-        /*]]>*/
-    </script>
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div id="content" layout:fragment="content" class="mdc-card card p-4 m-auto w-lg-66">
-        <h1 th:text="#{screen.interrupt.title}">Authentication Interrupt</h1>
-        <p th:utext="#{screen.interrupt.message(${principal.id})}">The authentication flow has been interrupted. CAS has
-            not yet established a single sign-on session for <strong>{0}</strong>.</p>
-
-        <div th:if="${interrupt.message}">
-            <div class="alert alert-info">
-                <p id="interruptMessage" th:utext="${interrupt.message}">interrupt.message</p>
-                <div id="interruptLinks" th:if="${interrupt.links}">
-                    <form method="post" id="formlinks">
-                        <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-                        <input type="hidden" name="_eventId" value="redirect"/>
-                        <input type="hidden" id="linkToRedirect" name="link"/>
-                    </form>
-
-                    <span th:with="linkid=${#strings.toLowerCase(#strings.replace(link.key, ' ', ''))}"
-                          th:each="link : ${interrupt.links}">
-                        <a class="mdc-button mdc-button--outline btn btn-primary me-2"
-                           th:text="${link.key}"
-                           th:id="${linkid}">
-                            <span class="mdc-button__label">link.key</span>
-                        </a>
-                        <script th:inline="javascript">
-                            /*<![CDATA[*/
-                            $(document).on("click", /*[[${'#' + linkid}]]*/, () => {
-                                let link = /*[[${link.value}]]*/;
-                                $("#linkToRedirect").val(link);
-                                $("#formlinks").submit();
-                            });
-                            /*]]>*/
-                        </script>
-                     </span>
-
-                </div>
-            </div>
-            <div class="mdc-data-table table-responsive mt-2 mb-4">
-                <table id="attributesTable"
-                       th:if="${interrupt.data} and ${#maps.size(interrupt.data) > 0}"
-                       class="table table-striped w-100"
-                       aria-label="Attributes">
-                    <thead>
-                    <tr class="mdc-data-table__header-row">
-                        <th class="mdc-data-table__header-cell">Field</th>
-                        <th class="mdc-data-table__header-cell">Value</th>
-                    </tr>
-                    </thead>
-                    <tbody class="mdc-data-table__content">
-                    <tr th:each="attribute : ${interrupt.data}" class="mdc-data-table__row">
-                        <td class="mdc-data-table__cell">
-                            <code th:id="${attribute.key}"><span th:utext="${attribute.key}"/></code>
-                        </td>
-                        <td class="mdc-data-table__cell">
-                            <code th:id="${attribute.key + '-value'}"><span th:utext="${attribute.value}"/></code>
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
-            </div>
-
-        </div>
-        <form method="post" id="fm1" th:unless="${interrupt.block}">
-            <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-            <input type="hidden" name="_eventId" value="proceed"/>
-            <div class="form-actions d-flex align-items-center">
-                <button class="mdc-button mdc-button--raised btn btn-primary me-2"
-                        name="proceed"
-                        id="proceed"
-                        type="submit"
-                        accesskey="l">
-                    <span class="mdc-button__label" th:text="#{screen.interrupt.btn.proceed}">Proceed</span>
-                </button>
-
-                <span th:if="${interruptTriggerMode == 'AFTER_AUTHENTICATION'}">
-                    <a class="mdc-button mdc-button--raised me-2" id="login" name="login" th:href="${service?.id} ?: @{/login}">
-                        <span class="mdc-button__label" th:text="#{screen.error.page.loginagain}">Login Again</span>
-                    </a>
-                </span>
-            </div>
-        </form>
-
-        <div th:if="${interrupt.block}">
-            <a class="mdc-button mdc-button--raised me-2 btn btn-outline-secondary" id="cancel" name="cancel" th:href="@{/login}">
-                <span th:if="${interruptTriggerMode == 'AFTER_AUTHENTICATION'}" class="mdc-button__label"
-                      th:text="#{screen.interrupt.btn.cancel}">Cancel</span>
-
-                <span th:if="${interruptTriggerMode == 'AFTER_SSO'}" class="mdc-button__label"
-                      th:text="#{screen.interrupt.btn.proceed}">Proceed</span>
-            </a>
-        </div>
-    </div>
-</main>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/inwebo/casInweboCheckResultView.html b/src/main/resources/templates_original/inwebo/casInweboCheckResultView.html
deleted file mode 100644
index 169505a..0000000
--- a/src/main/resources/templates_original/inwebo/casInweboCheckResultView.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{cas.inwebo.checkresult.title}">Checking authentication...</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" class="banner banner-message mdc-card card p-4 m-auto w-lg-66">
-        <h2 th:utext="#{cas.inwebo.checkresult.heading}">Waiting for the notification to be approved...</h2>
-        <p th:utext="#{cas.inwebo.checkresult.message}">Please validate it on your phone/desktop.</p>
-
-        <form method="POST" id="pendingCheckResultForm">
-            <input type="hidden" name="_eventId" value="success" />
-            <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-        </form>
-        <script type="text/javascript">
-            setTimeout(() => $('#pendingCheckResultForm').submit(), 2500);
-        </script>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/inwebo/casInweboErrorView.html b/src/main/resources/templates_original/inwebo/casInweboErrorView.html
deleted file mode 100644
index 209ccf2..0000000
--- a/src/main/resources/templates_original/inwebo/casInweboErrorView.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{cas.inwebo.error.title}">Inwebo error</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" class="banner banner-danger alert alert-danger mdc-card card p-4 m-auto w-lg-66">
-        <h2 th:utext="#{cas.inwebo.error.heading}">An Inwebo error has occured.</h2>
-        <div id="errorPanel" class="banner banner-danger alert-dismissible mb-4"
-             th:if="${flowRequestContext.messageContext.hasErrorMessages()}">
-            <p th:each="message : ${flowRequestContext.messageContext.allMessages}"
-               th:utext="#{${message.text}}">
-                Error Message Text
-            </p>
-        </div>
-        <div class="form-wrapper">
-            <form id="retryForm" method="POST">
-                <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-                <input type="hidden" name="_eventId" value="retry"/>
-                <button class="mdc-button mdc-button--raised btn btn-primary" name="retry"
-                        type="submit" value="retry"
-                        th:value="#{cas.inwebo.retry.button}">
-                    <span class="mdc-button__label" th:text="#{cas.inwebo.retry.button}">Retry the Inwebo multi-factor authentication</span>
-                </button>
-            </form>
-        </div>
-        <div th:if="${mustEnroll}">
-            <p>
-                <script src="https://ult-inwebo.com/neon/3.6.0/simple-neon-lib.js " type="text/javascript"></script>
-            <form id="inweboErrorForm" method="POST">
-                <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-                <input type="hidden" name="_eventId" value="error"/>
-            </form>
-            <form id="startBrowserForm" method="POST">
-                <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-                <input type="hidden" name="_eventId" th:value="${browserAuthenticator}"/>
-            </form>
-            <div id="enrollError" class="banner banner-danger alert alert-danger banner-dismissible" style="display:none;">
-                <p th:utext="#{cas.inwebo.enroll.failure}">The enrollment failed</p>
-            </div>
-            <div id="enrollBadPinConfirmation" class="banner banner-danger alert alert-danger banner-dismissible" style="display:none;">
-                <p th:utext="#{cas.inwebo.enroll.badpinconfirmation}">Bad code PIN confirmation</p>
-            </div>
-            <script th:inline="javascript">
-                /*<![CDATA[*/
-                let siteAlias = /*[[${siteAlias}]]*/ '';
-                let siteDescription = /*[[${siteDescription}]]*/ '';
-
-                window.onload = () => {
-                    neon = new Neon.Neon(siteAlias, siteDescription);
-                    neon.initOnline()
-                        .then(logins => {
-                        })
-                        .catch(e => {
-                            $('#inweboErrorForm').submit();
-                        });
-                };
-
-                function doEnroll() {
-                    let code = document.getElementById('code').value;
-                    let pin = document.getElementById('pin').value;
-                    let pin2 = document.getElementById('pin2').value;
-                    if (pin !== pin2) {
-                        $('#enrollBadPinConfirmation').css('display', 'block');
-                        $('#enrollError').css('display', 'none');
-                        return false;
-                    }
-                    if (code !== '' && pin !== '') {
-                        neon.activateWithPin(code, pin)
-                            .then(login => {
-                                $('#startBrowserForm').submit();
-                            }).catch(e => {
-                            $('#enrollError').css('display', 'block');
-                            $('#enrollBadPinConfirmation').css('display', 'none');
-                        });
-                    }
-                    return false;
-                }
-
-                /*]]>*/
-            </script>
-            <div class="form-wrapper">
-                <form>
-                    <section class="cas-field form-group my-3">
-                        <label class="mdc-text-field mdc-text-field--outlined control-label">
-                            <input class="mdc-text-field__input form-control"
-                                   id="code"
-                                   name="code"
-                                   size="25"
-                                   type="text"
-                                   th:accesskey="#{screen.welcome.label.netid.accesskey}"
-                                   autocomplete="off" required
-                                   autocapitalize="none"
-                                   spellcheck="false" />
-                            <span class="mdc-notched-outline">
-                                    <span class="mdc-notched-outline__leading"></span>
-                                    <span class="mdc-notched-outline__notch">
-                                        <span class="mdc-floating-label"
-                                              th:text="#{cas.inwebo.enroll.code}">Activation Code</span>
-                                    </span>
-                                    <span class="mdc-notched-outline__trailing"></span>
-                                </span>
-                        </label>
-                    </section>
-                    <section class="cas-field form-group my-3">
-                        <label class="mdc-text-field mdc-text-field--outlined control-label">
-                            <input class="mdc-text-field__input form-control"
-                                   id="pin"
-                                   name="pin"
-                                   size="6"
-                                   maxlength="6"
-                                   type="text"
-                                   autocomplete="off" required
-                                   autocapitalize="none"
-                                   spellcheck="false" />
-                            <span class="mdc-notched-outline">
-                                    <span class="mdc-notched-outline__leading"></span>
-                                    <span class="mdc-notched-outline__notch">
-                                        <span class="mdc-floating-label"
-                                              th:text="#{cas.inwebo.pin}">PIN code</span>
-                                    </span>
-                                    <span class="mdc-notched-outline__trailing"></span>
-                                </span>
-                        </label>
-                    </section>
-                    <section class="cas-field form-group my-3">
-                        <label class="mdc-text-field mdc-text-field--outlined control-label">
-                            <input class="mdc-text-field__input form-control"
-                                   id="pin2"
-                                   name="pin2"
-                                   size="6"
-                                   maxlength="6"
-                                   type="text"
-                                   autocomplete="off" required
-                                   autocapitalize="none"
-                                   spellcheck="false" />
-                            <span class="mdc-notched-outline">
-                                    <span class="mdc-notched-outline__leading"></span>
-                                    <span class="mdc-notched-outline__notch">
-                                        <span class="mdc-floating-label"
-                                              th:text="#{cas.inwebo.pin2}">PIN code confirmation</span>
-                                    </span>
-                                    <span class="mdc-notched-outline__trailing"></span>
-                                </span>
-                        </label>
-                    </section>
-                    <button class="mdc-button mdc-button--raised btn btn-primary"
-                            name="enroll"
-                            id="enrollButton"
-                            type="button"
-                            onclick="doEnroll()"
-                            value="Enroll"
-                            th:value="#{cas.inwebo.enroll.button}">
-                        <span class="mdc-button__label" th:text="#{cas.inwebo.enroll.button}">Enroll for browser authentication</span>
-                    </button>
-                </form>
-            </div>
-        </div>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/inwebo/casInweboMAAuthnView.html b/src/main/resources/templates_original/inwebo/casInweboMAAuthnView.html
deleted file mode 100644
index 617dd57..0000000
--- a/src/main/resources/templates_original/inwebo/casInweboMAAuthnView.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{cas.inwebo.browserauthent.title}">Browser authentication</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" class="banner banner-message mdc-card card p-4 m-auto w-lg-66">
-        <h2 th:utext="#{cas.inwebo.browser.heading}">Fill in your PIN code:</h2>
-        <script src="https://ult-inwebo.com/neon/3.6.0/simple-neon-lib.js " type="text/javascript"></script>
-        <form id="inweboErrorForm" method="POST">
-            <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-            <input type="hidden" name="_eventId" value="error" />
-        </form>
-        <form id="enrollForm" method="POST">
-            <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-            <input type="hidden" name="_eventId" value="enroll" />
-        </form>
-        <div id="otpError" class="banner banner-danger alert alert-danger banner-dismissible" style="display:none;">
-            <p th:utext="#{cas.inwebo.browser.failure}">OTP generation error</p>
-        </div>
-        <script th:inline="javascript">
-            /*<![CDATA[*/
-            let casLogin = /*[[${login}]]*/ '';
-            let siteAlias = /*[[${siteAlias}]]*/ '';
-            let siteDescription = /*[[${siteDescription}]]*/ '';
-
-            window.onload = () => {
-                neon = new Neon.Neon(siteAlias, siteDescription);
-                neon.initOnline()
-                    .then(logins => {
-                        if (logins.length === 0 || !logins.includes(casLogin)) {
-                            $('#enrollForm').submit();
-                        }
-                        $('#otpForm').css('display', 'block');
-                    })
-                    .catch(e => {
-                        $('#inweboErrorForm').submit();
-                    });
-            };
-
-            function getOtp() {
-                let pin = document.getElementById('pin').value;
-                if (pin !== '') {
-                    neon.getOnlineOtpWithPin(casLogin, pin)
-                        .then(otp => {
-                            document.getElementById('otp').value = otp;
-                            $('#otpForm').submit();
-                        }).catch(e => {
-                        $('#otpError').css('display', 'block');
-                    });
-                }
-                return false;
-            }
-            /*]]>*/
-        </script>
-        <div class="form-wrapper">
-            <form id="otpForm" style="display:none;" method="POST">
-                <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-                <input type="hidden" name="_eventId" value="otp" />
-                <input type="hidden" id="otp" name="otp" value="" />
-                <section class="cas-field form-group my-3">
-                    <label class="mdc-text-field mdc-text-field--outlined control-label">
-                        <input class="mdc-text-field__input form-control"
-                               id="pin"
-                               name="pin"
-                               size="6"
-                               maxlength="6"
-                               type="text"
-                               autocomplete="off" required
-                               autocapitalize="none"
-                               spellcheck="false" />
-                        <span class="mdc-notched-outline">
-                                    <span class="mdc-notched-outline__leading"></span>
-                                    <span class="mdc-notched-outline__notch">
-                                        <span class="mdc-floating-label"
-                                              th:text="#{cas.inwebo.pin}">Activation Code</span>
-                                    </span>
-                                    <span class="mdc-notched-outline__trailing"></span>
-                                </span>
-                    </label>
-                </section>
-                <button class="mdc-button mdc-button--raised btn btn-primary" name="enroll"
-                        type="button" onclick="getOtp()" value="Enroll"
-                        th:value="#{cas.inwebo.browser.button}">
-                    <span class="mdc-button__label" th:text="#{cas.inwebo.browser.button}">Log in in the browser</span>
-                </button>
-            </form>
-        </div>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/inwebo/casInweboSelectAuthnView.html b/src/main/resources/templates_original/inwebo/casInweboSelectAuthnView.html
deleted file mode 100644
index 6755b30..0000000
--- a/src/main/resources/templates_original/inwebo/casInweboSelectAuthnView.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{cas.inwebo.selectauthent.title}">Select authentication</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" class="banner banner-message mdc-card card p-4 m-auto w-lg-66">
-        <h2 th:utext="#{cas.inwebo.selectauthent.heading}">Select your authentication method:</h2>
-
-        <form method="POST" id="startBrowserForm">
-            <input type="hidden" name="_eventId" th:value="${browserAuthenticator}" />
-            <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-            <button id="browser" name="browser" type="submit" class="mdc-button mdc-button--raised btn btn-primary">
-                <span class="mdc-button__label" th:text="#{cas.inwebo.selectauthent.browser}">Browser authentication</span>
-            </button>
-        </form>
-        <br />
-        <form method="POST" id="startPushForm">
-            <input type="hidden" name="_eventId" value="push" />
-            <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-            <button id="push" name="push" type="submit" class="mdc-button mdc-button--raised btn btn-primary">
-                <span class="mdc-button__label" th:text="#{cas.inwebo.selectauthent.push}">Mobile/desktop notification</span>
-            </button>
-        </form>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/inwebo/casInweboVAAuthnView.html b/src/main/resources/templates_original/inwebo/casInweboVAAuthnView.html
deleted file mode 100644
index 0ddb6fa..0000000
--- a/src/main/resources/templates_original/inwebo/casInweboVAAuthnView.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{cas.inwebo.browserauthent.title}">Browser authentication</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" class="banner banner-message mdc-card card p-4 m-auto w-lg-66">
-        <script type="text/JavaScript" src="https://ult-inwebo.com/va/client.js"></script>
-        <form id="otpForm" style="display:none;" method="POST" onsubmit="alert('submit')">
-            <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-            <input type="hidden" name="_eventId" value="otp" />
-            <input type="hidden" name="otp" id="otp" value="" />
-        </form>
-        <div id="inwebologin" style="display:none;">[[${login}]]</div>
-        <div id="vaContainer" style="display:none;"></div>
-        <div id="vaStartAuthentication" data-action="authentication" data-container="vaContainer"
-             data-lang="en" th:data-alias="${siteAlias}" data-width="auto"></div>
-        <div id="vaStartActivation" data-action="activation" data-container="vaContainer"
-             data-lang="en" th:data-alias="${siteAlias}" data-width="auto"></div>
-        <span id="vaError" />
-        <script th:inline="javascript">
-            window.onload = () => {
-                iwstart("vaStartAuthentication", function(iw, data) {
-                    if (data.action == "authentication" && data.code == "ok") {
-                        document.getElementById('otp').value = data.result.values[1];
-                        document.getElementById("otpForm").submit();
-                    }
-                    if (data.type == "error" && data.code == "nok") {
-                        if (data.result.reason == "no_profile") {
-                            iwterminate();
-                            setTimeout(function() {
-                                iwstart("vaStartActivation", function(iw, data) {
-                                    if (data.type == "success" && data.code == "ok" && data.action == "activation") {
-                                        window.location.href = window.location.href;
-                                    }
-                                });
-                            }, 0);
-                        } else if (data.result.reason == "force_close") {
-                            document.getElementById('vaError').textContent = 'Error: enable third-party cookies for this browser!';
-                        }
-                    }
-                });
-            };
-        </script>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/layout.html b/src/main/resources/templates_original/layout.html
deleted file mode 100644
index 7b5c8a5..0000000
--- a/src/main/resources/templates_original/layout.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
-
-<head>
-    <meta charset="UTF-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title layout:title-pattern="$LAYOUT_TITLE $CONTENT_TITLE"
-        th:text="${#strings.defaultString(#themes.code('cas.theme.name'), 'CAS - Central Authentication Service')}">
-    </title>
-
-    <!--/* Core CAS CSS */-->
-    <span th:remove="tag" th:if="${'true' == #strings.defaultString(#themes.code('cas.css.core.enabled'), 'true')}">
-        <span th:replace="fragments/includes :: stylesheets">
-            <a href="fragments/includes.html">Theme</a> stylesheet fragment will go here
-        </span>
-    </span>
-
-    <span th:remove="tag" th:each="file : ${#strings.arraySplit(#themes.code('cas.standard.css.file'), ',')}">
-        <link rel="stylesheet" type="text/css" href="../static/css/cas.css" th:href="@{${file}}" />
-    </span>
-    <link rel="shortcut icon"
-        th:href="@{${#strings.defaultString(#themes.code('cas.favicon.file'), '/favicon.ico')}}" />
-</head>
-
-<body>
-    <script th:replace="fragments/scripts"></script>
-
-    <div th:replace="fragments/header :: header">
-        <a href="fragments/header.html">Header</a> fragment will go here
-    </div>
-
-    <div class="mdc-drawer-scrim"></div>
-
-    <div class="mdc-drawer-app-content mdc-top-app-bar--fixed-adjust d-flex justify-content-center">
-        <main role="main" id="main-content" th:attr="class=*{mainContentClass ?: 'container-lg' + ' py-4'} ">
-            <div layout:fragment="content" id="content">
-                CAS content will go here
-            </div>
-        </main>
-    </div>
-
-    <div th:replace="fragments/footer :: footer">
-        <a href="fragments/footer.html">Footer</a> fragment will go here
-    </div>
-    
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/login-error/casAccountDisabledView.html b/src/main/resources/templates_original/login-error/casAccountDisabledView.html
deleted file mode 100644
index 91f399e..0000000
--- a/src/main/resources/templates_original/login-error/casAccountDisabledView.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title th:text="#{screen.accountdisabled.heading}">CAS Account Disabled View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-    <main role="main" class="container mt-3 mb-3">
-        <div layout:fragment="content" class="mdc-card card p-4 m-auto w-lg-66">
-            <h2 th:utext="#{screen.accountdisabled.heading}">This account has been disabled.</h2>
-            <span th:remove="tag" th:if="${#bools.isTrue(enableAccountUnlock)}">
-                    <p th:utext="#{screen.account.unlock.description}">Please unlock the account.</p>
-                    <div th:replace="fragments/unlockaccount :: unlock"></div>
-                </span>
-            <span th:remove="tag" th:unless="${enableAccountUnlock}">
-                    <p th:utext="#{screen.accountdisabled.message}">Please contact the system administrator to regain access.</p>
-            </span>
-        </div>
-
-    </main>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/login-error/casAccountLockedView.html b/src/main/resources/templates_original/login-error/casAccountLockedView.html
deleted file mode 100644
index 61fd028..0000000
--- a/src/main/resources/templates_original/login-error/casAccountLockedView.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-    <head>
-        <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-        <title th:text="#{screen.accountlocked.heading}">Account Locked View</title>
-        <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-    </head>
-
-    <body>
-        <main role="main" class="container mt-3 mb-3">
-            <div layout:fragment="content" class="mdc-card card p-4 m-auto w-lg-66">
-                <h2 th:utext="#{screen.accountlocked.heading}">This account has been locked.</h2>
-                <span th:remove="tag" th:if="${#bools.isTrue(enableAccountUnlock)}">
-                    <p th:utext="#{screen.account.unlock.description}">Please unlock the account.</p>
-                    <div th:replace="fragments/unlockaccount :: unlock"></div>
-                </span>
-                <span th:remove="tag" th:unless="${enableAccountUnlock}">
-                    <p th:utext="#{screen.accountlocked.message}">Please contact the system administrator to regain access.</p>
-                </span>
-            </div>
-        </main>
-    </body>
-</html>
diff --git a/src/main/resources/templates_original/login-error/casAccountUnlockedView.html b/src/main/resources/templates_original/login-error/casAccountUnlockedView.html
deleted file mode 100644
index 9d1a2b6..0000000
--- a/src/main/resources/templates_original/login-error/casAccountUnlockedView.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-    <head>
-        <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-        <title th:text="#{screen.accountunlocked.heading}">Account Unlocked View</title>
-        <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-    </head>
-
-    <body>
-        <main role="main" class="container mt-3 mb-3">
-            <div layout:fragment="content" class="my-2 mdc-card card p-4 m-auto w-lg-66">
-                <h2 th:utext="#{screen.accountunlocked.heading}">Your account is unlocked.</h2>
-                <p th:each="message : ${flowRequestContext.messageContext.allMessages}" th:utext="${message.text}">Message Text</p>
-                <div>
-                    <p/>
-                    <a id="loginbtn" class="mdc-button mdc-button--raised" th:href="@{/login}">
-                        <span class="mdc-button__label" th:text="#{screen.error.page.loginagain}">Login</span>
-                    </a>
-                </div>
-            </div>
-        </main>
-    </body>
-</html>
diff --git a/src/main/resources/templates_original/login-error/casAuthenticationBlockedView.html b/src/main/resources/templates_original/login-error/casAuthenticationBlockedView.html
deleted file mode 100644
index 69e4851..0000000
--- a/src/main/resources/templates_original/login-error/casAuthenticationBlockedView.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{screen.authnblocked.heading}">Authentication Blocked View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div id="content" layout:fragment="content" class="banner banner-danger alert alert-danger mdc-card card p-4 m-auto w-lg-66 text-justify">
-        <h2 th:utext="#{screen.authnblocked.heading}">Authentication attempt is blocked.</h2>
-        <p th:utext="#{screen.authnblocked.message}">Your authentication attempt is untrusted and unauthorized from
-            your current workstation.</p>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/login-error/casBadHoursView.html b/src/main/resources/templates_original/login-error/casBadHoursView.html
deleted file mode 100644
index a0a05db..0000000
--- a/src/main/resources/templates_original/login-error/casBadHoursView.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{screen.badhours.heading}">Bad Hours View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" class="banner banner-danger alert alert-danger mdc-card card p-4 m-auto w-lg-66 text-justify">
-        <h2 th:utext="#{screen.badhours.heading}">Your account is forbidden to login at this time.</h2>
-        <p th:utext="#{screen.badhours.message}">Please try again later.</p>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/login-error/casBadWorkstationView.html b/src/main/resources/templates_original/login-error/casBadWorkstationView.html
deleted file mode 100644
index f5641cb..0000000
--- a/src/main/resources/templates_original/login-error/casBadWorkstationView.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{screen.badworkstation.heading}">Bad Workstation View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body id="cas">
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" class="banner banner-danger alert alert-danger mdc-card card p-4 m-auto w-lg-66 text-justify">
-        <h2 th:utext="#{screen.badworkstation.heading}">You cannot login from this workstation.</h2>
-        <p th:utext="#{screen.badworkstation.message}">Please contact the system administrator to regain access.</p>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/login-error/casExpiredPassView.html b/src/main/resources/templates_original/login-error/casExpiredPassView.html
deleted file mode 100644
index da1c26e..0000000
--- a/src/main/resources/templates_original/login-error/casExpiredPassView.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title th:text="#{screen.expiredpass.heading}">CAS Expired Password View</title>
-    <script type="text/javascript" th:src="@{#{webjars.zxcvbn.js}}"></script>
-    <script type="text/javascript" th:src="@{/js/passwordMeter.js}"></script>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" class="mdc-card card p-4 w-lg-66 m-auto">
-        <div th:replace="fragments/pwdupdateform(expiredPass='true')">
-            <a href="fragments/pwdupdateform.html">pwdupdateform</a>
-        </div>
-    </div>
-</main>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates_original/login-error/casMustChangePassView.html b/src/main/resources/templates_original/login-error/casMustChangePassView.html
deleted file mode 100644
index 09890f6..0000000
--- a/src/main/resources/templates_original/login-error/casMustChangePassView.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title th:text="#{screen.mustchangepass.heading}">You must change your password View</title>
-    <script type="text/javascript" th:src="@{#{webjars.zxcvbn.js}}"></script>
-    <script type="text/javascript" th:src="@{/js/passwordMeter.js}"></script>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" class="mdc-card card p-4 w-lg-66 m-auto">
-        <div th:replace="fragments/pwdupdateform :: pwdupdateform">
-            <a href="fragments/pwdupdateform.html">pwdupdateform</a>
-        </div>
-    </div>
-</main>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates_original/login/casConfirmView.html b/src/main/resources/templates_original/login/casConfirmView.html
deleted file mode 100644
index 9171203..0000000
--- a/src/main/resources/templates_original/login/casConfirmView.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title th:text="#{screen.confirmation.message}">Confirm View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-    <main role="main" class="container mt-3 mb-3">
-        <div layout:fragment="content" class="mdc-card card p-4 m-auto w-lg-66">
-            <h4 th:text="#{screen.confirmation.message}">You asked to be warned before logging into applications. Please
-                proceed.</h4>
-
-            <form method="post" id="form" class="">
-                <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-                <div class="mdc-form-field form-check">
-                    <div class="mdc-checkbox">
-                        <input id="ignorewarn" class="mdc-checkbox__native-control form-check-input" name="ignorewarn" value="true"
-                            type="checkbox" />
-                        <div class="mdc-checkbox__background">
-                            <svg class="mdc-checkbox__checkmark" viewBox="0 0 24 24">
-                                <path class="mdc-checkbox__checkmark-path" fill="none"
-                                    d="M1.73,12.91 8.1,19.28 22.79,4.59" />
-                            </svg>
-                            <div class="mdc-checkbox__mixedmark"></div>
-                        </div>
-                        <div class="mdc-checkbox__ripple"></div>
-                    </div>
-                    <label class="form-check-label" for="ignorewarn" th:utext="#{screen.welcome.label.warnremove}">Do
-                        not warn me again</label>
-                </div>
-
-                <button class="mdc-button mdc-button--raised btn btn-primary mt-4 d-block" name="_eventId_success" accesskey="l"
-                    value="Continue">
-                    <span th:text="#{screen.button.continue}"></span>
-                </button>
-            </form>
-        </div>
-    </main>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates_original/login/casGenericSuccessView.html b/src/main/resources/templates_original/login/casGenericSuccessView.html
deleted file mode 100644
index 179c88a..0000000
--- a/src/main/resources/templates_original/login/casGenericSuccessView.html
+++ /dev/null
@@ -1,207 +0,0 @@
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{screen.success.header}">Generic Success View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" class="row">
-        <script>
-            function jqueryReady() {
-                $('table').DataTable();
-            }
-        </script>
-        <div class="w-100 m-auto mdc-card card p-4 text-justify">
-            <h2>
-                <i class="mdi mdi-door-open fas fa-door-open"></i>
-                <span th:utext="#{screen.success.header}">Log In Successful</span>
-                <span id="principalId" th:utext="${authentication.principal.id}" style="display:none;"/>
-            </h2>
-
-            <p th:utext="#{screen.success.success(${authentication.principal.id})}">You, <strong>username</strong>, have successfully logged into the Central Authentication
-                Service.
-                However, you are seeing this page because CAS does not know about your target destination and how
-                to get you there. Examine the authentication request again and make sure a target service/application that is authorized and registered with CAS is specified.</p>
-
-            <p th:utext="#{screen.success.security}">
-                When you are finished, for security reasons, please <a href="logout">log out</a> and exit your web browser.
-            </p>
-
-            <div th:remove="tag"
-                 th:if="${'true' == #strings.defaultString(#themes.code('cas.successful-login.display-attributes'), 'true')}">
-                <p th:unless="${#maps.isEmpty(authentication.principal.attributes)}">
-                    The following attributes and services are resolved and available for <strong th:utext="${authentication.principal.id}"/>:
-
-                    <div id="attribute-tabs" class="mdc-tab-bar" role="tablist">
-                        <div class="mdc-tab-scroller">
-                            <div class="mdc-tab-scroller__scroll-area">
-                                <nav class="nav nav-tabs mdc-tab-scroller__scroll-content">
-                                    <button id="principal-tab" class="mdc-tab nav-link" role="tab" aria-selected="true" data-toggle="tab" data-target="attribute-tab-0">
-                                            <span class="mdc-tab__content">
-                                                <span class="mdc-tab__text-label">Principal</span>
-                                            </span>
-                                        <span class="mdc-tab-indicator">
-                                                <span class="mdc-tab-indicator__content mdc-tab-indicator__content--underline"></span>
-                                            </span>
-                                        <span class="mdc-tab__ripple"></span>
-                                    </button>
-                                    <button id="auth-tab" class="mdc-tab nav-link" role="tab" aria-selected="true" data-toggle="tab" data-target="attribute-tab-1">
-                                            <span class="mdc-tab__content">
-                                                <span class="mdc-tab__text-label">Authentication</span>
-                                            </span>
-                                        <span class="mdc-tab-indicator">
-                                                <span class="mdc-tab-indicator__content mdc-tab-indicator__content--underline"></span>
-                                            </span>
-                                        <span class="mdc-tab__ripple"></span>
-                                    </button>
-                                    <button id="services-tab" th:if="${authorizedServices}" class="mdc-tab nav-link" role="tab" aria-selected="true" data-toggle="tab"
-                                            data-target="attribute-tab-2">
-                                            <span class="mdc-tab__content">
-                                                <span class="mdc-tab__text-label">Services</span>
-                                            </span>
-                                        <span class="mdc-tab-indicator">
-                                                <span class="mdc-tab-indicator__content mdc-tab-indicator__content--underline"></span>
-                                            </span>
-                                        <span class="mdc-tab__ripple"></span>
-                                    </button>
-                                </nav>
-                            </div>
-                        </div>
-                    </div>
-
-                    <section id="attribute-tab-0" class="attribute-tab tab-pane active">
-                        <div class="w-100 mdc-data-table table-responsive mx-auto my-4" id="divPrincipalAttributes" role="tabpanel" aria-labelledby="attributes-tab">
-                            <table id="attributesTable" class="table table-striped" style="white-space: unset">
-                                <thead>
-                                <tr class="mdc-data-table__header-row">
-                                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">Attribute</th>
-                                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">Value(s)</th>
-
-                                </tr>
-                                </thead>
-                                <tbody class="mdc-data-table__content">
-                                <tr th:each="attribute : ${authentication.principal.attributes}" class="mdc-data-table__row">
-                                    <td class="mdc-data-table__cell"><code><kbd th:utext="${attribute.key}"/></code></td>
-                                    <td class="mdc-data-table__cell">
-                                        <code><kbd th:utext="${#strings.abbreviate(attribute.value, 80)}"/></code>
-                                    </td>
-                                </tr>
-
-                                </tbody>
-                            </table>
-                        </div>
-                    </section>
-
-                    <section id="attribute-tab-1" class="d-none attribute-tab tab-pane">
-                        <div class="w-100 mdc-data-table table-responsive mx-auto my-4" id="divAuthenticationAttributes" role="tabpanel" aria-labelledby="attributes-tab">
-                            <table id="attributesTable" class="mdc-data-table__table table table-striped" style="white-space: unset">
-                                <thead>
-                                <tr class="mdc-data-table__header-row">
-                                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">Attribute</th>
-                                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">Value(s)</th>
-                                </tr>
-                                </thead>
-                                <tbody class="mdc-data-table__content">
-
-                                <tr th:attr="id=${attribute.key}"
-                                    th:each="attribute : ${authentication.attributes}" class="mdc-data-table__row">
-                                    <td class="mdc-data-table__cell attribute-key"><code><span th:utext="${attribute.key}"/></code></td>
-                                    <td class="mdc-data-table__cell attribute-value">
-                                        <code><kbd th:utext="${#strings.abbreviate(attribute.value, 80)}"/></code>
-                                    </td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </section>
-
-                    <section id="attribute-tab-2" class="d-none attribute-tab tab-pane" th:if="${authorizedServices}">
-                        <div class="w-100 mdc-data-table mx-auto my-4" id="divAuthorizedServices" role="tabpanel" aria-labelledby="attributes-tab">
-                            <table id="attributesTable" class="mdc-data-table__table table table-striped" style="white-space: unset">
-                                <thead>
-                                <tr class="mdc-data-table__header-row">
-                                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col"></th>
-                                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">Service</th>
-                                    <th class="mdc-data-table__header-cell" role="columnheader" scope="col">Description</th>
-
-                                </tr>
-                                </thead>
-                                <tbody class="mdc-data-table__content">
-
-                                <tr th:each="service : ${authorizedServices}" class="mdc-data-table__row">
-                                    <td class="mdc-data-table__cell">
-                                        <i class="mdi mdi-web fas fa-globe" th:unless="${service.logo}"></i>
-                                        <img th:src="${service.logo}" width="26px" height="26px" th:if="${service.logo}"/>
-                                    </td>
-                                    <td class="mdc-data-table__cell">
-                                        <a th:id="${'service' + service.id}" th:title="${service.name}" th:alt="${service.description}" th:utext="${service.name}"/>
-
-                                        <script th:inline="javascript">
-                                            /*<![CDATA[*/
-                                            let serviceId = /*[[${service.serviceId}]]*/;
-                                            if (isValidURL(serviceId)) {
-                                                let id = /*[[${'service' + service.id}]]*/;
-                                                $(`a#${id}`).attr("href", serviceId);
-                                            }
-                                            /*]]>*/
-                                        </script>
-                                    </td>
-                                    <td class="mdc-data-table__cell">
-                                        <span th:utext="${service.description}"/>
-                                    </td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </section>
-            </div>
-        </div>
-
-
-        <script type="text/javascript" th:inline="javascript">
-            let divs = ["divPrincipalAttributes", "divAuthenticationAttributes", "divAuthorizedServices"]
-            divs.forEach(id => {
-                console.log(`Selecting element ${id}`)
-                let div = document.querySelector(`#${id}`);
-                if (div !== null) {
-                    $(() => {
-                        if (typeof mdc === 'undefined') {
-                            $('#principal-tab').tab('show');
-                            $('button[data-toggle="tab"]').on('shown.bs.tab', event => {
-                                let id = $(event.target).data('target');
-                                $('.tab-pane').addClass('d-none');
-                                $(`#${id}`).removeClass('d-none');
-
-                            })
-                        } else {
-                            new mdc.dataTable.MDCDataTable(div);
-                            tabify(mdc);
-                        }
-                    });
-                }
-            });
-
-            function tabify(material) {
-                let elm = document.getElementById('attribute-tabs');
-                let tabs = material.tabBar.MDCTabBar.attachTo(elm);
-
-                tabs.listen('MDCTabBar:activated', ev => {
-                    let index = ev.detail.index;
-                    $('.attribute-tab').addClass('d-none');
-                    $(`#attribute-tab-${index}`).removeClass('d-none');
-                });
-
-                tabs.foundation.adapter.activateTabAtIndex(0);
-                return tabs;
-            }
-
-        </script>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/login/casLoginMessageView.html b/src/main/resources/templates_original/login/casLoginMessageView.html
deleted file mode 100644
index 1e258d2..0000000
--- a/src/main/resources/templates_original/login/casLoginMessageView.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-   <head>
-      <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-      <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-      <title th:text="#{screen.authentication.warning}">CAS Login Message View</title>
-      <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-   </head>
-
-   <body>
-      <main role="main" class="container mt-3 mb-3">
-         <div layout:fragment="content" class="loginMessageView mdc-card card p-4 w-lg-66 m-auto">
-            <h1 class="m-0" th:text="#{screen.authentication.warning}">Authentication Succeeded with Warnings</h1>
-            <ul class="mdc-list">
-               <li class="mdc-list-item text-warn" tabindex="0" th:each="message : ${messages}">
-                  <span class="mdc-list-item__text" th:utext="${message.text}">Lorem ipsum dolor sit amet, consectetur
-                  adipiscing elit.</span>
-               </li>
-            </ul>
-            <div class="cas-field form-group d-flex">
-               <form method="post" id="form" class="me-2" th:action="@{/login}">
-                  <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-                  <input type="hidden" name="_eventId" value="proceed" />
-                  <button class="mdc-button mdc-button--raised mdc-card__action mdc-card__action--button btn btn-primary"
-                     type="submit" name="continue" accesskey="l" th:value="#{screen.button.continue}" value="Continue">
-                     <span class="mdc-button__label" th:text="#{screen.button.continue}">Continue</span>
-                  </button>
-               </form>
-               
-               <form method="post" id="changePasswordForm" class="fm-v" th:action="@{/login}"
-                  th:if="${passwordManagementEnabled} AND ${passwordExpirationWarningFound}">
-                  <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-                  <input type="hidden" name="_eventId" value="changePassword" />
-                  <button class="mdc-button mdc-button--raised btn btn-primary mdc-card__actions_action mdc-card__actions_action--button"
-                     name="changePassword" accesskey="l" th:value="#{screen.button.changePassword}"
-                     id="changePassword" value="Change Password">
-                  <span class="mdc-button__label" th:text="#{screen.button.changePassword}">Change Password</span>
-                  </button>
-               </form>
-
-            </div>
-         </div>
-      </main>
-   </body>
-</html>
diff --git a/src/main/resources/templates_original/login/casLoginView.html b/src/main/resources/templates_original/login/casLoginView.html
deleted file mode 100644
index 7c0bb07..0000000
--- a/src/main/resources/templates_original/login/casLoginView.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{cas.login.pagetitle}">CAS Login View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-
-</head>
-
-<body class="login mdc-typography">
-<div layout:fragment="content" class="d-flex justify-content-center">
-   <div class="d-flex justify-content-center flex-md-row flex-column mdc-card mdc-card-content card flex-grow-1"
-         th:with="loginFormEnabled=${#strings.defaultString(#themes.code('cas.login-form.enabled'), 'true') == 'true'},
-                  loginFormViewable=${@casThymeleafLoginFormDirector.isLoginFormViewable(#vars)}">
-        <section id="loginForm"
-                 th:if="${loginFormViewable and loginFormEnabled}"
-                 class="login-section login-form card-body">
-            <div th:replace="fragments/loginform :: loginform">
-                <a href="fragments/loginform.html">Login Form goes here</a>
-            </div>
-        </section>
-        <span th:if="${#bools.isFalse(delegatedAuthenticationDynamicProviderSelection) && #bools.isFalse(delegatedAuthenticationDisabled)}">
-            <section id="loginProviders" class="login-section login-providers card-body"
-                    th:if="${delegatedAuthenticationProviderConfigurations} OR ${wsfedUrls}">
-                <div th:replace="fragments/loginProviders :: loginProviders">
-                    <a href="fragments/loginProviders.html">loginProviders</a>
-                </div>
-            </section>
-        </span>
-        <section id="acceptto" class="login-section login-qr d-xs-none d-md-block" th:if="${accepttoApplicationId}">
-            <div th:replace="fragments/accepttoQRCode :: accepttoQRCode">
-                <a href="fragments/accepttoQRCode.html">accepttoQRCode</a>
-            </div>
-        </section>
-        <section id="qrlogin" class="login-section login-qr d-xs-none d-md-block card-body" th:if="${qrAuthenticationEnabled}">
-            <div th:replace="fragments/qrAuthentication :: qrAuthentication">
-                <a href="fragments/qrAuthentication.html">qrAuthentication</a>
-            </div>
-        </section>
-    </div>
-</div>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/logout/casConfirmLogoutView.html b/src/main/resources/templates_original/logout/casConfirmLogoutView.html
deleted file mode 100644
index a9a1303..0000000
--- a/src/main/resources/templates_original/logout/casConfirmLogoutView.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{screen.logout.confirm.header}">Confirm Logout View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div id="content" layout:fragment="content" class="mdc-card card p-4 m-auto">
-        <h2 th:if="${authentication}"
-            th:utext="#{screen.logout.confirm.header(${authentication.principal.id})}">Do you want to log out completely?</h2>
-        <h2 th:unless="${authentication}">Do you want to log out completely?</h2>
-        <p th:remove="tag" th:utext="#{screen.logout.confirm.text}">An application may have redirected you to the Central
-            Authentication Service to completely log you out and destroy your single sign-on session. \
-            If you choose to log out, you will be asked again to provide your credentials and \
-            login again once you attempt to access an application.
-        </p>
-
-        <span th:if="${ticketGrantingTicket != null and #maps.size(ticketGrantingTicket.services) > 0}">
-            <span>The following applications are tied to your single sign-on session:</span>
-            <div class="w-100 mdc-data-table table-responsive mx-auto my-4" id="divServices"
-                 role="tabpanel" aria-labelledby="attributes-tab">
-                <table id="servicesTable" class="table table-striped" style="white-space: unset">
-                    <thead>
-                    <tr class="mdc-data-table__header-row">
-                        <th class="mdc-data-table__header-cell" role="columnheader" scope="col">Session Id</th>
-                        <th class="mdc-data-table__header-cell" role="columnheader" scope="col">Service</th>
-                    </tr>
-                    </thead>
-                    <tbody class="mdc-data-table__content">
-                    <tr th:each="entry : ${ticketGrantingTicket.services}" class="mdc-data-table__row">
-                        <td class="mdc-data-table__cell"><code><kbd th:utext="${entry.key}"/></code></td>
-                        <td class="mdc-data-table__cell">
-                            <code><kbd th:utext="${#strings.abbreviate(entry.value.id, 80)}"/></code>
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
-            </div>
-        </span>
-
-        <span th:text="#{screen.logout.confirm.proceed}">Do you want to proceed?</span>
-        <br/>
-        <form method="post" id="fm1">
-            <input type="hidden" name="LogoutRequestConfirmed" value="true"/>
-            <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-            <input type="hidden" name="_eventId" value="success"/>
-            <button id="logoutButton" class="mdc-button mdc-button--raised btn btn-primary" name="success" accesskey="l">
-                <span class="mdc-button__label" th:text="#{screen.welcome.button.logout}">Logout</span>
-            </button>
-        </form>
-        <script type="text/javascript" th:inline="javascript">
-            let div = document.querySelector('#divServices');
-            new mdc.dataTable.MDCDataTable(div);
-        </script>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/logout/casLogoutView.html b/src/main/resources/templates_original/logout/casLogoutView.html
deleted file mode 100644
index 2fa878d..0000000
--- a/src/main/resources/templates_original/logout/casLogoutView.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{screen.logout.header}">CAS Logout</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content">
-        <div class="w-100 m-auto mdc-card card p-4">
-            <div id="logoutBody" class="card-body">
-                <h2 class="banner-heading">
-                    <i class="mdi mdi-logout fas fa-sign-out-alt"></i>
-                    <span th:utext="#{screen.logout.header}">Log Out Successful</span>
-                </h2>
-
-                <p id="logoutMessage" class="banner-message" th:utext="#{screen.logout.success}">You have successfully logged out of the Central Authentication
-                    Service. You may <a href="login">log in</a> again.</p>
-                <p class="banner-message" th:utext="#{screen.logout.security}">For security reasons, exit your web browser.</p>
-            </div>
-        </div>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/logout/casPropagateLogoutView.html b/src/main/resources/templates_original/logout/casPropagateLogoutView.html
deleted file mode 100644
index 7f9dd63..0000000
--- a/src/main/resources/templates_original/logout/casPropagateLogoutView.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{screen.logout.header}">Propagate Logout View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-    <script th:inline="javascript">
-        /*<![CDATA[*/
-        function redirectToApp() {
-            window.location = [[${logoutRedirectUrl}]];
-        }
-
-        function handleCallback(index, status) {
-            if (status === 200) {
-                $(`#service${index}`).addClass('mdi-check').removeClass('mdi-help-circle');
-                $(`#service${index}`).prop('title', 'Logout request was successfully received.');
-            } else {
-                $(`#service${index}`).addClass('mdi-alert-circle').removeClass('mdi-help-circle');
-                $(`#service${index}`).prop('title', 'Logout notification could not be sent.');
-            }
-        }
-
-        /*]]>*/
-    </script>
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content">
-        <div class="alert alert-success">
-            <h2 th:utext="#{screen.logout.header}">Logout successful</h2>
-            <p id="logoutMessage" th:utext="#{screen.logout.fc.success}">You have successfully logged out of the Central Authentication
-                Service. Given single logout is enabled with CAS, \
-                the following list of applications are <strong> only notified</strong> to log you out and destroy your
-                user session. Remember that this \
-                is just a notification, not a guarantee. It is up the application itself to honor these notifications
-                and properly take action to log you \
-                out.</p>
-            <ul style="list-style-type: none;">
-                <li th:each="entry,iterStat : ${logoutUrls}">
-                    <script type="text/javascript" th:inline="javascript">
-                        /*<![CDATA[*/
-                        $.ajax({
-                            url: [[${entry.key.logoutUrl.toExternalForm()}]],
-                            dataType: 'jsonp',
-                            async: true,
-                            contentType: [[${entry.value.contentType}]]
-                            , data: [[${entry.value.message}]]
-                            , success: data => {
-                                var index = [[${iterStat.index}]];
-                                handleCallback(index, 200);
-                            },
-                            error: (err, textStatus, errorThrown) => {
-                                var index = [[${iterStat.index}]];
-                                console.log(`${err.status} ${textStatus} ${errorThrown}`)
-                                handleCallback(index, 500);
-                            }
-                        });
-                        /*]]>*/
-                    </script>
-
-                    <p>
-                        <i class="mdi mdi-help-circle fas fa-question-circle"
-                           th:id="${'service'+iterStat.index}" title="Logout request pending..."> </i>
-                        <kbd th:text="${entry.key.service.id}">Service id</kbd>
-                    </p>
-                </li>
-            </ul>
-
-            <p th:utext="#{screen.logout.security}">For security reasons, exit your web browser.</p>
-
-            <button type="button" th:if="${logoutRedirectUrl}"
-                   class="mdc-button mdc-button--raised btn btn-primary" onclick="redirectToApp();"
-                   th:value="${'Go to ' + logoutRedirectUrl}" value="Go to...">
-                   <span class="mdc-button__label" th:text="${'Go to ' + logoutRedirectUrl}"></span>
-            </button>
-            <form th:if="${logoutPostUrl != null && logoutPostData != null}" th:action="${logoutPostUrl}" method="post">
-                <span th:each="entry : ${logoutPostData}" th:remove="tag">
-                    <input type="hidden" th:name="${entry.key}" th:value="${entry.value}"/>
-                </span>
-                <button type="submit" class="mdc-button mdc-button--raised">
-                    <span class="mdc-button__label" th:text="${'Go to ' + logoutPostUrl}"></span>
-                </button>
-            </form>
-        </div>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/mfa-trusted-devices/casMfaRegisterDeviceView.html b/src/main/resources/templates_original/mfa-trusted-devices/casMfaRegisterDeviceView.html
deleted file mode 100644
index 62abfe3..0000000
--- a/src/main/resources/templates_original/mfa-trusted-devices/casMfaRegisterDeviceView.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title th:text="#{cas.mfa.registerdevice.pagetitle}">CAS MFA Register Device View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-    <main role="main" class="container mt-3 mb-3">
-        <div layout:fragment="content" id="login" class="mdc-card card mdc-card-content w-lg-50 p-4 m-auto">
-            <h2 th:text="#{cas.mfa.registerdevice.label.title}">Register Device</h2>
-            <p th:text="#{cas.mfa.registerdevice.label.intro}">Please name the current device.</p>
-
-            <form method="post" id="registerform" th:object="${mfaTrustRecord}" th:action="@{/login}">
-                <div class="d-flex caps-check">
-                    <label for="deviceName"
-                           class="mdc-text-field mdc-text-field--outlined control-label mdc-text-field--with-trailing-icon">
-                        <span class="mdc-notched-outline">
-                            <span class="mdc-notched-outline__leading"></span>
-                            <span class="mdc-notched-outline__notch">
-                                <span class="mdc-floating-label" th:utext="#{cas.mfa.registerdevice.label.name}">Name</span>
-                            </span>
-                            <span class="mdc-notched-outline__trailing"></span>
-                        </span>
-                        <input class="mdc-text-field__input form-control"
-                               type="text"
-                               name="deviceName"
-                               id="deviceName"
-                               th:field="*{deviceName}"
-                               size="25"
-                               autocomplete="off" required />
-                    </label>
-                    <script>document.getElementById("deviceName").value = randomWord();</script>
-                </div>
-
-                <div><p th:text="#{cas.mfa.registerdevice.label.duration}">How long should we remember this device?</p></div>
-                <div class="d-flex mt-2">
-                    <div id="expirationField" class="me-2" style="display:none">
-                        <label for="expiration" class="mdc-text-field mdc-text-field--outlined control-label">
-                            <span class="mdc-notched-outline">
-                                <span class="mdc-notched-outline__leading"></span>
-                                <span class="mdc-notched-outline__notch">
-                                    <span class="mdc-floating-label" th:text="#{cas.mfa.registerdevice.label.expiration}">Expiration</span>
-                                </span>
-                                <span class="mdc-notched-outline__trailing"></span>
-                            </span>
-                            <input class="mdc-text-field__input form-control"
-                                   type="number"
-                                   name="expiration"
-                                   id="expiration"
-                                   th:field="*{expiration}"
-                                   autocomplete="off" required />
-                        </label>
-                    </div>
-                    
-                    <select name="timeUnit" id="timeUnit" class="custom-select" th:field="*{timeUnit}"
-                            onchange="let hide = this.value!=='FOREVER'; $('#expirationField').toggle(hide)">
-                        <option value="SECONDS" th:text="#{screen.consent.options.timeunit.seconds}">Seconds</option>
-                        <option value="MINUTES" th:text="#{screen.consent.options.timeunit.minutes}">Minutes</option>
-                        <option value="HOURS" th:text="#{screen.consent.options.timeunit.hours}">Hours</option>
-                        <option value="DAYS" th:text="#{screen.consent.options.timeunit.days}">Days</option>
-                        <option value="WEEKS" th:text="#{screen.consent.options.timeunit.weeks}">Weeks</option>
-                        <option value="MONTHS" th:text="#{screen.consent.options.timeunit.months}">Months</option>
-                        <option value="YEARS" th:text="#{screen.consent.options.timeunit.years}">Years</option>
-                        <option value="FOREVER" th:text="#{cas.mfa.registerdevice.options.timeunit.forever}">Forever</option>
-                    </select>
-                </div>
-
-                <div class="d-flex mt-3">
-                    <button class="mdc-button mdc-button--raised btn btn-primary" accesskey="s">
-                        <span class="mdc-button__label"
-                            th:text="#{cas.mfa.registerdevice.button.register}">Register</span>
-                    </button>&nbsp;
-                    <button class="mdc-button mdc-button--raised btn btn-primary" accesskey="k" formnovalidate
-                        onclick="$('#eventId').val('skip');">
-                        <span class="mdc-button__label" th:text="#{cas.mfa.registerdevice.button.skip}">Skip</span>
-                    </button>
-                </div>
-                <input type="hidden" id="eventId" name="_eventId" value="submit" />
-                <input type="hidden" name="geolocation" />
-                <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-            </form>
-        </div>
-    </main>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/mfa/casCompositeMfaProviderSelectionView.html b/src/main/resources/templates_original/mfa/casCompositeMfaProviderSelectionView.html
deleted file mode 100644
index 29750e5..0000000
--- a/src/main/resources/templates_original/mfa/casCompositeMfaProviderSelectionView.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:th="http://www.w3.org/1999/html"
-    layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-    <title th:text="#{cas.mfa.providerselection.pagetitle}">Composite MFA Provider Selection</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-    <main role="main" class="container mt-3 mb-3">
-        <div layout:fragment="content" class="mdc-card card mdc-card-content w-lg-66 p-4 m-auto">
-            <h2 class="card-title">Multifactor Authentication Provider Selection</h2>
-            <hr>
-            <div class="card-text">
-                <div th:id="${provider}" th:each="provider: ${mfaSelectableProviders}" class="border-bottom py-4">
-                    <form name="fm1" method="post" th:action="@{/login}">
-                        <h4 class="d-flex align-items-center">
-                            <i class="mdi mdi-laptop fas fa-laptop me-2"></i>
-                            <span th:utext="#{'cas.mfa.providerselection.' + ${provider}}">Provider name goes
-                                here</span>
-                        </h4>
-                        <p th:utext="#{'cas.mfa.providerselection.' + ${provider} + '.notes'}">Provider description goes
-                            here</p>
-                        <button class="mdc-button mdc-button--raised btn btn-primary" value="Use">
-                            <span class="mdc-button__label" th:text="Use">Use</span>
-                        </button>
-                        <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-                        <input type="hidden" name="mfaProvider" th:value="${provider}" />
-                        <input type="hidden" name="_eventId" value="submit" />
-                    </form>
-                </div>
-                <a class="mdc-button mdc-button--outline btn btn-outline-secondary mt-4" id="cancel" name="cancel"
-                    onclick="location.href = location.href;">
-                    <span class="mdc-button__label" th:text="Cancel">Cancel</span>
-                </a>
-            </div>
-        </div>
-    </main>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/mfa/casMfaDeniedView.html b/src/main/resources/templates_original/mfa/casMfaDeniedView.html
deleted file mode 100644
index f038aad..0000000
--- a/src/main/resources/templates_original/mfa/casMfaDeniedView.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title th:text="#{screen.mfaDenied.heading}">MFA Denied View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-    <main role="main" class="container mt-3 mb-3">
-        <div layout:fragment="content" class="banner banner-danger alert alert-danger mdc-card card p-4 m-auto w-lg-66 text-justify">
-            <h2 th:utext="#{screen.mfaDenied.heading}">MFA attempt is denied.</h2>
-            <p th:utext="#{screen.mfaDenied.message}">Your MFA provider has denied your attempt at second factor
-                authentication. Contact your system administrator for help in restoring your account.</p>
-        </div>
-    </main>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/mfa/casMfaUnavailableView.html b/src/main/resources/templates_original/mfa/casMfaUnavailableView.html
deleted file mode 100644
index 1f019e0..0000000
--- a/src/main/resources/templates_original/mfa/casMfaUnavailableView.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title th:text="#{screen.mfaUnavailable.header}">MFA Provider Unavailable</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-    <main role="main" class="container mt-3 mb-3">
-        <div layout:fragment="content" class="banner banner-danger alert alert-danger mdc-card card p-4 m-auto w-lg-66 text-justify">
-            <h2 th:utext="#{screen.mfaUnavailable.heading}">MFA Provider Unavailable</h2>
-            <p th:utext="#{screen.mfaUnavailable.message}">Your MFA provider is currently unavailable.</p>
-        </div>
-    </main>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/password-reset/casPasswordUpdateSuccessView.html b/src/main/resources/templates_original/password-reset/casPasswordUpdateSuccessView.html
deleted file mode 100644
index d5e4b9e..0000000
--- a/src/main/resources/templates_original/password-reset/casPasswordUpdateSuccessView.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title th:text="#{screen.success.header}">Password Update Success View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-    <main role="main" class="container mt-3 mb-3">
-        <div layout:fragment="content" class="mdc-card card p-4 w-lg-66 m-auto">
-            <h2 th:utext="#{screen.pm.success.header}">Password Change Successful</h2>
-            <p th:utext="#{screen.pm.success.message}">Your account password is successfully updated.</p>
-
-            <form method="post" id="form" class="fm-v clearfix" th:action="@{/login}">
-                <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-                <input type="hidden" name="_eventId" value="proceed" />
-                <button class="mdc-button mdc-button--raised btn btn-primary me-2" name="continue" accesskey="l" type="submit"
-                    value="Login">
-                    <span class="mdc-button__label" th:text="#{screen.welcome.button.login}">Log In</span>
-                </button>
-            </form>
-        </div>
-    </main>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates_original/password-reset/casResetPasswordErrorView.html b/src/main/resources/templates_original/password-reset/casResetPasswordErrorView.html
deleted file mode 100644
index 84284e2..0000000
--- a/src/main/resources/templates_original/password-reset/casResetPasswordErrorView.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title th:text="#{screen.pm.reset.title}">Password Reset Error View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-    <main role="main" class="container mt-3 mb-3">
-        <div layout:fragment="content" class="banner banner-danger alert alert-danger mdc-card card p-4 m-auto w-lg-66 text-justify">
-            <h2 th:utext="#{screen.pm.reset.heading}">Password Reset Failed</h2>
-            <p th:utext="#{screen.pm.reset.message}">We were unable to process your password reset request at this time.
-            </p>
-        </div>
-    </main>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/password-reset/casResetPasswordSendInstructionsView.html b/src/main/resources/templates_original/password-reset/casResetPasswordSendInstructionsView.html
deleted file mode 100644
index b4337c4..0000000
--- a/src/main/resources/templates_original/password-reset/casResetPasswordSendInstructionsView.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title th:text="#{screen.pm.reset.title}">Reset Password Send Instructions View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-    <main role="main" class="container mt-3 mb-3">
-        <div layout:fragment="content" id="reset">
-            <div class="row">
-                <div class="col-lg-6 offset-lg-3">
-                    <div class="mdc-card card">
-                        <form method="post" id="fm1" class="d-block card-body">
-                            <section class="p-4">
-                                <h3 th:utext="#{screen.pm.reset.title}">Reset your password</h3>
-                                <p th:utext="#{screen.pm.reset.instructions}">Please provide your username. You will
-                                    receive a notification with follow-up
-                                    instructions on how to reset your password.</p>
-                                <div class="alert alert-danger banner banner-danger alert alert-danger banner-dismissible mb-4"
-                                    th:if="${flowRequestContext.messageContext.hasErrorMessages()}">
-                                    <p th:each="message,i : ${flowRequestContext.messageContext.allMessages}"
-                                        th:utext="${message.text}" th:classappend="${i.last} ? 'm-0'">
-                                        Message Text
-                                    </p>
-                                </div>
-
-                                <span th:if="${recaptchaPasswordManagementEnabled}">
-                                    <div th:replace="fragments/recaptcha :: recaptchaToken" />
-                                </span>
-
-                                <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-                                <input type="hidden" name="_eventId" value="findAccount" />
-                                <div class="d-flex">
-
-                                    <label for="username" class="mdc-text-field mdc-text-field--outlined control-label">
-                                        <span class="mdc-notched-outline">
-                                            <span class="mdc-notched-outline__leading"></span>
-                                            <span class="mdc-notched-outline__notch">
-                                                <span class="mdc-floating-label" th:utext="#{screen.pm.reset.username}">Username</span>
-                                            </span>
-                                            <span class="mdc-notched-outline__trailing"></span>
-                                        </span>
-                                        <input class="mdc-text-field__input form-control"
-                                               type="text"
-                                               name="username"
-                                               id="username"
-                                               size="45"
-                                               autocapitalize="none"
-                                               spellcheck="false"
-                                               autocomplete="username" required />
-                                    </label>
-
-                                </div>
-                            </section>
-                            <div class="mdc-card__actions_actions p-4 d-flex">
-                                <div th:replace="fragments/submitbutton :: submitButton (messageKey='screen.pm.button.submit')" />
-                                &nbsp;
-                                <button class="mdc-button mdc-button--outline btn btn-outline-secondary mdc-card__actions_action mdc-card__actions_action--button" name="cancel"
-                                    accesskey="c" th:attr="data-processing-text=#{screen.welcome.button.loginwip}"
-                                    type="button" onclick="location.href = location.href;" value="CANCEL"
-                                    th:value="#{screen.pm.button.cancel}">
-                                    <span class="mdc-button__label" th:text="#{screen.pm.button.cancel}">CANCEL</span>
-                                </button>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </main>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/password-reset/casResetPasswordSentInstructionsView.html b/src/main/resources/templates_original/password-reset/casResetPasswordSentInstructionsView.html
deleted file mode 100644
index 8af547c..0000000
--- a/src/main/resources/templates_original/password-reset/casResetPasswordSentInstructionsView.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title th:text="#{screen.pm.reset.title}">Reset Password Sent Instructions View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-    <main role="main" class="container mt-3 mb-3">
-        <div id="content" layout:fragment="content" class="mdc-card card p-4 m-auto w-lg-66">
-            <h2 th:utext="#{screen.pm.reset.sent}">Password Reset Instructions Sent Successfully.</h2>
-            <p th:utext="#{screen.pm.reset.sentInstructions}">You should shortly receive an email with
-                follow-instructions to reset your password. Please do not take long as the password reset instructions
-                may expire.</p>
-        </div>
-    </main>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/password-reset/casResetPasswordVerifyQuestionsView.html b/src/main/resources/templates_original/password-reset/casResetPasswordVerifyQuestionsView.html
deleted file mode 100644
index e1c1f71..0000000
--- a/src/main/resources/templates_original/password-reset/casResetPasswordVerifyQuestionsView.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title th:text="#{screen.pm.reset.title}">Reset Password Verify Questions View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-    <main role="main" class="container mt-3 mb-3">
-        <div layout:fragment="content" class="mdc-card card">
-            <div class="p-4">
-                <h2 th:utext="#{screen.pm.reset.qstitle}">Answer Security Questions</h2>
-                <p th:utext="#{screen.pm.reset.qsmsg(${username})}">Welcome <strong>{0}</strong>. Before you can reset
-                    your password, you must answer the following security questions.</p>
-            </div>
-            <form method="post" id="fm1">
-                <div class="p-2">
-                    <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-                    <input type="hidden" name="_eventId" value="submit" />
-                    <input type="hidden" name="username" th:value="${username}" />
-                    <input type="hidden" name="token" th:value="${token}" />
-
-                    <div class="mdc-data-table table-responsive p-2 w-100 noborder">
-                        <table th:if="${questionsEnabled}" class="table table-striped w-100 noborder">
-                            <tbody class="mdc-data-table__content">
-                                <tr th:each="q,iterStat : ${questions}" class="mdc-data-table__header-row py-1">
-                                    <td class="mdc-data-table__cell">
-                                        <i class="mdi mdi-message-question"></i>
-                                        <span style="vertical-align: top; font-size: larger" th:utext="${q}"></span>
-                                    </td>
-                                    <td class="mdc-data-table__cell">
-                                        <div class="cas-field form-group my-3">
-                                            <label class="mdc-text-field mdc-text-field--outlined control-label">
-                                                <span class="mdc-notched-outline">
-                                                    <span class="mdc-notched-outline__leading"></span>
-                                                    <span class="mdc-notched-outline__notch">
-                                                        <span class="mdc-floating-label"
-                                                              th:utext="#{screen.pm.reset.answer(${iterStat.count})}">Answer</span>
-                                                    </span>
-                                                    <span class="mdc-notched-outline__trailing"></span>
-                                                </span>
-                                                <input class="mdc-text-field__input form-control pwd"
-                                                       type="password"
-                                                       th:name="${'q' + iterStat.index}"
-                                                       th:id="${'q' + iterStat.index}"
-                                                       size="45"
-                                                       autocomplete="off" required />
-                                            </label>
-                                        </div>
-                                    </td>
-                                </tr>
-
-                            </tbody>
-
-                        </table>
-
-                    </div>
-                    <p align="right">
-                    <button
-                            class="mdc-button mdc-button--raised btn btn-primary mdc-card__actions_action mdc-card__actions_action--button me-2"
-                            accesskey="s"
-                            th:attr="data-processing-text=#{screen.welcome.button.loginwip}"
-                            th:value="#{screen.pm.button.submit}" type="submit" value="SUBMIT">
-                                            <span class="mdc-button__label"
-                                                  th:text="#{screen.pm.button.submit}">SUBMIT</span>
-                    </button>
-                    </p>
-                </div>
-            </form>
-        </div>
-    </main>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/passwordless/casPasswordlessDisplayView.html b/src/main/resources/templates_original/passwordless/casPasswordlessDisplayView.html
deleted file mode 100644
index ab84d77..0000000
--- a/src/main/resources/templates_original/passwordless/casPasswordlessDisplayView.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{cas.login.pagetitle}">Passwordless Display View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" id="login" class="mdc-card card mdc-card-content w-lg-50 p-4 m-auto">
-        <h3 th:text="#{passwordless.token.header}">Provide Token</h3>
-        <p th:text="#{passwordless.token.description}"></p>
-        <div class="banner banner-danger alert alert-danger mb-2" th:if="${error}">
-            <strong th:text="#{passwordless.error.failure.title}"></strong>
-            <p th:text="#{passwordless.error.failure.description}"></p>
-        </div>
-        <form method="post" id="fm1" class="d-block" th:action="@{/login}">
-            <input type="hidden" name="_eventId_submit" value="LOGIN" />
-            <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-            <section class="cas-field form-group my-3 mdc-input-group d-flex">
-                <div class="mdc-input-group-field mdc-input-group-field-append w-100">
-                    <label for="token" class="mdc-text-field caps-check mdc-text-field--outlined control-label mdc-text-field--with-trailing-icon">
-                        <span class="mdc-notched-outline">
-                            <span class="mdc-notched-outline__leading"></span>
-                            <span class="mdc-notched-outline__notch">
-                                <span class="mdc-floating-label" th:utext="#{screen.welcome.label.token}">Token</span>
-                            </span>
-                            <span class="mdc-notched-outline__trailing"></span>
-                        </span>
-                        <input class="mdc-text-field__input form-control pwd" type="password" name="token" id="token" size="25"
-                            autocomplete="off" required />
-                    </label>
-
-                </div>
-                <button class="reveal-password align-self-end mdc-button mdc-button--raised btn btn-primary mdc-input-group-append mdc-icon-button"
-                        type="button">
-                    <i class="mdi mdi-eye fas fa-eye reveal-password-icon"></i>
-                    <span class="visually-hidden">Toggle Token</span>
-                </button>
-
-                <div class="mdc-text-field-helper-line caps-warn">
-                    <p
-                        class="mdc-text-field-helper-text form-text text-small mdc-text-field-helper-text--persistent mdc-text-field-helper-text--validation-msg text-danger">
-                        <span th:utext="#{screen.capslock.on}" />
-                    </p>
-                </div>
-            </section>
-            <div class="d-flex">
-                <button class="mdc-button mdc-button--raised btn btn-primary me-2" accesskey="l" type="submit">
-                    <span class="mdc-button__label" th:text="#{screen.welcome.button.login}">Login</span>
-                </button>
-                <a class="mdc-button mdc-button--outline btn btn-outline-secondary" id="cancel" name="cancel" th:href="@{/login}">
-                    <span class="mdc-button__label" th:text="#{screen.consent.cancel}">Cancel</span>
-                </a>
-            </div>
-        </form>
-    </div>
-</main>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/passwordless/casPasswordlessGetUserIdView.html b/src/main/resources/templates_original/passwordless/casPasswordlessGetUserIdView.html
deleted file mode 100644
index 4ebf3f2..0000000
--- a/src/main/resources/templates_original/passwordless/casPasswordlessGetUserIdView.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title th:text="#{cas.login.pagetitle}">Passwordless Get User Id View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-    <main role="main" class="container mt-3 mb-3">
-        <div layout:fragment="content" id="login" class="d-flex justify-content-center">
-            <div class="mdc-card card mdc-card-content w-lg-50 p-4">
-                <div th:replace="fragments/serviceui :: serviceUI">
-                    <a href="fragments/serviceui.html">service ui fragment</a>
-                </div>
-
-                <form method="post" id="fm1" class="d-block" th:action="@{/login}">
-
-                    <div class="banner banner-danger alert alert-danger" th:if="${flowRequestContext.messageContext.hasErrorMessages()}">
-                        <span th:each="message : ${flowRequestContext.messageContext.allMessages}"
-                            th:utext="#{${message.text}}">Message Text</span>
-                    </div>
-
-                    <div class="cas-field form-group my-3">
-                        <div class="w-100">
-                            <label for="username"
-                                   class="mdc-text-field mdc-text-field--outlined control-label">
-                                <span class="mdc-notched-outline">
-                                    <span class="mdc-notched-outline__leading"></span>
-                                    <span class="mdc-notched-outline__notch">
-                                        <span class="mdc-floating-label" th:utext="#{screen.welcome.label.netid}">Token</span>
-                                    </span>
-                                    <span class="mdc-notched-outline__trailing"></span>
-                                </span>
-                                <input class="mdc-text-field__input form-control"
-                                       type="text"
-                                       name="username"
-                                       id="username"
-                                       size="25"
-                                       th:accesskey="#{screen.welcome.label.netid.accesskey}"
-                                       autocapitalize="none"
-                                       spellcheck="false"
-                                       autocomplete="username" required  />
-                            </label>
-                        </div>
-                    </div>
-
-                    <button class="mdc-button mdc-button--raised btn btn-primary" accesskey="l" type="submit">
-                        <span class="mdc-button__label" th:text="#{screen.welcome.button.login}">Login</span>
-                    </button>
-                    <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-                    <input type="hidden" name="_eventId" value="submit" />
-                </form>
-            </div>
-        </div>
-    </main>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/protocol/2.0/casProxyFailureView.html b/src/main/resources/templates_original/protocol/2.0/casProxyFailureView.html
deleted file mode 100644
index efacf05..0000000
--- a/src/main/resources/templates_original/protocol/2.0/casProxyFailureView.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<cas:serviceResponse xmlns:cas='http://www.yale.edu/tp/cas' th:inline="text">
-    <cas:proxyFailure th:attr="code=${code}">[[${description}]]</cas:proxyFailure>
-</cas:serviceResponse>
diff --git a/src/main/resources/templates_original/protocol/2.0/casProxySuccessView.html b/src/main/resources/templates_original/protocol/2.0/casProxySuccessView.html
deleted file mode 100644
index 3a7bf24..0000000
--- a/src/main/resources/templates_original/protocol/2.0/casProxySuccessView.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<cas:serviceResponse xmlns:cas='http://www.yale.edu/tp/cas' th:inline="text">
-    <cas:proxySuccess>
-        <cas:proxyTicket>[[${ticket}]]</cas:proxyTicket>
-    </cas:proxySuccess>
-</cas:serviceResponse>
diff --git a/src/main/resources/templates_original/protocol/2.0/casServiceValidationFailure.html b/src/main/resources/templates_original/protocol/2.0/casServiceValidationFailure.html
deleted file mode 100644
index b552c17..0000000
--- a/src/main/resources/templates_original/protocol/2.0/casServiceValidationFailure.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<cas:serviceResponse xmlns:cas='http://www.yale.edu/tp/cas' th:inline="text">
-    <cas:authenticationFailure th:attr="code=${code}">[[${description}]]</cas:authenticationFailure>
-</cas:serviceResponse>
diff --git a/src/main/resources/templates_original/protocol/2.0/casServiceValidationSuccess.html b/src/main/resources/templates_original/protocol/2.0/casServiceValidationSuccess.html
deleted file mode 100644
index cd38726..0000000
--- a/src/main/resources/templates_original/protocol/2.0/casServiceValidationSuccess.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<cas:serviceResponse xmlns:cas='http://www.yale.edu/tp/cas' th:inline="text">
-    <cas:authenticationSuccess>
-        <cas:user>[[${principal.id}]]</cas:user>
-        <cas:proxyGrantingTicket th:if="${pgtIou}">[[${pgtIou}]]</cas:proxyGrantingTicket>
-        <cas:proxies th:if="${not #lists.isEmpty(chainedAuthentications)}">
-            <cas:proxy th:each="proxy : ${chainedAuthentications}">[[${proxy.principal.id}]]</cas:proxy>
-        </cas:proxies>
-    </cas:authenticationSuccess>
-</cas:serviceResponse>
diff --git a/src/main/resources/templates_original/protocol/3.0/casServiceValidationFailure.html b/src/main/resources/templates_original/protocol/3.0/casServiceValidationFailure.html
deleted file mode 100644
index b552c17..0000000
--- a/src/main/resources/templates_original/protocol/3.0/casServiceValidationFailure.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<cas:serviceResponse xmlns:cas='http://www.yale.edu/tp/cas' th:inline="text">
-    <cas:authenticationFailure th:attr="code=${code}">[[${description}]]</cas:authenticationFailure>
-</cas:serviceResponse>
diff --git a/src/main/resources/templates_original/protocol/3.0/casServiceValidationSuccess.html b/src/main/resources/templates_original/protocol/3.0/casServiceValidationSuccess.html
deleted file mode 100644
index 8816473..0000000
--- a/src/main/resources/templates_original/protocol/3.0/casServiceValidationSuccess.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<cas:serviceResponse xmlns:cas='http://www.yale.edu/tp/cas'>
-    <cas:authenticationSuccess>
-        <cas:user th:text="${principal.id}"/>
-        <cas:proxyGrantingTicket th:if="${pgtIou}" th:text="${pgtIou}"/>
-        <cas:proxies th:if="${not #lists.isEmpty(chainedAuthentications)}">
-            <cas:proxy th:each="proxy : ${chainedAuthentications}" th:text="${proxy.principal.id}"/>
-        </cas:proxies>
-        <cas:attributes th:if="${not #lists.isEmpty(formattedAttributes)}">
-            <div th:each="attr : ${formattedAttributes}" th:remove="tag">
-                <div th:utext="${attr}" th:remove="tag"/>
-            </div>
-        </cas:attributes>
-    </cas:authenticationSuccess>
-</cas:serviceResponse>
diff --git a/src/main/resources/templates_original/protocol/casPostResponseView.html b/src/main/resources/templates_original/protocol/casPostResponseView.html
deleted file mode 100644
index 8f3810c..0000000
--- a/src/main/resources/templates_original/protocol/casPostResponseView.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
-
-<body onload="document.acsForm.submit();" style="display:none">
-    <form name="acsForm" th:action="${originalUrl}" method="post">
-        <span th:each="entry : ${parameters}" th:remove="tag">
-            <input type="hidden" th:name="${entry.key}" th:value="${entry.value}"/>
-        </span>
-    
-        <noscript>
-            <p th:text="#{screen.post.response.message(${originalUrl})}"/>
-            <p><input type="submit" th:value="#{screen.button.continue}"/></p>
-        </noscript>
-    </form>
-</body>
-</html>
-
diff --git a/src/main/resources/templates_original/protocol/oauth/confirm.html b/src/main/resources/templates_original/protocol/oauth/confirm.html
deleted file mode 100644
index fb8a648..0000000
--- a/src/main/resources/templates_original/protocol/oauth/confirm.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <title th:text="#{cas.oauth.confirm.pagetitle}"></title>
-</head>
-
-<body id="cas">
-    <div layout:fragment="content" class="banner banner-success mdc-card card p-4 m-auto w-lg-66">
-        <h2 th:text="#{screen.oauth.confirm.header}" />
-        <p th:text="#{screen.oauth.confirm.message(${serviceName})}" />
-        <p>
-            <a class="mdc-button mdc-button--raised btn btn-primary" id="allow" name="allow" th:href="@{${callbackUrl}}">
-                <span class="mdc-button__label" th:text="#{screen.oauth.confirm.allow}">Allow</span>
-            </a>
-        </p>
-    </div>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates_original/protocol/oauth/deviceCodeApproval.html b/src/main/resources/templates_original/protocol/oauth/deviceCodeApproval.html
deleted file mode 100644
index 49675dc..0000000
--- a/src/main/resources/templates_original/protocol/oauth/deviceCodeApproval.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <title th:text="#{cas.oauth.confirm.pagetitle}"></title>
-</head>
-
-<body id="cas">
-<div layout:fragment="content" class="mdc-card card p-4 m-auto w-lg-66">
-    <h2 th:text="#{cas.oauth.device.confirm.header}"/>
-    <p class="my-2" th:text="#{cas.oauth.device.confirm.message}"/>
-    <div class="banner banner-danger alert alert-danger my-2" th:if="${error}">
-        <a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
-        <span th:utext="#{${'cas.oauth.device.error.' + error}}"/>
-    </div>
-    <form method="post" id="fm1">
-        <section class="cas-field form-group my-3 mdc-input-group">
-            <div class="mdc-input-group-field mdc-input-group-field-append">
-                <div class="d-flex">
-                    <label for="usercode"
-                           class="mdc-text-field caps-check mdc-text-field--outlined control-label mdc-text-field--with-trailing-icon">
-                            <span class="mdc-notched-outline">
-                                <span class="mdc-notched-outline__leading"></span>
-                                <span class="mdc-notched-outline__notch">
-                                    <span class="mdc-floating-label">Code</span>
-                                </span>
-                                <span class="mdc-notched-outline__trailing"></span>
-                            </span>
-                        <input class="mdc-text-field__input form-control pwd"
-                               placeholder="code..."
-                               type="password"
-                               name="usercode"
-                               aria-describedby="code-prefix"
-                               id="usercode"
-                               aria-label="UserCode"
-                               size="25"
-                               autocomplete="off"
-                               required/>
-                        <button
-                                class="reveal-password align-self-end mdc-button mdc-button--unelevated mdc-input-group-append mdc-icon-button btn btn-primary"
-                                tabindex="-1" type="button">
-                            <i class="mdi mdi-eye reveal-password-icon fas fa-eye"></i>
-                            <span class="visually-hidden">Toggle Password</span>
-                        </button>
-                    </label>
-                </div>
-            </div>
-        </section>
-        <input class="mdc-button mdc-button--raised btn btn-primary" name="submit" th:value="#{screen.oauth.confirm.allow}"
-               type="submit" value="Allow"/>
-    </form>
-</div>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/protocol/oauth/deviceCodeApproved.html b/src/main/resources/templates_original/protocol/oauth/deviceCodeApproved.html
deleted file mode 100644
index b6c3c0f..0000000
--- a/src/main/resources/templates_original/protocol/oauth/deviceCodeApproved.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <title th:text="#{cas.oauth.confirm.pagetitle}"></title>
-</head>
-
-<body id="cas">
-    <div layout:fragment="content" class="banner banner-success mdc-card card my-2 p-4 m-auto w-lg-66">
-        <h2 th:text="#{cas.oauth.device.confirmed.header}" />
-        <p th:text="#{cas.oauth.device.confirmed.message}" />
-    </div>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/protocol/oauth/sessionStaleMismatchError.html b/src/main/resources/templates_original/protocol/oauth/sessionStaleMismatchError.html
deleted file mode 100644
index e155092..0000000
--- a/src/main/resources/templates_original/protocol/oauth/sessionStaleMismatchError.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <title th:text="#{cas.oauth.error.pagetitle}"></title>
-</head>
-
-<body id="cas">
-    <div layout:fragment="content" class="banner banner-danger alert alert-danger mdc-card card p-4 m-auto w-lg-66 text-justify">
-        <h2 th:utext="#{cas.oauth.error.header}">Unable to Proceed</h2>
-        <p th:if="${rootCauseException != null and rootCauseException.code != null}"
-            th:utext="#{${rootCauseException.code}}">
-            rootCauseException.code</p>
-    </div>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/protocol/oidc/confirm.html b/src/main/resources/templates_original/protocol/oidc/confirm.html
deleted file mode 100644
index 5cd2517..0000000
--- a/src/main/resources/templates_original/protocol/oidc/confirm.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <title th:text="#{cas.oauth.confirm.pagetitle}"></title>
-</head>
-
-<body id="cas">
-<div layout:fragment="content" class="banner banner-success mdc-card card p-4 m-auto w-lg-66">
-    <h1 th:text="#{screen.oauth.confirm.header}"/>
-
-    <div class="d-flex flex-column align-items-center mb-2">
-        <img th:src="${service.logo}" th:if="${service.logo}"/>
-        <p th:text="${service.description}"/>
-    </div>
-
-    <div id="dynamic" th:if="${dynamic}" class="my-2 banner banner-warning alert alert-warning d-flex align-items-center">
-        <i class="mdi mdi-alert fas fa-exclamation-triangle me-2"></i>
-        <strong th:utext="#{screen.oidc.confirm.dynamic(${dynamicTime})}"/>
-    </div>
-    <div id="scopes" th:unless="${#sets.isEmpty(scopes)}">
-        <h3 class="border-bottom bg-primary p-2" th:text="#{screen.oidc.confirm.scopes}"/>
-        <p th:text="#{screen.oidc.confirm.asksinfo}"/>
-
-        <div th:each="scope : ${scopes}">
-            <span th:id="${scope}">
-                <i class="mdi mdi-cog fas fa-cog" aria-hidden="true"></i>
-                <strong><code th:text="${scope}"/></strong>
-                <p th:utext="#{screen.oidc.confirm.scope.__${scope}__}"/>
-            </span>
-        </div>
-    </div>
-
-    <div id="userInfoClaims" th:unless="${#sets.isEmpty(userInfoClaims)}" class="my-2">
-        <h3 class="border-bottom bg-primary p-2" th:text="#{screen.oidc.confirm.claims}"/>
-        <p th:utext="#{screen.oidc.confirm.asksinfo}"/>
-
-        <div th:each="claim : ${userInfoClaims}">
-            <span th:id="${claim}">
-                <i class="mdi mdi-cog fas fa-cog" aria-hidden="true"></i>
-                <strong><code th:text="${claim}"/></strong>
-                <p th:utext="#{screen.oidc.confirm.claim.__${claim}__}"/>
-            </span>
-        </div>
-    </div>
-
-
-    <div th:if="${service.informationUrl}" class="my-2">
-        <i class="mdi mdi-comment fas fa-comment" aria-hidden="true"></i>
-        <a id="informationUrl" th:href="${service.informationUrl}"
-           th:utext="#{screen.oidc.confirm.infourl(${serviceName})}"/>
-    </div>
-    <div th:if="${service.privacyUrl}" class="my-2">
-        <i class="mdi mdi-eye fas fa-eye" aria-hidden="true"></i>
-        <a id="privacyUrl" th:href="${service.privacyUrl}"
-           th:utext="#{screen.oidc.confirm.privacyurl(${serviceName})}"/>
-    </div>
-
-    <h3 class="strong border-bottom pb-2 mt-4"
-        th:text="#{screen.oauth.confirm.message(${serviceName})}"/>
-    <div class="d-flex">
-        <a class="mdc-button mdc-button--raised btn btn-primary me-2"
-           id="allow"
-           name="allow"
-           th:href="@{${callbackUrl}}">
-            <span class="mdc-button__label" th:utext="#{screen.oauth.confirm.allow}"></span>
-        </a>
-
-        <a class="mdc-button mdc-button--outline btn btn-outline-secondary" id="cancel" name="cancel"
-           th:href="@{/login}">
-            <span class="mdc-button__label" th:text="#{screen.oauth.confirm.deny}">Cancel</span>
-        </a>
-
-        <a th:if="${deniedApprovalUrl}" th:href="@{${deniedApprovalUrl}}"
-           class="mdc-button mdc-button--outline btn btn-outline-secondary" id="deny" name="deny" href="/">
-            <span class="mdc-button__label" th:utext="#{screen.oauth.confirm.deny}"></span>
-        </a>
-    </div>
-</div>
-</div>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/protocol/openid/casOpenIdAssociationSuccessView.html b/src/main/resources/templates_original/protocol/openid/casOpenIdAssociationSuccessView.html
deleted file mode 100644
index 84fff3a..0000000
--- a/src/main/resources/templates_original/protocol/openid/casOpenIdAssociationSuccessView.html
+++ /dev/null
@@ -1,7 +0,0 @@
-ns:[(${ns})]
-enc_mac_key:[(${enc_mac_key})]
-assoc_type:[(${assoc_type})]
-dh_server_public:[(${dh_server_public})]
-session_type:[(${session_type})]
-expires_in:[(${expires_in})]
-assoc_handle:[(${assoc_handle})]
diff --git a/src/main/resources/templates_original/protocol/openid/casOpenIdServiceFailureView.html b/src/main/resources/templates_original/protocol/openid/casOpenIdServiceFailureView.html
deleted file mode 100644
index 31cee8c..0000000
--- a/src/main/resources/templates_original/protocol/openid/casOpenIdServiceFailureView.html
+++ /dev/null
@@ -1,2 +0,0 @@
-ns:[(${ns})]
-is_valid:[(${is_valid})]
diff --git a/src/main/resources/templates_original/protocol/openid/casOpenIdServiceSuccessView.html b/src/main/resources/templates_original/protocol/openid/casOpenIdServiceSuccessView.html
deleted file mode 100644
index 31cee8c..0000000
--- a/src/main/resources/templates_original/protocol/openid/casOpenIdServiceSuccessView.html
+++ /dev/null
@@ -1,2 +0,0 @@
-ns:[(${ns})]
-is_valid:[(${is_valid})]
diff --git a/src/main/resources/templates_original/protocol/openid/user.html b/src/main/resources/templates_original/protocol/openid/user.html
deleted file mode 100644
index 7b45882..0000000
--- a/src/main/resources/templates_original/protocol/openid/user.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta http-equiv="X-XRDS-Location" th:content="${openid_server + '/yadis.xml'}" />
-</head>
-</html>
diff --git a/src/main/resources/templates_original/radius/casRadiusLoginView.html b/src/main/resources/templates_original/radius/casRadiusLoginView.html
deleted file mode 100644
index cdc2512..0000000
--- a/src/main/resources/templates_original/radius/casRadiusLoginView.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{cas.mfa.radius.pagetitle}">Radius Login View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" id="login" class="mdc-card card mdc-card-content w-lg-50 p-4 m-auto">
-        <form method="post" id="fm1" class="fm-v clearfix" th:object="${credential}" th:action="@{/login}">
-            <div class="banner banner-danger alert alert-danger" th:if="${#fields.hasErrors('*')}">
-                <span th:each="err : ${#fields.errors('*')}" th:utext="${err + ' '}">error message</span>
-            </div>
-            <section class="cas-field form-group my-3 mdc-input-group">
-                <div class="d-flex">
-                    <div class="mdc-input-group-field mdc-input-group-field-append">
-                        <label for="token" class="mdc-text-field caps-check mdc-text-field--outlined control-label mdc-text-field--with-trailing-icon">
-                            <span class="mdc-notched-outline">
-                                <span class="mdc-notched-outline__leading"></span>
-                                <span class="mdc-notched-outline__notch">
-                                    <span class="mdc-floating-label" th:utext="#{screen.welcome.label.password}">Token</span>
-                                </span>
-                                <span class="mdc-notched-outline__trailing"></span>
-                            </span>
-                            <input class="mdc-text-field__input form-control pwd"
-                                type="password"
-                                name="token"
-                                id="token"
-                                th:accesskey="#{screen.welcome.label.password.accesskey}"
-                                th:field="*{token}"
-                                size="25"
-                                autocomplete="off"
-                                required />
-                        </label>
-                    </div>
-                    <button class="reveal-password align-self-end mdc-button mdc-button--raised btn btn-primary mdc-input-group-append mdc-icon-button"
-                        tabindex="-1"
-                        type="button">
-                        <i class="mdi mdi-eye fas fa-eye reveal-password-icon"></i>
-                        <span class="visually-hidden">Toggle Password</span>
-                    </button>
-                </div>
-                <div class="mdc-text-field-helper-line caps-warn">
-                    <p
-                        class="mdc-text-field-helper-text form-text text-small mdc-text-field-helper-text--persistent mdc-text-field-helper-text--validation-msg text-danger">
-                        <span th:utext="#{screen.capslock.on}" />
-                    </p>
-                </div>
-            </section>
-            <button class="mdc-button mdc-button--raised btn btn-primary" accesskey="s">
-                <span class="mdc-button__label" th:text="#{screen.welcome.button.login}">Login</span>
-            </button>
-            <input type="hidden" name="_eventId_submit" value="Login"/>
-            <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-            <input type="hidden" name="geolocation"/>
-        </form>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/saml2-discovery/casSamlIdPDiscoveryView.html b/src/main/resources/templates_original/saml2-discovery/casSamlIdPDiscoveryView.html
deleted file mode 100644
index 19ade9f..0000000
--- a/src/main/resources/templates_original/saml2-discovery/casSamlIdPDiscoveryView.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title th:utext="#{screen.saml.idp.discovery}">SAML2 Identity Provider Discovery</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-    <link rel="stylesheet"
-        type="text/css"
-        href="../static/css/samlidp/idpselect.css"
-        th:href="@{/css/samlidp/idpselect.css}" />
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" class="mdc-card card p-4 m-auto w-lg-66">
-        <h2 th:utext="#{screen.saml.idp.discovery}">SAML Identity Provider Discovery</h2>
-        <div id="errorDiv" class="banner banner-danger alert alert-danger" role="alert" style="display:none;"></div>
-        <div id="idpSelect"></div>
-        <script type="text/javascript" th:inline="javascript">
-            /*<![CDATA[*/
-            function IdPSelectUIParametersForCAS(obj) {
-                obj.myEntityID = /*[[${entityIds}]]*/;
-
-                var defaultReturn = location.href;
-                if (!defaultReturn.endsWith("/")) {
-                    defaultReturn += "/";
-                }
-                defaultReturn += "redirect";
-                obj.defaultReturn = defaultReturn;
-
-                var dataSource = /*[[${casServerPrefix}]]*/ ;
-                if (!dataSource.endsWith("/")) {
-                    dataSource += "/";
-                }
-                dataSource += "idp/discovery/feed";
-                obj.dataSource = dataSource;
-
-                obj.returnWhiteList = '^' + /*[[${entityId}]]*/ + '.*$';
-                obj.defaultLogo = /*[[@{/images/shield.png}]]*/  ;
-            }
-        /*]]>*/
-        </script>
-        <script th:src="@{/js/samlidp/idpselect_config.js}"></script>
-        <script th:src="@{/js/samlidp/idpselect.js}"></script>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/saml2-idp/casSamlIdPErrorView.html b/src/main/resources/templates_original/saml2-idp/casSamlIdPErrorView.html
deleted file mode 100644
index eaa17e2..0000000
--- a/src/main/resources/templates_original/saml2-idp/casSamlIdPErrorView.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title>SAML2 Authentication Error</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" class="banner banner-danger alert alert-danger mdc-card card p-4 m-auto w-lg-66 text-justify">
-        <h2>SAML2 Identity Provider Error</h2>
-        <p>
-            The service you are attempting to log into, has identified a problem
-            with your profile or request. Please contact your IT helpdesk for support.
-        </p>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/simple-mfa/casSimpleMfaLoginView.html b/src/main/resources/templates_original/simple-mfa/casSimpleMfaLoginView.html
deleted file mode 100644
index fd68e18..0000000
--- a/src/main/resources/templates_original/simple-mfa/casSimpleMfaLoginView.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{cas.mfa.simple.pagetitle}">CAS Multifactor Authentication View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body>
-
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" id="login" class="mdc-card mdc-card-content card w-lg-50 p-4 m-auto">
-        <form method="post" id="fm1" th:object="${credential}" th:action="@{/login}">
-
-            <div class="banner banner-danger alert alert-danger my-2" th:if="${flowRequestContext.messageContext.hasErrorMessages()}">
-                <p th:each="message : ${flowRequestContext.messageContext.allMessages}"
-                   th:utext="${message.text}">Message Text</p>
-            </div>
-
-            <div class="banner banner-info alert alert-info my-2"
-                 th:unless="${flowRequestContext.messageContext.hasErrorMessages()}">
-                <p th:each="message : ${flowRequestContext.messageContext.allMessages}"
-                   th:utext="${message.text}">Message Text</p>
-            </div>
-
-            <section class="cas-field my-3 mdc-input-group form-group">
-                <div class="mdc-input-group-field mdc-input-group-field-append">
-                    <div class="d-flex caps-check">
-                        <label for="token" class="mdc-text-field mdc-text-field--outlined mdc-text-field--with-trailing-icon control-label">
-                            <span class="mdc-notched-outline">
-                                <span class="mdc-notched-outline__leading"></span>
-                                <span class="mdc-notched-outline__notch">
-                                    <span class="mdc-floating-label"
-                                          th:utext="#{cas.mfa.simple.label.token}">Token</span>
-                                </span>
-                                <span class="mdc-notched-outline__trailing"></span>
-                            </span>
-                            <input class="mdc-text-field__input form-control pwd"
-                                   type="password"
-                                   name="token"
-                                   id="token"
-                                   th:field="*{token}"
-                                   size="25"
-                                   autocomplete="one-time-code" required/>
-                            </label>
-                        </label>
-
-                        <button class="reveal-password mdc-button mdc-button--raised mdc-input-group-append mdc-icon-button"
-                                tabindex="-1"
-                                type="button">
-                            <i class="mdi mdi-eye reveal-password-icon"></i>
-                            <span class="visually-hidden">Toggle Password</span>
-                        </button>
-                    </div>
-                    <div class="mdc-text-field-helper-line caps-warn">
-                        <p class="mdc-text-field-helper-text mdc-text-field-helper-text--persistent mdc-text-field-helper-text--validation-msg text-danger">
-                            <span th:utext="#{screen.capslock.on}"/>
-                        </p>
-                    </div>
-                </div>
-
-            </section>
-            <div class="d-flex">
-                <button class="mdc-button mdc-button--raised me-2" accesskey="s">
-                    <span class="mdc-button__label" th:text="#{screen.welcome.button.login}">Login</span>
-                </button>
-
-                <button class="mdc-button mdc-button--raised" id="resendButton"
-                        name="resend" formnovalidate onclick="$('#eventId').val('resend');">
-                    <span class="mdc-button__label" th:text="#{cas.mfa.simple.label.resend}">Resend</span>
-                </button>
-            </div>
-            <input type="hidden" id="eventId" name="_eventId" value="submit"/>
-            <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-            <input type="hidden" name="geolocation"/>
-        </form>
-
-    </div>
-</main>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/storage/casSessionStorageReadView.html b/src/main/resources/templates_original/storage/casSessionStorageReadView.html
deleted file mode 100644
index 62fddba..0000000
--- a/src/main/resources/templates_original/storage/casSessionStorageReadView.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-<body id="cas">
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" id="login" class="mdc-card p-4 m-auto w-lg-50">
-
-        <form method="post" id="fm1">
-            <input type="hidden" id="sessionStorage" name="sessionStorage"/>
-            <input type="submit" style="display: none" />
-        </form>
-        
-        <script>
-            let payload = readFromSessionStorage();
-            document.getElementById("sessionStorage").value = payload;
-            document.getElementById("fm1").submit();
-        </script>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/storage/casSessionStorageWriteView.html b/src/main/resources/templates_original/storage/casSessionStorageWriteView.html
deleted file mode 100644
index 7efd95d..0000000
--- a/src/main/resources/templates_original/storage/casSessionStorageWriteView.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-<body id="cas">
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" id="login" class="mdc-card p-4 m-auto w-lg-50">
-        <p>Processing request. This might take a few seconds...</p>
-        <div role="progressbar" class="mdc-linear-progress mdc-linear-progress--indeterminate">
-            <div class="mdc-linear-progress__buffer">
-                <div class="mdc-linear-progress__buffer-bar"></div>
-                <div class="mdc-linear-progress__buffer-dots"></div>
-            </div>
-            <div class="mdc-linear-progress__bar mdc-linear-progress__primary-bar">
-                <span class="mdc-linear-progress__bar-inner"></span>
-            </div>
-            <div class="mdc-linear-progress__bar mdc-linear-progress__secondary-bar">
-                <span class="mdc-linear-progress__bar-inner"></span>
-            </div>
-        </div>
-        <script>new mdc.linearProgress.MDCLinearProgress(document.querySelector('.mdc-linear-progress'));</script>
-        <script th:inline="javascript">
-            /*<![CDATA[*/
-
-            let payload = /*[[${sessionStorage.payload}]]*/;
-            writeToSessionStorage(payload);
-            let url = /*[[${sessionStorage.destinationUrl}]]*/;
-            window.location.href = url;
-            /*]]>*/
-        </script>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/surrogate/casSurrogateAuthnListView.html b/src/main/resources/templates_original/surrogate/casSurrogateAuthnListView.html
deleted file mode 100644
index 3bcfad1..0000000
--- a/src/main/resources/templates_original/surrogate/casSurrogateAuthnListView.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title th:text="#{screen.surrogates.account.selection.header}">Surrogate Account Selection View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-    <main role="main" class="container mt-3 mb-3">
-        <div id="content" layout:fragment="content" class="mdc-card card p-4 m-auto w-lg-66">
-            <form method="post" id="loginForm">
-
-                <div class="banner banner-danger alert alert-danger" th:if="${flowRequestContext.messageContext.hasErrorMessages()}">
-                    <span th:each="message : ${flowRequestContext.messageContext.allMessages}"
-                        th:utext="#{${message.text}}">Message Text</span>
-                </div>
-
-                <div id="titlePanel" class="my-3">
-                    <h2 th:text="#{screen.surrogates.choose.account}">Choose Account</h2>
-                    <div id="surrogateInfo" th:utext="#{screen.surrogates.message}">
-                        <p>You are provided with a list of accounts on behalf of which you are allowed to authenticate.
-                        </p>
-                        <p>Select one and continue.</p>
-                    </div>
-                    <label for="surrogateTarget" class="fl-label">Account:</label>
-                    <select name="surrogateTarget" id="surrogateTarget" class="custom-select">
-                        <option th:each="surrogate: ${surrogates}" th:value="${surrogate}" th:text="${surrogate}" />
-                    </select>
-                </div>
-                <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-                <input type="hidden" name="_eventId" value="submit" />
-                <div class="d-flex">
-                    <button class="mdc-button mdc-button--raised btn btn-primary me-2" id="submit" name="submit" accesskey="l"
-                        th:value="#{screen.welcome.button.login}" value="Login">
-                        <span class="mdc-button__label" th:text="#{screen.welcome.button.login}">Login</span>
-                    </button>
-                    <a class="mdc-button mdc-button--outline btn btn-outline-secondary" id="cancel" name="cancel" th:unless="${service}"
-                        th:href="@{/login}">
-                        <span class="mdc-button__label" th:text="#{screen.surrogates.button.cancel}">Cancel</span>
-                    </a>
-                    <a class="mdc-button mdc-button--outline btn btn-outline-secondary" id="login" name="login" th:if="${service}"
-                        th:href="${service.id}">
-                        <span class="mdc-button__label" th:text="#{screen.error.page.loginagain}">Login</span></a>
-                </div>
-            </form>
-        </div>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/surrogate/casSurrogateAuthnWildcardView.html b/src/main/resources/templates_original/surrogate/casSurrogateAuthnWildcardView.html
deleted file mode 100644
index a01400c..0000000
--- a/src/main/resources/templates_original/surrogate/casSurrogateAuthnWildcardView.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{screen.surrogates.account.selection.header}">Surrogate Account Selection View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div id="content" layout:fragment="content" class="mdc-card card p-4 m-auto w-lg-66">
-        <div id="titlePanel" class="my-3">
-            <h2 th:utext="#{screen.surrogates.wildcard.title}">Wildcard Account</h2>
-            <div id="surrogateInfo">
-                <p th:utext="#{screen.surrogates.wildcard.description}">Your account is marked as wildcard.</p>
-            </div>
-        </div>
-    </div>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/swivel/casSwivelLoginView.html b/src/main/resources/templates_original/swivel/casSwivelLoginView.html
deleted file mode 100644
index 28e52b5..0000000
--- a/src/main/resources/templates_original/swivel/casSwivelLoginView.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title th:text="#{cas.mfa.swivel.pagetitle}">Swivel Login View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" id="login" class="mdc-card card mdc-card-content w-lg-50 p-4 m-auto">
-        <h3 th:text="#{cas.mfa.swivel.label.header}">Swivel Authentication</h3>
-        <form method="post" id="fm1" th:object="${credential}" th:action="@{/login}">
-            <div id="msg" class="banner banner-danger alert alert-danger my-2" th:if="${#fields.hasErrors('*')}">
-                <span th:each="err : ${#fields.errors('*')}" th:utext="${err + ' '}">Error message</span>
-            </div>
-            <p class="text-center">
-                <img th:src="@{/swivel/turingImage(principal=${principal})}"
-                    src="http://via.placeholder.com/150x50"/>
-            </p>
-            <section class="cas-field form-group my-3 mdc-input-group">
-                <div class="d-flex">
-                    <div class="mdc-input-group-field mdc-input-group-field-append">
-                        <label for="token" class="mdc-text-field caps-check mdc-text-field--outlined control-label mdc-text-field--with-trailing-icon">
-                            <span class="mdc-notched-outline">
-                                <span class="mdc-notched-outline__leading"></span>
-                                <span class="mdc-notched-outline__notch">
-                                    <span class="mdc-floating-label" th:utext="#{cas.mfa.swivel.label.token}">Token</span>
-                                </span>
-                                <span class="mdc-notched-outline__trailing"></span>
-                            </span>
-                            <input class="mdc-text-field__input form-control pwd"
-                                type="password"
-                                name="token"
-                                id="token"
-                                th:accesskey="#{screen.welcome.label.password.accesskey}"
-                                th:field="*{token}"
-                                size="25"
-                                autocomplete="off"
-                                required />
-                        </label>
-                    </div>
-                    <button class="reveal-password align-self-end mdc-button mdc-button--raised btn btn-primary mdc-input-group-append mdc-icon-button"
-                        tabindex="-1"
-                        type="button">
-                        <i class="mdi mdi-eye fas fa-eye reveal-password-icon"></i>
-                        <span class="visually-hidden">Toggle Password</span>
-                    </button>
-                </div>
-                <div class="mdc-text-field-helper-line caps-warn">
-                    <p
-                        class="mdc-text-field-helper-text form-text text-small mdc-text-field-helper-text--persistent mdc-text-field-helper-text--validation-msg text-danger">
-                        <span th:utext="#{screen.capslock.on}" />
-                    </p>
-                </div>
-            </section>
-            <button class="mdc-button mdc-button--raised" accesskey="s">
-                <span class="mdc-button__label" th:text="#{screen.welcome.button.login}">Login</span>
-            </button>
-            <input type="hidden" name="_eventId_submit" value="Login"/>
-            <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-        </form>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/u2f/casU2fLoginView.html b/src/main/resources/templates_original/u2f/casU2fLoginView.html
deleted file mode 100644
index 5a69301..0000000
--- a/src/main/resources/templates_original/u2f/casU2fLoginView.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title th:text="#{cas.mfa.u2f.pagetitle}">U2f Login View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-    <script th:src="@{/js/u2f/u2f-api.js}"></script>
-
-    <script th:inline="javascript">
-
-        /*<![CDATA[*/
-
-        var appId =  /*[[${u2fAuth.appId}]]*/;
-
-        var version =  /*[[${u2fAuth.version}]]*/;
-
-        var challenge =  /*[[${u2fAuth.challenge}]]*/;
-
-        var keyHandle =  /*[[${u2fAuth.keyHandle}]]*/;
-
-        setTimeout(function () {
-            var registeredKeys = [{ version: version, keyHandle: keyHandle }];
-
-            u2f.sign(appId, challenge, registeredKeys, function (data) {
-                var form = document.getElementById('form');
-                var reg = document.getElementById('tokenResponse');
-                reg.value = JSON.stringify(data);
-                form.submit();
-            });
-        }, 1000);
-
-        /*]]>*/
-
-    </script>
-
-</head>
-
-<body>
-    <main role="main" class="container mt-3 mb-3">
-        <div layout:fragment="content" id="login" class="mdc-card card mdc-card-content w-lg-50 p-4 m-auto">
-            <h3 th:text="#{cas.mfa.u2f.authentication.device}">Authenticate Device</h3>
-            <div th:utext="#{cas.mfa.u2f.authentication.message}" th:remove="tag">
-                <p><strong>Please touch the flashing U2F device now.</strong></p>
-                <p> You may be prompted to allow the site permission to access your security keys. After granting
-                    permission, the device will start to blink.</p>
-            </div>
-
-            <form method="POST" id="form" th:object="${credential}" th:action="@{/login}">
-                <input type="hidden" name="tokenResponse" id="tokenResponse" th:field="*{token}" />
-                <input type="hidden" name="_eventId" value="submit" />
-                <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-                <input type="hidden" name="geolocation" />
-            </form>
-        </div>
-    </main>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates_original/u2f/casU2fRegistrationView.html b/src/main/resources/templates_original/u2f/casU2fRegistrationView.html
deleted file mode 100644
index cbf7e6c..0000000
--- a/src/main/resources/templates_original/u2f/casU2fRegistrationView.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <title th:text="#{cas.mfa.u2f.pagetitle}">U2f Registration View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-    <script th:src="@{/js/u2f/u2f-api.js}"></script>
-
-    <script th:inline="javascript">
-        /*<![CDATA[*/
-
-        setTimeout(function () {
-            var appId =  /*[[${u2fReg.appId}]]*/;
-
-            var version =  /*[[${u2fReg.version}]]*/;
-
-            var challenge =  /*[[${u2fReg.challenge}]]*/;
-
-            var registerRequests = [{ version: version, challenge: challenge }];
-            console.log(appId, registerRequests);
-            u2f.register(appId, registerRequests, [], function (data) {
-                var form = document.getElementById('form');
-                var reg = document.getElementById('tokenResponse');
-                if (data.errorCode) {
-                    console.log('U2F failed: error ' + data.errorCode);
-                    return;
-                }
-                reg.value = JSON.stringify(data);
-                form.submit();
-            });
-        }, 1000);
-
-        /*]]>*/
-    </script>
-
-</head>
-
-<body>
-    <main role="main" class="container mt-3 mb-3">
-        <div layout:fragment="content" id="login" class="mdc-card card mdc-card-content w-lg-50 p-4 m-auto">
-            <h3 th:text="#{cas.mfa.u2f.register.device}">Register Device</h3>
-            <div th:utext="#{cas.mfa.u2f.authentication.message}" th:remove="tag">
-                <p><strong>Please touch the flashing U2F device now.</strong></p>
-                <p>You may be prompted to allow the site permission to access your security keys. After granting
-                    permission, the device will start to blink.</p>
-            </div>
-
-            <form method="POST" id="form">
-                <input type="hidden" name="tokenResponse" id="tokenResponse" />
-                <input type="hidden" name="_eventId" value="submit" />
-                <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-            </form>
-        </div>
-    </main>
-</body>
-
-</html>
diff --git a/src/main/resources/templates_original/webauthn/casWebAuthnLoginView.html b/src/main/resources/templates_original/webauthn/casWebAuthnLoginView.html
deleted file mode 100644
index dfe3738..0000000
--- a/src/main/resources/templates_original/webauthn/casWebAuthnLoginView.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-    <meta name="_csrf" th:content="${_csrf.token}"/>
-    <meta name="_csrf_header" th:content="${_csrf.headerName}"/>
-    <title>Web AuthN Login View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-    
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" id="login">
-        <div th:replace="fragments/webAuthnLogin :: webAuthnLogin">
-            <a href="fragments/webAuthnLogin.html">webAuthnLogin</a>
-        </div>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/webauthn/casWebAuthnRegistrationView.html b/src/main/resources/templates_original/webauthn/casWebAuthnRegistrationView.html
deleted file mode 100644
index e19264e..0000000
--- a/src/main/resources/templates_original/webauthn/casWebAuthnRegistrationView.html
+++ /dev/null
@@ -1,177 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title>Web AuthN Registration View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-
-    <script type="text/javascript" th:src="@{#{webjars.text-encoding.js}}"></script>
-    <script type="text/javascript" th:src="@{#{webjars.text-encoding-indexes.js}}"></script>
-    <script type="text/javascript" th:src="@{#{webjars.whatwg-fetch.js}}"></script>
-    <script type="text/javascript" th:src="@{#{webjars.base64.js}}"></script>
-
-    <script type="text/javascript" th:inline="javascript">
-        /*<![CDATA[*/
-        var appId = /*[[${webauthnApplicationId}]]*/;
-        /*]]>*/
-    </script>
-    <script th:src="@{/js/webauthn/webauthn.js}"></script>
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" id="login">
-
-        <div style="display: none" id="diagnostics">
-            <p>
-                <button class="btn btn-primary" type="button" data-toggle="collapse"
-                        data-target="#serverResponse" aria-expanded="false" aria-controls="serverResponse">
-                    Server Response
-                </button>
-                <button class="btn btn-primary" type="button" data-toggle="collapse"
-                        data-target="#authenticatorResponse" aria-expanded="false" aria-controls="authenticatorResponse">
-                    Authenticator Response
-                </button>
-                <button class="btn btn-primary" type="button" data-toggle="collapse"
-                        data-target="#requestPanel" aria-expanded="false" aria-controls="requestPanel">
-                    Request
-                </button>
-            </p>
-            <div class="collapse" id="serverResponse">
-                <div class="card card-body">
-                    <h4>Server Response:</h4>
-                    <pre id="session"></pre>
-                    <pre id="server-response"></pre>
-                </div>
-            </div>
-            <div class="collapse" id="authenticatorResponse">
-                <div class="card card-body">
-                    <h4>Authenticator Response:</h4>
-                    <pre id="authenticator-response"></pre>
-                </div>
-            </div>
-            <div class="collapse" id="requestPanel">
-                <div class="card card-body">
-                    <h4>WebAuthN Request:</h4>
-                    <pre id="request"></pre>
-                </div>
-            </div>
-        </div>
-
-        <div class="d-flex justify-content-center flex-column align-items-center">
-            <h2 id="status">Register Device</h2>
-            <div id="messages">
-                <p>Assign a friendly-name to your FIDO2-enabled device and then register it with CAS for multifactor
-                    authentication. Once device registration is successfully completed, you will automatically
-                    be redirected to the next step to login with your device.</p>
-            </div>
-            <div id="device-info">
-                <div class="d-flex justify-content-center flex-column align-items-center">
-                    <br>
-                    <img id="device-icon"/>
-                    <br>
-                    <span id="device-name"></span>
-                </div>
-                <br>
-                <p>Your FIDO2-enabled device is now registered with CAS. Please wait...</p>
-            </div>
-            <div>
-                <section id="deviceNamePanel" class="cas-field form-group my-3 mdc-input-group">
-                    <div class="mdc-input-group-field mdc-input-group-field-append">
-                        <br>
-                        <div class="d-flex">
-                            <label for="credentialNickname" class="mdc-text-field mdc-text-field--outlined control-label mdc-text-field--with-trailing-icon">
-                                <span class="mdc-notched-outline">
-                                    <span class="mdc-notched-outline__leading"></span>
-                                    <span class="mdc-notched-outline__notch">
-                                        <span class="mdc-floating-label" th:utext="#{screen.authentication.webauthn.name}">Nickname</span>
-                                    </span>
-                                    <span class="mdc-notched-outline__trailing"></span>
-                                </span>
-                                <input class="mdc-text-field__input form-control"
-                                       type="text"
-                                       name="credentialNickname"
-                                       id="credentialNickname"
-                                       size="50"
-                                       autocomplete="off" required />
-                            </label>
-                            
-                        </div>
-                    </div>
-                </section>
-                <button class="mdc-button mdc-button--raised btn btn-primary me-2"
-                        name="registerButton" id="registerButton" accesskey="r" type="button">
-                    <span class="mdc-button__label" th:text="#{screen.welcome.button.register}">Register Device</span>
-                </button>
-
-                <input type="hidden" id="registerCsrfToken" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
-
-                <section id="residentKeysPanel" class="cas-field my-3 mdc-input-group">
-                    <p>
-                        You may also register your device using <i>Discoverable Credentials / Resident Keys</i>.
-                        This means that the private key and associated metadata is stored in persistent
-                        memory on the authenticator and not on the CAS server.
-                    </p>
-                </section>
-                <button class="mdc-button mdc-button--raised me-2"
-                        name="registerDiscoverableCredentialButton"
-                        id="registerDiscoverableCredentialButton" accesskey="d" type="button">
-                        <span class="mdc-button__label"
-                              th:text="#{screen.welcome.button.register-residentkey}">Register Device with Discoverable Credentials</span>
-                </button>
-
-                <!--
-                <button class="mdc-button mdc-button--raised btn btn-primary me-2"
-                        id="logoutButton" disabled="disabled" name="logout"
-                        accesskey="l" type="button" onclick="javascript:logout();">
-                <span class="mdc-button__label"
-                      th:text="#{screen.welcome.button.logout}">Logout</span>
-                </button>
-                <button class="mdc-button mdc-button--raised btn btn-primary me-2"
-                        id="deregisterButton" name="deregister"
-                        accesskey="d" type="button" onclick="javascript:deregister();">
-                <span class="mdc-button__label"
-                      th:text="#{screen.welcome.button.deregister}">Deregister</span>
-                </button>
-                -->
-            </div>
-
-
-        </div>
-
-        <form method="POST" class="fm-v clearfix" id="form" th:action="@{/login}">
-            <input type="hidden" name="_eventId" value="submit"/>
-            <input type="hidden" id="sessionToken" name="sessionToken" />
-            <input type="hidden" name="geolocation"/>
-            <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-        </form>
-
-        <script type="text/javascript">
-            const csrfToken = $('#registerCsrfToken').val();
-
-            document.getElementById("credentialNickname").value = randomWord();
-            var btn = document.getElementById('registerButton');
-            btn.addEventListener('click', function (event) {
-                const username = '[[${principal.id}]]';
-                const displayName = '[[${displayName}]]';
-                const credentialNickname = $('#credentialNickname').val();
-                register(username, displayName, credentialNickname, csrfToken);
-            }, false);
-
-            var btnResident = document.getElementById('registerDiscoverableCredentialButton');
-            btnResident.addEventListener('click', function (event) {
-                const username = '[[${principal.id}]]';
-                const displayName = '[[${displayName}]]';
-                const credentialNickname = $('#credentialNickname').val();
-                register(username, displayName, credentialNickname, csrfToken, true);
-            }, false);
-
-        </script>
-
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/wsfed/casWsFedStopWebflow.html b/src/main/resources/templates_original/wsfed/casWsFedStopWebflow.html
deleted file mode 100644
index 5cde42a..0000000
--- a/src/main/resources/templates_original/wsfed/casWsFedStopWebflow.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title>Wsfederation Webflow Stopped</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag" />
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" class="banner banner-danger alert alert-danger mdc-card card p-4 m-auto w-lg-66 text-justify">
-        Either the authentication request was rejected/cancelled, or
-        the authentication provider denied access due to permissions, etc. Review logs to find the root cause of
-        the issue.
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/yubikey/casYubiKeyLoginView.html b/src/main/resources/templates_original/yubikey/casYubiKeyLoginView.html
deleted file mode 100644
index 8b32e5f..0000000
--- a/src/main/resources/templates_original/yubikey/casYubiKeyLoginView.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{cas.mfa.yubikey.pagetitle}">YubiKey Login View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" id="login" class="mdc-card card mdc-card-content w-lg-50 p-4 m-auto">
-        <form method="post" id="yubiKeyForm" th:object="${credential}" th:action="@{/login}">
-            <h3 th:text="#{cas.mfa.yubikey.authenticate}">
-                Use your registered YubiKey device to authenticate.
-            </h3>
-
-            <div class="banner banner-danger alert alert-danger my-2" th:if="${#fields.hasErrors('*')}">
-                <span th:each="err : ${#fields.errors('*')}" th:utext="${err + ' '}">Error message</span>
-            </div>
-            <section class="cas-field form-group my-3 mdc-input-group">
-                <div class="mdc-input-group-field mdc-input-group-field-append">
-                    <div class="d-flex">
-                        <label for="token"
-                               class="mdc-text-field caps-check mdc-text-field--outlined control-label mdc-text-field--with-trailing-icon">
-                            <span class="mdc-notched-outline">
-                                <span class="mdc-notched-outline__leading"></span>
-                                <span class="mdc-notched-outline__notch">
-                                    <span class="mdc-floating-label" th:utext="#{screen.welcome.label.password}">Token</span>
-                                </span>
-                                <span class="mdc-notched-outline__trailing"></span>
-                            </span>
-                            <input class="mdc-text-field__input form-control pwd"
-                                   type="password"
-                                   name="token"
-                                   id="token"
-                                   th:field="*{token}"
-                                   size="25"
-                                   autocomplete="off"
-                                   required/>
-                            <button
-                                    class="reveal-password align-self-end mdc-button mdc-button--unelevated mdc-input-group-append mdc-icon-button btn btn-primary"
-                                    tabindex="-1" type="button">
-                                <i class="mdi mdi-eye reveal-password-icon fas fa-eye"></i>
-                                <span class="visually-hidden">Toggle Password</span>
-                            </button>
-                        </label>
-                    </div>
-
-                </div>
-                <div class="mdc-text-field-helper-line caps-warn">
-                    <p
-                            class="mdc-text-field-helper-text form-text text-small mdc-text-field-helper-text--persistent mdc-text-field-helper-text--validation-msg text-danger">
-                        <span th:utext="#{screen.capslock.on}"/>
-                    </p>
-                </div>
-            </section>
-            <button class="mdc-button mdc-button--raised btn btn-primary"
-                    accesskey="l"
-                    type="submit">
-                <span class="mdc-button__label" th:text="#{screen.welcome.button.login}">Login</span>
-            </button>
-            <input type="hidden" name="_eventId_submit" value="Login"/>
-            <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-            <input type="hidden" name="geolocation"/>
-        </form>
-
-        <form method="post" id="fm2" th:if="${yubikeyMultipleDeviceRegistrationEnabled}">
-            <p>
-            <hr width="75%">
-            <p th:utext="#{screen.authentication.yubikey.reganotherdevice}"></p>
-            <input type="hidden" name="_eventId_register" value="register"/>
-            <input type="hidden" name="execution" th:value="${flowExecutionKey}"/>
-            <button class="mdc-button mdc-button--raised btn btn-primary me-2" type="submit" name="register" accesskey="r" value="Register">
-                <span class="mdc-button__label" th:text="#{screen.welcome.button.register}">Register</span>
-            </button>
-        </form>
-    </div>
-</main>
-</body>
-</html>
diff --git a/src/main/resources/templates_original/yubikey/casYubiKeyRegistrationView.html b/src/main/resources/templates_original/yubikey/casYubiKeyRegistrationView.html
deleted file mode 100644
index bbbf259..0000000
--- a/src/main/resources/templates_original/yubikey/casYubiKeyRegistrationView.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
-
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
-
-    <title th:text="#{cas.mfa.yubikey.pagetitle}">YubiKey Registration View</title>
-    <link href="../../static/css/cas.css" rel="stylesheet" th:remove="tag"/>
-</head>
-
-<body>
-<main role="main" class="container mt-3 mb-3">
-    <div layout:fragment="content" id="login" class="mdc-card mdc-card-content w-lg-50 p-4 m-auto">
-        <form method="post" id="yubiKeyForm">
-            <div class="banner banner-danger my-2" th:if="${flowRequestContext.messageContext.hasErrorMessages()}">
-                <p th:each="message : ${flowRequestContext.messageContext.allMessages}"
-                   th:utext="#{${message.text}}">Message Text</p>
-            </div>
-            <div class="alert alert-info" th:text="#{cas.mfa.yubikey.register}">
-                Your device is not yet registered. Use the below form to register your device with CAS.
-            </div>
-            <section class="cas-field my-3 mdc-input-group">
-                <div class="mdc-input-group-field mdc-input-group-field-append">
-                    <div class="d-flex caps-check">
-                        <label for="token"
-                               class="mdc-text-field mdc-text-field--outlined mdc-text-field--with-trailing-icon">
-                            <input class="mdc-text-field__input pwd"
-                                   type="password"
-                                   name="token"
-                                   id="token"
-                                   size="50"
-                                   autocomplete="off" required/>
-                            <span class="mdc-notched-outline">
-                                <span class="mdc-notched-outline__leading"></span>
-                                <span class="mdc-notched-outline__notch">
-                                    <span class="mdc-floating-label" th:utext="#{cas.mfa.yubikey.label.token}">Token</span>
-                                </span>
-                                <span class="mdc-notched-outline__trailing"></span>
-                            </span>
-                            <button
-                                    class="reveal-password align-self-end mdc-button mdc-button--unelevated mdc-input-group-append mdc-icon-button btn btn-primary"
-                                    tabindex="-1" type="button">
-                                <i class="mdi mdi-eye reveal-password-icon fas fa-eye"></i>
-                                <span class="visually-hidden">Toggle Password</span>
-                            </button>
-                        </label>
-                    </div>
-                </div>
-                <div class="mdc-text-field-helper-line caps-warn">
-                    <p
-                        class="mdc-text-field-helper-text form-text text-small mdc-text-field-helper-text--persistent mdc-text-field-helper-text--validation-msg text-danger">
-                        <span th:utext="#{screen.capslock.on}" />
-                    </p>
-                </div>
-            </section>
-            <div class="d-flex">
-                <label for="accountName" class="mdc-text-field mdc-text-field--outlined control-label">
-                    <span class="mdc-notched-outline">
-                        <span class="mdc-notched-outline__leading"></span>
-                        <span class="mdc-notched-outline__notch">
-                            <span class="mdc-floating-label" th:utext="#{screen.authentication.yubikey.name}">Token</span>
-                        </span>
-                        <span class="mdc-notched-outline__trailing"></span>
-                    </span>
-                    <input class="mdc-text-field__input form-control"
-                            type="text"
-                            name="accountName"
-                            id="accountName"
-                            size="50"
-                            autocomplete="off" required />
-                </label>
-                <script>document.getElementById("accountName").value = randomWord();</script>
-            </div>
-            <br>
-            <button class="mdc-button mdc-button--raised btn btn-primary" accesskey="s">
-                <span class="mdc-button__label" th:text="#{screen.welcome.button.register}">Register</span>
-            </button>
-            <input type="hidden" name="_eventId_submit" value="Register" />
-            <input type="hidden" name="execution" th:value="${flowExecutionKey}" />
-        </form>
-    </div>
-</main>
-</body>
-
-</html>