From efba8285c7b1d8bba1241a006ba2840fe1a7452b Mon Sep 17 00:00:00 2001
From: Kevin <kevin@stephek.co.uk>
Date: Fri, 3 Apr 2020 15:43:24 +0100
Subject: [PATCH 1/4] CON-1619-remove-feature-toggle

---
 .../WhenAgreementToSign.cs                    |  78 +-------
 .../WhenAgreementToSign.cs                    |  18 +-
 .../WhenFundsToReserve.cs                     |  28 ++-
 .../WhenSetupSingleApprentice.cs              |   8 +-
 .../WhenSetupSingleApprenticeByProvider.cs    |   9 +-
 .../WhenSetupSingleApprenticeStatus.cs        |   9 +-
 .../WhenSetupSingleReservation.cs             |  10 +-
 .../WhenFundsToReserve.cs                     |  98 ++--------
 .../WhenNoPayeScheme.cs                       |  59 +------
 .../WhenSupportUserBannerIsRendered.cs        |  17 +-
 .../WhenVacancyInProgress.cs                  |   8 +-
 .../Extensions/HtmlHelperExtensionsTests.cs   |  23 +--
 .../WhenGettingAccount.cs                     |   2 +-
 .../WhenIChangeATeamMemberRole.cs             |   2 +-
 .../WhenIGetATeamMembersDetails.cs            |   2 +-
 .../WhenIGetMyTeamMembers.cs                  |   2 +-
 .../WhenIInviteATeamMember.cs                 |   2 +-
 .../WhenIRemoveATeamMember.cs                 |   2 +-
 .../Controllers/BaseController.cs             |  10 +-
 .../Controllers/EmployerTeamController.cs     | 156 +---------------
 .../FeatureToggles/FeatureToggleViewEngine.cs |  14 --
 .../Global.asax.cs                            |   4 -
 .../Orchestrators/EmployerTeamOrchestrator.cs |  14 +-
 .../SFA.DAS.EmployerAccounts.Web.csproj       |  30 +---
 .../ViewModels/CallToActionViewModel.cs       |   5 +
 .../Views/EmployerTeam/Dashboard.cshtml       |  84 ---------
 .../Views/EmployerTeam/{V2 => }/Empty.cshtml  |   0
 .../EmployerTeam/{V2 => }/Row1Panel1.cshtml   |   0
 .../Views/EmployerTeam/Tasks.cshtml           |  89 ----------
 .../EmployerTeam/V2/AccountSettings.cshtml    |   9 -
 .../V2/ApprenticeshipDetails.cshtml           |  28 ---
 .../EmployerTeam/V2/CreateVacancy.cshtml      |   6 -
 .../V2/FinancialTransactions.cshtml           |   4 -
 .../EmployerTeam/V2/FundingComplete.cshtml    |  14 --
 .../Views/EmployerTeam/V2/Index.cshtml        |  77 --------
 .../EmployerTeam/V2/MostActiveLinks.cshtml    |  29 ---
 .../EmployerTeam/V2/MultipleVacancies.cshtml  |   6 -
 .../V2/NotCurrentlyInStorage.cshtml           |   3 -
 .../EmployerTeam/V2/OtherTasksPanel.cshtml    | 167 ------------------
 .../EmployerTeam/V2/PrePAYERecruitment.cshtml |   5 -
 .../V2/ProviderPermissions.cshtml             |   7 -
 .../V2/ProviderPermissionsDenied.cshtml       |   6 -
 .../V2/ProviderPermissionsMultiple.cshtml     |   7 -
 .../Views/EmployerTeam/V2/Row1Panel2.cshtml   |   5 -
 .../Views/EmployerTeam/V2/Row2Panel1.cshtml   |   5 -
 .../Views/EmployerTeam/V2/Row2Panel2.cshtml   |   5 -
 .../Views/EmployerTeam/V2/SearchBar.cshtml    |  22 ---
 .../EmployerTeam/V2/SingleProvider.cshtml     |  29 ---
 .../Views/EmployerTeam/V2/V2AddPaye.cshtml    |   6 -
 .../EmployerTeam/V2/V2CheckFunding.cshtml     |   7 -
 .../EmployerTeam/V2/V2SignAgreement.cshtml    |   5 -
 .../EmployerTeam/V2/VacancyStatus.cshtml      |  22 ---
 52 files changed, 101 insertions(+), 1156 deletions(-)
 delete mode 100644 src/SFA.DAS.EmployerAccounts.Web/FeatureToggles/FeatureToggleViewEngine.cs
 delete mode 100644 src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/Dashboard.cshtml
 rename src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/{V2 => }/Empty.cshtml (100%)
 rename src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/{V2 => }/Row1Panel1.cshtml (100%)
 delete mode 100644 src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/Tasks.cshtml
 delete mode 100644 src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/AccountSettings.cshtml
 delete mode 100644 src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/ApprenticeshipDetails.cshtml
 delete mode 100644 src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/CreateVacancy.cshtml
 delete mode 100644 src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/FinancialTransactions.cshtml
 delete mode 100644 src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/FundingComplete.cshtml
 delete mode 100644 src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/Index.cshtml
 delete mode 100644 src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/MostActiveLinks.cshtml
 delete mode 100644 src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/MultipleVacancies.cshtml
 delete mode 100644 src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/NotCurrentlyInStorage.cshtml
 delete mode 100644 src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/OtherTasksPanel.cshtml
 delete mode 100644 src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/PrePAYERecruitment.cshtml
 delete mode 100644 src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/ProviderPermissions.cshtml
 delete mode 100644 src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/ProviderPermissionsDenied.cshtml
 delete mode 100644 src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/ProviderPermissionsMultiple.cshtml
 delete mode 100644 src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/Row1Panel2.cshtml
 delete mode 100644 src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/Row2Panel1.cshtml
 delete mode 100644 src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/Row2Panel2.cshtml
 delete mode 100644 src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/SearchBar.cshtml
 delete mode 100644 src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/SingleProvider.cshtml
 delete mode 100644 src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/V2AddPaye.cshtml
 delete mode 100644 src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/V2CheckFunding.cshtml
 delete mode 100644 src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/V2SignAgreement.cshtml
 delete mode 100644 src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/VacancyStatus.cshtml

diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenAgreementToSign.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenAgreementToSign.cs
index 753f671f09..5776acaade 100644
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenAgreementToSign.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenAgreementToSign.cs
@@ -2,7 +2,6 @@
 using Moq;
 using NUnit.Framework;
 using SFA.DAS.Authentication;
-using SFA.DAS.Authorization.Services;
 using SFA.DAS.EmployerAccounts.Interfaces;
 using SFA.DAS.EmployerAccounts.Web.Controllers;
 using SFA.DAS.EmployerAccounts.Web.Orchestrators;
@@ -15,7 +14,6 @@ public class WhenAgreementToSign
         private EmployerTeamController _controller;
 
         private Mock<IAuthenticationService> mockAuthenticationService;
-        private Mock<IAuthorizationService> mockAuthorizationService;
         private Mock<IMultiVariantTestingService> mockMultiVariantTestingService;
         private Mock<ICookieStorageService<FlashMessageViewModel>> mockCookieStorageService;
         private Mock<EmployerTeamOrchestrator> mockEmployerTeamOrchestrator;
@@ -24,94 +22,36 @@ public class WhenAgreementToSign
         public void Arrange()
         {
             mockAuthenticationService = new Mock<IAuthenticationService>();
-            mockAuthorizationService = new Mock<IAuthorizationService>();
             mockMultiVariantTestingService = new Mock<IMultiVariantTestingService>();
             mockCookieStorageService = new Mock<ICookieStorageService<FlashMessageViewModel>>();
             mockEmployerTeamOrchestrator = new Mock<EmployerTeamOrchestrator>();
-            mockAuthorizationService.Setup(m => m.IsAuthorized("EmployerFeature.CallToAction")).Returns(false);
 
             _controller = new EmployerTeamController(
                 mockAuthenticationService.Object,
                 mockMultiVariantTestingService.Object,
                 mockCookieStorageService.Object,
-                mockEmployerTeamOrchestrator.Object,
-                mockAuthorizationService.Object);
+                mockEmployerTeamOrchestrator.Object);
         }
 
         [Test]
         public void ThenTheSignAgreementViewIsReturnedAtRow1Panel1()
         {
             // Arrange
-            var model = new AccountDashboardViewModel();
-            model.PayeSchemeCount = 1;
-            model.CallToActionViewModel = new CallToActionViewModel
+            var model = new AccountDashboardViewModel
             {
-                AgreementsToSign = true
-            };
-            
-            //Act
-            var result = _controller.Row1Panel1(model) as PartialViewResult;
-
-            //Assert
-            Assert.IsNotNull(result);
-            Assert.AreEqual("Empty", (result.Model as dynamic).ViewName);
-        }
-
-        [Test]
-        public void ThenTheTasksViewIsReturnedAtRow1Panel2()
-        {
-            // Arrange
-            var model = new AccountDashboardViewModel();
-            model.PayeSchemeCount = 1;
-            model.CallToActionViewModel = new CallToActionViewModel
-            {
-                AgreementsToSign = true
+                PayeSchemeCount = 1,
+                CallToActionViewModel = new CallToActionViewModel
+                {
+                    AgreementsToSign = true
+                }
             };
 
             //Act
-            var result = _controller.Row1Panel2(model) as PartialViewResult;
-
-            //Assert
-            Assert.IsNotNull(result);
-            Assert.AreEqual("Tasks", (result.Model as dynamic).ViewName);
-        }
-
-        [Test]
-        public void ThenTheDashboardViewIsReturnedAtRow2Panel1()
-        {
-            // Arrange
-            var model = new AccountDashboardViewModel();
-            model.PayeSchemeCount = 1;
-            model.CallToActionViewModel = new CallToActionViewModel
-            {
-                AgreementsToSign = true
-            };
-
-            //Act
-            var result = _controller.Row2Panel1(model) as PartialViewResult;
-
-            //Assert
-            Assert.IsNotNull(result);
-            Assert.AreEqual("Dashboard", (result.Model as dynamic).ViewName);
-        }
-
-        [Test]
-        public void ThenTheEmptyViewIsReturnedAtRow2Panel2()
-        {
-            // Arrange
-            var model = new AccountDashboardViewModel();
-            model.PayeSchemeCount = 1;
-            model.CallToActionViewModel = new CallToActionViewModel
-            {
-                AgreementsToSign = true
-            };
-
-            //Act
-            var result = _controller.Row2Panel2(model) as PartialViewResult;
+            var result = _controller.Row1Panel1(model) as PartialViewResult;
 
             //Assert
             Assert.IsNotNull(result);
-            Assert.AreEqual("Empty", (result.Model as dynamic).ViewName);
+            Assert.AreEqual("SignAgreement", (result.Model as dynamic).ViewName);
         }
     }
 }
diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenAgreementToSign.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenAgreementToSign.cs
index 043e9c7753..dd34f60248 100644
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenAgreementToSign.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenAgreementToSign.cs
@@ -2,7 +2,6 @@
 using Moq;
 using NUnit.Framework;
 using SFA.DAS.Authentication;
-using SFA.DAS.Authorization.Services;
 using SFA.DAS.EmployerAccounts.Interfaces;
 using SFA.DAS.EmployerAccounts.Web.Controllers;
 using SFA.DAS.EmployerAccounts.Web.Orchestrators;
@@ -15,7 +14,6 @@ public class WhenAgreementToSign
         private EmployerTeamController _controller;
 
         private Mock<IAuthenticationService> mockAuthenticationService;
-        private Mock<IAuthorizationService> mockAuthorizationService;
         private Mock<IMultiVariantTestingService> mockMultiVariantTestingService;
         private Mock<ICookieStorageService<FlashMessageViewModel>> mockCookieStorageService;
         private Mock<EmployerTeamOrchestrator> mockEmployerTeamOrchestrator;
@@ -24,30 +22,28 @@ public class WhenAgreementToSign
         public void Arrange()
         {
             mockAuthenticationService = new Mock<IAuthenticationService>();
-            mockAuthorizationService = new Mock<IAuthorizationService>();
             mockMultiVariantTestingService = new Mock<IMultiVariantTestingService>();
             mockCookieStorageService = new Mock<ICookieStorageService<FlashMessageViewModel>>();
             mockEmployerTeamOrchestrator = new Mock<EmployerTeamOrchestrator>();
-            mockAuthorizationService.Setup(m => m.IsAuthorized("EmployerFeature.HomePage")).Returns(false);
-            mockAuthorizationService.Setup(m => m.IsAuthorized("EmployerFeature.CallToAction")).Returns(true);
 
             _controller = new EmployerTeamController(
                 mockAuthenticationService.Object,
                 mockMultiVariantTestingService.Object,
                 mockCookieStorageService.Object,
-                mockEmployerTeamOrchestrator.Object,
-                mockAuthorizationService.Object);
+                mockEmployerTeamOrchestrator.Object);
         }
 
         [Test]
         public void ThenTheSignAgreementViewIsReturnedAtRow1Panel1()
         {
             // Arrange
-            var model = new AccountDashboardViewModel();
-            model.PayeSchemeCount = 1;
-            model.CallToActionViewModel = new CallToActionViewModel
+            var model = new AccountDashboardViewModel
             {
-                AgreementsToSign = true
+                PayeSchemeCount = 1,
+                CallToActionViewModel = new CallToActionViewModel
+                {
+                    AgreementsToSign = true
+                }
             };
 
             //Act
diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenFundsToReserve.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenFundsToReserve.cs
index 2a172c70cf..de5174e185 100644
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenFundsToReserve.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenFundsToReserve.cs
@@ -3,7 +3,6 @@
 using Moq;
 using NUnit.Framework;
 using SFA.DAS.Authentication;
-using SFA.DAS.Authorization.Services;
 using SFA.DAS.EmployerAccounts.Interfaces;
 using SFA.DAS.EmployerAccounts.Models.Reservations;
 using SFA.DAS.EmployerAccounts.Web.Controllers;
@@ -17,7 +16,6 @@ public class WhenFundsToReserve
         private EmployerTeamController _controller;
 
         private Mock<IAuthenticationService> mockAuthenticationService;
-        private Mock<IAuthorizationService> mockAuthorizationService;
         private Mock<IMultiVariantTestingService> mockMultiVariantTestingService;
         private Mock<ICookieStorageService<FlashMessageViewModel>> mockCookieStorageService;
         private Mock<EmployerTeamOrchestrator> mockEmployerTeamOrchestrator;
@@ -26,19 +24,15 @@ public class WhenFundsToReserve
         public void Arrange()
         {
             mockAuthenticationService = new Mock<IAuthenticationService>();
-            mockAuthorizationService = new Mock<IAuthorizationService>();
             mockMultiVariantTestingService = new Mock<IMultiVariantTestingService>();
             mockCookieStorageService = new Mock<ICookieStorageService<FlashMessageViewModel>>();
             mockEmployerTeamOrchestrator = new Mock<EmployerTeamOrchestrator>();
 
-            mockAuthorizationService.Setup(m => m.IsAuthorized("EmployerFeature.CallToAction")).Returns(true);
-
             _controller = new EmployerTeamController(
                 mockAuthenticationService.Object,
                 mockMultiVariantTestingService.Object,
                 mockCookieStorageService.Object,
-                mockEmployerTeamOrchestrator.Object,
-                mockAuthorizationService.Object);
+                mockEmployerTeamOrchestrator.Object);
         }
 
         [Test]
@@ -69,17 +63,19 @@ public void ThenForNonLevyTheCheckFundingViewIsReturnedAtRow1Panel1()
         public void ThenForNonLevyTheContinueSetupForSingleReservationViewIsReturnedAtRow1Panel1()
         {
             // Arrange
-            var model = new AccountDashboardViewModel();
-            model.PayeSchemeCount = 1;
-            model.CallToActionViewModel = new CallToActionViewModel
+            var model = new AccountDashboardViewModel
             {
-                AgreementsToSign = false,
-                Reservations = new List<Reservation> { new Reservation { Status = ReservationStatus.Pending } },
-                VacanciesViewModel = new VacanciesViewModel()
+                PayeSchemeCount = 1,
+                CallToActionViewModel = new CallToActionViewModel
+                {
+                    AgreementsToSign = false,
+                    Reservations = new List<Reservation> { new Reservation { Status = ReservationStatus.Pending } },
+                    VacanciesViewModel = new VacanciesViewModel()
+                },
+
+                ApprenticeshipEmployerType = Common.Domain.Types.ApprenticeshipEmployerType.NonLevy
             };
-            
-            model.ApprenticeshipEmployerType = Common.Domain.Types.ApprenticeshipEmployerType.NonLevy;
-            
+
             //Act
             var result = _controller.Row1Panel1(model) as PartialViewResult;
 
diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenSetupSingleApprentice.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenSetupSingleApprentice.cs
index d18178923e..b86bfd1861 100644
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenSetupSingleApprentice.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenSetupSingleApprentice.cs
@@ -18,7 +18,6 @@ public class WhenSetupSingleApprentice
         private EmployerTeamController _controller;
 
         private Mock<IAuthenticationService> mockAuthenticationService;
-        private Mock<IAuthorizationService> mockAuthorizationService;
         private Mock<IMultiVariantTestingService> mockMultiVariantTestingService;
         private Mock<ICookieStorageService<FlashMessageViewModel>> mockCookieStorageService;
         private Mock<EmployerTeamOrchestrator> mockEmployerTeamOrchestrator;
@@ -27,20 +26,15 @@ public class WhenSetupSingleApprentice
         public void Arrange()
         {
             mockAuthenticationService = new Mock<IAuthenticationService>();
-            mockAuthorizationService = new Mock<IAuthorizationService>();
             mockMultiVariantTestingService = new Mock<IMultiVariantTestingService>();
             mockCookieStorageService = new Mock<ICookieStorageService<FlashMessageViewModel>>();
             mockEmployerTeamOrchestrator = new Mock<EmployerTeamOrchestrator>();
 
-            mockAuthorizationService.Setup(m => m.IsAuthorized("EmployerFeature.HomePage")).Returns(false);
-            mockAuthorizationService.Setup(m => m.IsAuthorized("EmployerFeature.CallToAction")).Returns(true);
-
             _controller = new EmployerTeamController(
                 mockAuthenticationService.Object,
                 mockMultiVariantTestingService.Object,
                 mockCookieStorageService.Object,
-                mockEmployerTeamOrchestrator.Object,
-                mockAuthorizationService.Object);
+                mockEmployerTeamOrchestrator.Object);
         }        
 
         [Test]
diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenSetupSingleApprenticeByProvider.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenSetupSingleApprenticeByProvider.cs
index b6dd6b010a..637b3485ec 100644
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenSetupSingleApprenticeByProvider.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenSetupSingleApprenticeByProvider.cs
@@ -3,7 +3,6 @@
 using Moq;
 using NUnit.Framework;
 using SFA.DAS.Authentication;
-using SFA.DAS.Authorization.Services;
 using SFA.DAS.EmployerAccounts.Interfaces;
 using SFA.DAS.EmployerAccounts.Models.CommitmentsV2;
 using SFA.DAS.EmployerAccounts.Models.Reservations;
@@ -18,7 +17,6 @@ public class WhenSetupSingleApprenticeByProvider
         private EmployerTeamController _controller;
 
         private Mock<IAuthenticationService> mockAuthenticationService;
-        private Mock<IAuthorizationService> mockAuthorizationService;
         private Mock<IMultiVariantTestingService> mockMultiVariantTestingService;
         private Mock<ICookieStorageService<FlashMessageViewModel>> mockCookieStorageService;
         private Mock<EmployerTeamOrchestrator> mockEmployerTeamOrchestrator;        
@@ -27,20 +25,15 @@ public class WhenSetupSingleApprenticeByProvider
         public void Arrange()
         {
             mockAuthenticationService = new Mock<IAuthenticationService>();
-            mockAuthorizationService = new Mock<IAuthorizationService>();
             mockMultiVariantTestingService = new Mock<IMultiVariantTestingService>();
             mockCookieStorageService = new Mock<ICookieStorageService<FlashMessageViewModel>>();
             mockEmployerTeamOrchestrator = new Mock<EmployerTeamOrchestrator>();            
 
-            mockAuthorizationService.Setup(m => m.IsAuthorized("EmployerFeature.HomePage")).Returns(false);
-            mockAuthorizationService.Setup(m => m.IsAuthorized("EmployerFeature.CallToAction")).Returns(true);
-
             _controller = new EmployerTeamController(
                 mockAuthenticationService.Object,
                 mockMultiVariantTestingService.Object,
                 mockCookieStorageService.Object,
-                mockEmployerTeamOrchestrator.Object,                
-                mockAuthorizationService.Object);
+                mockEmployerTeamOrchestrator.Object);
         }
 
         [Test]
diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenSetupSingleApprenticeStatus.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenSetupSingleApprenticeStatus.cs
index 8efbef0d4a..19689d11ec 100644
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenSetupSingleApprenticeStatus.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenSetupSingleApprenticeStatus.cs
@@ -3,7 +3,6 @@
 using Moq;
 using NUnit.Framework;
 using SFA.DAS.Authentication;
-using SFA.DAS.Authorization.Services;
 using SFA.DAS.EmployerAccounts.Interfaces;
 using SFA.DAS.EmployerAccounts.Models.CommitmentsV2;
 using SFA.DAS.EmployerAccounts.Models.Reservations;
@@ -18,7 +17,6 @@ public class WhenSetupSingleApprenticeStatus
         private EmployerTeamController _controller;
 
         private Mock<IAuthenticationService> mockAuthenticationService;
-        private Mock<IAuthorizationService> mockAuthorizationService;
         private Mock<IMultiVariantTestingService> mockMultiVariantTestingService;
         private Mock<ICookieStorageService<FlashMessageViewModel>> mockCookieStorageService;
         private Mock<EmployerTeamOrchestrator> mockEmployerTeamOrchestrator;
@@ -27,20 +25,15 @@ public class WhenSetupSingleApprenticeStatus
         public void Arrange()
         {
             mockAuthenticationService = new Mock<IAuthenticationService>();
-            mockAuthorizationService = new Mock<IAuthorizationService>();
             mockMultiVariantTestingService = new Mock<IMultiVariantTestingService>();
             mockCookieStorageService = new Mock<ICookieStorageService<FlashMessageViewModel>>();
             mockEmployerTeamOrchestrator = new Mock<EmployerTeamOrchestrator>();
 
-            mockAuthorizationService.Setup(m => m.IsAuthorized("EmployerFeature.HomePage")).Returns(false);
-            mockAuthorizationService.Setup(m => m.IsAuthorized("EmployerFeature.CallToAction")).Returns(true);
-
             _controller = new EmployerTeamController(
                 mockAuthenticationService.Object,
                 mockMultiVariantTestingService.Object,
                 mockCookieStorageService.Object,
-                mockEmployerTeamOrchestrator.Object,
-                mockAuthorizationService.Object);
+                mockEmployerTeamOrchestrator.Object);
         }
 
         [Test]
diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenSetupSingleReservation.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenSetupSingleReservation.cs
index c8db181f7e..df6185f5bc 100644
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenSetupSingleReservation.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenSetupSingleReservation.cs
@@ -3,7 +3,6 @@
 using Moq;
 using NUnit.Framework;
 using SFA.DAS.Authentication;
-using SFA.DAS.Authorization.Services;
 using SFA.DAS.EmployerAccounts.Interfaces;
 using SFA.DAS.EmployerAccounts.Models.Reservations;
 using SFA.DAS.EmployerAccounts.Web.Controllers;
@@ -17,7 +16,6 @@ public class WhenSetupSingleReservation
         private EmployerTeamController _controller;
 
         private Mock<IAuthenticationService> mockAuthenticationService;
-        private Mock<IAuthorizationService> mockAuthorizationService;
         private Mock<IMultiVariantTestingService> mockMultiVariantTestingService;
         private Mock<ICookieStorageService<FlashMessageViewModel>> mockCookieStorageService;
         private Mock<EmployerTeamOrchestrator> mockEmployerTeamOrchestrator;
@@ -26,23 +24,17 @@ public class WhenSetupSingleReservation
         public void Arrange()
         {
             mockAuthenticationService = new Mock<IAuthenticationService>();
-            mockAuthorizationService = new Mock<IAuthorizationService>();
             mockMultiVariantTestingService = new Mock<IMultiVariantTestingService>();
             mockCookieStorageService = new Mock<ICookieStorageService<FlashMessageViewModel>>();
             mockEmployerTeamOrchestrator = new Mock<EmployerTeamOrchestrator>();
 
-            mockAuthorizationService.Setup(m => m.IsAuthorized("EmployerFeature.HomePage")).Returns(false);
-            mockAuthorizationService.Setup(m => m.IsAuthorized("EmployerFeature.CallToAction")).Returns(true);
-
             _controller = new EmployerTeamController(
                 mockAuthenticationService.Object,
                 mockMultiVariantTestingService.Object,
                 mockCookieStorageService.Object,
-                mockEmployerTeamOrchestrator.Object,
-                mockAuthorizationService.Object);
+                mockEmployerTeamOrchestrator.Object);
         }
 
-
         [Test]
         public void ThenForNonLevyTheContinueSetupForSingleReservationViewIsReturnedAtRow1Panel1()
         {
diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenFundsToReserve.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenFundsToReserve.cs
index a8d0449c92..8ab4d21ff6 100644
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenFundsToReserve.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenFundsToReserve.cs
@@ -2,7 +2,6 @@
 using Moq;
 using NUnit.Framework;
 using SFA.DAS.Authentication;
-using SFA.DAS.Authorization.Services;
 using SFA.DAS.EmployerAccounts.Interfaces;
 using SFA.DAS.EmployerAccounts.Web.Controllers;
 using SFA.DAS.EmployerAccounts.Web.Orchestrators;
@@ -15,7 +14,6 @@ public class WhenFundsToReserve
         private EmployerTeamController _controller;
 
         private Mock<IAuthenticationService> mockAuthenticationService;
-        private Mock<IAuthorizationService> mockAuthorizationService;
         private Mock<IMultiVariantTestingService> mockMultiVariantTestingService;
         private Mock<ICookieStorageService<FlashMessageViewModel>> mockCookieStorageService;
         private Mock<EmployerTeamOrchestrator> mockEmployerTeamOrchestrator;
@@ -24,115 +22,57 @@ public class WhenFundsToReserve
         public void Arrange()
         {
             mockAuthenticationService = new Mock<IAuthenticationService>();
-            mockAuthorizationService = new Mock<IAuthorizationService>();
             mockMultiVariantTestingService = new Mock<IMultiVariantTestingService>();
             mockCookieStorageService = new Mock<ICookieStorageService<FlashMessageViewModel>>();
             mockEmployerTeamOrchestrator = new Mock<EmployerTeamOrchestrator>();
 
-            mockAuthorizationService.Setup(m => m.IsAuthorized("EmployerFeature.HomePage")).Returns(false);
-            mockAuthorizationService.Setup(m => m.IsAuthorized("EmployerFeature.CallToAction")).Returns(false);
-
             _controller = new EmployerTeamController(
                 mockAuthenticationService.Object,
                 mockMultiVariantTestingService.Object,
                 mockCookieStorageService.Object,
-                mockEmployerTeamOrchestrator.Object,
-                mockAuthorizationService.Object);
+                mockEmployerTeamOrchestrator.Object);
         }
 
         [Test]
         public void ThenForNonLevyTheCheckFundingViewIsReturnedAtRow1Panel1()
         {
             // Arrange
-            var model = new AccountDashboardViewModel();
-            model.PayeSchemeCount = 1;
-            model.CallToActionViewModel = new CallToActionViewModel
+            var model = new AccountDashboardViewModel
             {
-                AgreementsToSign = false
-            };
-            
-            model.ApprenticeshipEmployerType = Common.Domain.Types.ApprenticeshipEmployerType.NonLevy;
-            
-            //Act
-            var result = _controller.Row1Panel1(model) as PartialViewResult;
-
-            //Assert
-            Assert.IsNotNull(result);
-            Assert.AreEqual("Empty", (result.Model as dynamic).ViewName);
-        }
+                PayeSchemeCount = 1,
+                CallToActionViewModel = new CallToActionViewModel
+                {
+                    AgreementsToSign = false
+                },
 
-        [Test]
-        public void ThenForLevyTheEmptyViewIsReturnedAtRow1Panel1()
-        {
-            // Arrange
-            var model = new AccountDashboardViewModel();
-            model.PayeSchemeCount = 1;
-            model.CallToActionViewModel = new CallToActionViewModel
-            {
-                AgreementsToSign = false
+                ApprenticeshipEmployerType = Common.Domain.Types.ApprenticeshipEmployerType.NonLevy
             };
-            
-            model.ApprenticeshipEmployerType = Common.Domain.Types.ApprenticeshipEmployerType.Levy;
-            
-            //Act
-            var result = _controller.Row1Panel1(model) as PartialViewResult;
-
-            //Assert
-            Assert.IsNotNull(result);
-            Assert.AreEqual("Empty", (result.Model as dynamic).ViewName);
-        }
 
-        [Test]
-        public void ThenTheTasksViewIsReturnedAtRow1Panel2()
-        {
-            // Arrange
-            var model = new AccountDashboardViewModel();
-            model.PayeSchemeCount = 1;
-            model.CallToActionViewModel = new CallToActionViewModel
-            {
-                AgreementsToSign = false
-            };
-            
             //Act
-            var result = _controller.Row1Panel2(model) as PartialViewResult;
+            var result = _controller.Row1Panel1(model) as PartialViewResult;
 
             //Assert
             Assert.IsNotNull(result);
-            Assert.AreEqual("Tasks", (result.Model as dynamic).ViewName);
+            Assert.AreEqual("CheckFunding", (result.Model as dynamic).ViewName);
         }
 
         [Test]
-        public void ThenTheDashboardViewIsReturnedAtRow2Panel1()
+        public void ThenForLevyTheEmptyViewIsReturnedAtRow1Panel1()
         {
             // Arrange
-            var model = new AccountDashboardViewModel();
-            model.PayeSchemeCount = 1;
-            model.CallToActionViewModel = new CallToActionViewModel
+            var model = new AccountDashboardViewModel
             {
-                AgreementsToSign = false
-            };
-
-            //Act
-            var result = _controller.Row2Panel1(model) as PartialViewResult;
-
-            //Assert
-            Assert.IsNotNull(result);
-            Assert.AreEqual("Dashboard", (result.Model as dynamic).ViewName);
-        }
+                PayeSchemeCount = 1,
+                CallToActionViewModel = new CallToActionViewModel
+                {
+                    AgreementsToSign = false
+                },
 
-        [Test]
-        public void ThenTheEmptyViewIsReturnedAtRow2Panel2()
-        {
-            // Arrange
-            var model = new AccountDashboardViewModel();
-            model.PayeSchemeCount = 1;
-            model.CallToActionViewModel = new CallToActionViewModel
-            {
-                AgreementsToSign = false
+                ApprenticeshipEmployerType = Common.Domain.Types.ApprenticeshipEmployerType.Levy
             };
 
             //Act
-            var result = _controller.Row2Panel2(model) as PartialViewResult;
+            var result = _controller.Row1Panel1(model) as PartialViewResult;
 
             //Assert
             Assert.IsNotNull(result);
diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenNoPayeScheme.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenNoPayeScheme.cs
index 36d7c85657..9332c11961 100644
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenNoPayeScheme.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenNoPayeScheme.cs
@@ -2,7 +2,6 @@
 using Moq;
 using NUnit.Framework;
 using SFA.DAS.Authentication;
-using SFA.DAS.Authorization.Services;
 using SFA.DAS.EmployerAccounts.Interfaces;
 using SFA.DAS.EmployerAccounts.Web.Controllers;
 using SFA.DAS.EmployerAccounts.Web.Orchestrators;
@@ -15,7 +14,6 @@ public class WhenNoPayeScheme
         private EmployerTeamController _controller;
 
         private Mock<IAuthenticationService> mockAuthenticationService;
-        private Mock<IAuthorizationService> mockAuthorizationService;
         private Mock<IMultiVariantTestingService> mockMultiVariantTestingService;
         private Mock<ICookieStorageService<FlashMessageViewModel>> mockCookieStorageService;
         private Mock<EmployerTeamOrchestrator> mockEmployerTeamOrchestrator;
@@ -24,27 +22,25 @@ public class WhenNoPayeScheme
         public void Arrange()
         {
             mockAuthenticationService = new Mock<IAuthenticationService>();
-            mockAuthorizationService = new Mock<IAuthorizationService>();
             mockMultiVariantTestingService = new Mock<IMultiVariantTestingService>();
             mockCookieStorageService = new Mock<ICookieStorageService<FlashMessageViewModel>>();
             mockEmployerTeamOrchestrator = new Mock<EmployerTeamOrchestrator>();
 
-            mockAuthorizationService.Setup(m => m.IsAuthorized("EmployerFeature.HomePage")).Returns(false);
-
            _controller = new EmployerTeamController(
                 mockAuthenticationService.Object,
                 mockMultiVariantTestingService.Object,
                 mockCookieStorageService.Object,
-                mockEmployerTeamOrchestrator.Object,
-                mockAuthorizationService.Object);
+                mockEmployerTeamOrchestrator.Object);
         }
 
         [Test]
         public void ThenTheAddPayeViewIsReturnedAtRow1Panel1()
         {
             // Arrange
-            var model = new AccountDashboardViewModel();
-            model.PayeSchemeCount = 0;            
+            var model = new AccountDashboardViewModel
+            {
+                PayeSchemeCount = 0
+            };
 
             //Act
             var result = _controller.Row1Panel1(model) as PartialViewResult;
@@ -53,50 +49,5 @@ public void ThenTheAddPayeViewIsReturnedAtRow1Panel1()
             Assert.IsNotNull(result);
             Assert.AreEqual("AddPAYE", (result.Model as dynamic).ViewName);
         }
-
-        [Test]
-        public void ThenTheEmptyViewIsReturnedAtRow1Panel2()
-        {
-            // Arrange
-            var model = new AccountDashboardViewModel();
-            model.PayeSchemeCount = 0;
-
-            //Act
-            var result = _controller.Row1Panel2(model) as PartialViewResult;
-
-            //Assert
-            Assert.IsNotNull(result);
-            Assert.AreEqual("Empty", (result.Model as dynamic).ViewName);
-        }
-
-        [Test]
-        public void ThenTheEmptyViewIsReturnedAtRow2Panel1()
-        {
-            // Arrange
-            var model = new AccountDashboardViewModel();
-            model.PayeSchemeCount = 0;
-
-            //Act
-            var result = _controller.Row2Panel1(model) as PartialViewResult;
-
-            //Assert
-            Assert.IsNotNull(result);
-            Assert.AreEqual("Empty", (result.Model as dynamic).ViewName);
-        }
-
-        [Test]
-        public void ThenTheEmptyViewIsReturnedAtRow2Panel2()
-        {
-            // Arrange
-            var model = new AccountDashboardViewModel();
-            model.PayeSchemeCount = 0;
-
-            //Act
-            var result = _controller.Row2Panel2(model) as PartialViewResult;
-
-            //Assert
-            Assert.IsNotNull(result);
-            Assert.AreEqual("Empty", (result.Model as dynamic).ViewName);
-        }
     }
 }
diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenSupportUserBannerIsRendered.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenSupportUserBannerIsRendered.cs
index f9fc4549b2..8170ee0e94 100644
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenSupportUserBannerIsRendered.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenSupportUserBannerIsRendered.cs
@@ -7,7 +7,6 @@
 using Moq;
 using NUnit.Framework;
 using SFA.DAS.Authentication;
-using SFA.DAS.Authorization.Services;
 using SFA.DAS.EmployerAccounts.Interfaces;
 using SFA.DAS.EmployerAccounts.Web.Controllers;
 using SFA.DAS.EmployerAccounts.Web.Helpers;
@@ -22,7 +21,6 @@ public class WhenSupportUserBannerIsRendered
         private EmployerTeamController _controller;
 
         private Mock<IAuthenticationService> mockAuthenticationService;
-        private Mock<IAuthorizationService> mockAuthorizationService;
         private Mock<IMultiVariantTestingService> mockMultiVariantTestingService;
         private Mock<ICookieStorageService<FlashMessageViewModel>> mockCookieStorageService;
         private Mock<EmployerTeamOrchestrator> mockEmployerTeamOrchestrator;
@@ -44,7 +42,6 @@ public class WhenSupportUserBannerIsRendered
         public void Arrange()
         {
             mockAuthenticationService = new Mock<IAuthenticationService>();
-            mockAuthorizationService = new Mock<IAuthorizationService>();
             mockMultiVariantTestingService = new Mock<IMultiVariantTestingService>();
             mockCookieStorageService = new Mock<ICookieStorageService<FlashMessageViewModel>>();
             mockEmployerTeamOrchestrator = new Mock<EmployerTeamOrchestrator>();
@@ -55,8 +52,10 @@ public void Arrange()
 
             _userId = "TestUser";
 
-            _claims = new List<Claim>();
-            _claims.Add(new Claim(ControllerConstants.UserRefClaimKeyName, _userId));
+            _claims = new List<Claim>
+            {
+                new Claim(ControllerConstants.UserRefClaimKeyName, _userId)
+            };
 
             mockPrincipal.Setup(m => m.Identity).Returns(mockClaimsIdentity.Object);
             mockClaimsIdentity.Setup(m => m.IsAuthenticated).Returns(_isAuthenticated);
@@ -100,10 +99,10 @@ public void Arrange()
                 mockAuthenticationService.Object,
                 mockMultiVariantTestingService.Object,
                 mockCookieStorageService.Object,
-                mockEmployerTeamOrchestrator.Object,
-                mockAuthorizationService.Object);
-
-            _controller.ControllerContext = mockControllerContext.Object;
+                mockEmployerTeamOrchestrator.Object)
+            {
+                ControllerContext = mockControllerContext.Object
+            };
         }
 
         [Test]
diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenVacancyInProgress.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenVacancyInProgress.cs
index 301091d847..24be2c2a2c 100644
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenVacancyInProgress.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenVacancyInProgress.cs
@@ -3,7 +3,6 @@
 using Moq;
 using NUnit.Framework;
 using SFA.DAS.Authentication;
-using SFA.DAS.Authorization.Services;
 using SFA.DAS.EmployerAccounts.Interfaces;
 using SFA.DAS.EmployerAccounts.Web.Controllers;
 using SFA.DAS.EmployerAccounts.Web.Orchestrators;
@@ -16,7 +15,6 @@ public class WhenVacancyInProgress
         private EmployerTeamController _controller;
 
         private Mock<IAuthenticationService> mockAuthenticationService;
-        private Mock<IAuthorizationService> mockAuthorizationService;
         private Mock<IMultiVariantTestingService> mockMultiVariantTestingService;
         private Mock<ICookieStorageService<FlashMessageViewModel>> mockCookieStorageService;
         private Mock<EmployerTeamOrchestrator> mockEmployerTeamOrchestrator;
@@ -25,19 +23,15 @@ public class WhenVacancyInProgress
         public void Arrange()
         {
             mockAuthenticationService = new Mock<IAuthenticationService>();
-            mockAuthorizationService = new Mock<IAuthorizationService>();
             mockMultiVariantTestingService = new Mock<IMultiVariantTestingService>();
             mockCookieStorageService = new Mock<ICookieStorageService<FlashMessageViewModel>>();
             mockEmployerTeamOrchestrator = new Mock<EmployerTeamOrchestrator>();
 
-            mockAuthorizationService.Setup(m => m.IsAuthorized("EmployerFeature.CallToAction")).Returns(true);
-
             _controller = new EmployerTeamController(
                 mockAuthenticationService.Object,
                 mockMultiVariantTestingService.Object,
                 mockCookieStorageService.Object,
-                mockEmployerTeamOrchestrator.Object,
-                mockAuthorizationService.Object);
+                mockEmployerTeamOrchestrator.Object);
         }
 
         [Test]
diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Extensions/HtmlHelperExtensionsTests.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Extensions/HtmlHelperExtensionsTests.cs
index c3486db7aa..9c88db99a0 100644
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Extensions/HtmlHelperExtensionsTests.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Extensions/HtmlHelperExtensionsTests.cs
@@ -9,7 +9,6 @@
 using Moq;
 using NUnit.Framework;
 using SFA.DAS.Authentication;
-using SFA.DAS.Authorization.Services;
 using SFA.DAS.EmployerAccounts.Dtos;
 using SFA.DAS.EmployerAccounts.Interfaces;
 using SFA.DAS.EmployerAccounts.Queries.GetAccountEmployerAgreements;
@@ -27,7 +26,6 @@ class HtmlHelperExtensionsTests
         private EmployerTeamController _controller;
 
         private Mock<IAuthenticationService> mockAuthenticationService;
-        private Mock<IAuthorizationService> mockAuthorizationService;
         private Mock<IMultiVariantTestingService> mockMultiVariantTestingService;
         private Mock<ICookieStorageService<FlashMessageViewModel>> mockCookieStorageService;
         private Mock<EmployerTeamOrchestrator> mockEmployerTeamOrchestrator;
@@ -47,7 +45,6 @@ class HtmlHelperExtensionsTests
         public void SetUp()
         {
             mockAuthenticationService = new Mock<IAuthenticationService>();
-            mockAuthorizationService = new Mock<IAuthorizationService>();
             mockMultiVariantTestingService = new Mock<IMultiVariantTestingService>();
             mockCookieStorageService = new Mock<ICookieStorageService<FlashMessageViewModel>>();
             mockEmployerTeamOrchestrator = new Mock<EmployerTeamOrchestrator>();
@@ -58,8 +55,10 @@ public void SetUp()
 
             _userId = "TestUser";
 
-            _claims = new List<Claim>();
-            _claims.Add(new Claim(ControllerConstants.UserRefClaimKeyName, _userId));
+            _claims = new List<Claim>
+            {
+                new Claim(ControllerConstants.UserRefClaimKeyName, _userId)
+            };
 
             mockPrincipal.Setup(m => m.Identity).Returns(mockClaimsIdentity.Object);
             mockClaimsIdentity.Setup(m => m.IsAuthenticated).Returns(_isAuthenticated);
@@ -71,13 +70,15 @@ public void SetUp()
                 mockAuthenticationService.Object,
                 mockMultiVariantTestingService.Object,
                 mockCookieStorageService.Object,
-                mockEmployerTeamOrchestrator.Object,
-                mockAuthorizationService.Object);
-
-            _controller.ControllerContext = mockControllerContext.Object;
+                mockEmployerTeamOrchestrator.Object)
+            {
+                ControllerContext = mockControllerContext.Object
+            };
             _viewDataContainerMock = new Mock<IViewDataContainer>();
-            _viewContext = new ViewContext();
-            _viewContext.Controller = _controller;
+            _viewContext = new ViewContext
+            {
+                Controller = _controller
+            };
 
 
             _mockMediator = new Mock<IMediator>();
diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenGettingAccount.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenGettingAccount.cs
index 6fb012bf81..0a72220158 100644
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenGettingAccount.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenGettingAccount.cs
@@ -200,7 +200,7 @@ public void Arrange()
            
             _mapper = new Mock<IMapper>();
 
-            _orchestrator = new EmployerTeamOrchestrator(_mediator.Object, _currentDateTime.Object, _accountApiClient.Object,  _mapper.Object, Mock.Of<IAuthorizationService>());
+            _orchestrator = new EmployerTeamOrchestrator(_mediator.Object, _currentDateTime.Object, _accountApiClient.Object,  _mapper.Object);
         }
         
         [Test]
diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIChangeATeamMemberRole.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIChangeATeamMemberRole.cs
index 2519d4bf19..ebf6178be5 100644
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIChangeATeamMemberRole.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIChangeATeamMemberRole.cs
@@ -33,7 +33,7 @@ public void Arrange()
             _accountApiClient = new Mock<IAccountApiClient>();           
             _mapper = new Mock<IMapper>();
 
-            _orchestrator = new EmployerTeamOrchestrator(_mediator.Object, Mock.Of<ICurrentDateTime>(), _accountApiClient.Object, _mapper.Object, Mock.Of<IAuthorizationService>());
+            _orchestrator = new EmployerTeamOrchestrator(_mediator.Object, Mock.Of<ICurrentDateTime>(), _accountApiClient.Object, _mapper.Object);
         }
 
         [Test]
diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIGetATeamMembersDetails.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIGetATeamMembersDetails.cs
index 7e607c9ae6..20f7a16f28 100644
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIGetATeamMembersDetails.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIGetATeamMembersDetails.cs
@@ -45,7 +45,7 @@ public void Arrange()
             _accountApiClient = new Mock<IAccountApiClient>();           
             _mapper = new Mock<IMapper>();
 
-            _orchestrator = new EmployerTeamOrchestrator(_mediator.Object, Mock.Of<ICurrentDateTime>(), _accountApiClient.Object, _mapper.Object, Mock.Of<IAuthorizationService>());
+            _orchestrator = new EmployerTeamOrchestrator(_mediator.Object, Mock.Of<ICurrentDateTime>(), _accountApiClient.Object, _mapper.Object);
 
             _mediator.Setup(x => x.SendAsync(It.IsAny<GetMemberRequest>()))
                 .ReturnsAsync(_teamMemberResponse);
diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIGetMyTeamMembers.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIGetMyTeamMembers.cs
index fb66303035..a7166117bf 100644
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIGetMyTeamMembers.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIGetMyTeamMembers.cs
@@ -37,7 +37,7 @@ public void Arrange()
             _accountApiClient = new Mock<IAccountApiClient>();           
             _mapper = new Mock<IMapper>();
 
-            _orchestrator = new EmployerTeamOrchestrator(_mediator.Object, Mock.Of<ICurrentDateTime>(), _accountApiClient.Object, _mapper.Object, Mock.Of<IAuthorizationService>());
+            _orchestrator = new EmployerTeamOrchestrator(_mediator.Object, Mock.Of<ICurrentDateTime>(), _accountApiClient.Object, _mapper.Object);
         }
         
         [Test]
diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIInviteATeamMember.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIInviteATeamMember.cs
index 6c321417c3..c7019bcdce 100644
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIInviteATeamMember.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIInviteATeamMember.cs
@@ -35,7 +35,7 @@ public void Arrange()
             _mediator = new Mock<IMediator>();
             _accountApiClient = new Mock<IAccountApiClient>();           
             _mapper = new Mock<IMapper>();
-            _orchestrator = new EmployerTeamOrchestrator(_mediator.Object, Mock.Of<ICurrentDateTime>(), _accountApiClient.Object, _mapper.Object, Mock.Of<IAuthorizationService>());
+            _orchestrator = new EmployerTeamOrchestrator(_mediator.Object, Mock.Of<ICurrentDateTime>(), _accountApiClient.Object, _mapper.Object);
         }
 
         [Test]
diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIRemoveATeamMember.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIRemoveATeamMember.cs
index 5bc11341f2..f45b36cf9a 100644
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIRemoveATeamMember.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Orchestrators/EmployerTeamOrchestratorTests/WhenIRemoveATeamMember.cs
@@ -37,7 +37,7 @@ public void Arrange()
             _accountApiClient = new Mock<IAccountApiClient>();            
             _mapper = new Mock<IMapper>();
 
-            _orchestrator = new EmployerTeamOrchestrator(_mediator.Object, Mock.Of<ICurrentDateTime>(), _accountApiClient.Object, _mapper.Object, Mock.Of<IAuthorizationService>());
+            _orchestrator = new EmployerTeamOrchestrator(_mediator.Object, Mock.Of<ICurrentDateTime>(), _accountApiClient.Object, _mapper.Object);
             
             _mediator.Setup(x => x.SendAsync(It.IsAny<GetAccountTeamMembersQuery>()))
                      .ReturnsAsync(new GetAccountTeamMembersResponse
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Controllers/BaseController.cs b/src/SFA.DAS.EmployerAccounts.Web/Controllers/BaseController.cs
index 28bdd8265a..a08ab02b24 100644
--- a/src/SFA.DAS.EmployerAccounts.Web/Controllers/BaseController.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web/Controllers/BaseController.cs
@@ -34,16 +34,12 @@ public BaseController(IAuthenticationService owinWrapper)
 
         protected override ViewResult View(string viewName, string masterName, object model)
         {
-            var orchestratorResponse = model as OrchestratorResponse;
-
-            if (orchestratorResponse == null)
+            if (!(model is OrchestratorResponse orchestratorResponse))
             {
                 return base.View(viewName, masterName, model);
             }
-
-            var invalidRequestException = orchestratorResponse.Exception as InvalidRequestException;
-
-            if (invalidRequestException != null)
+            
+            if (orchestratorResponse.Exception is InvalidRequestException invalidRequestException)
             {
                 foreach (var errorMessageItem in invalidRequestException.ErrorMessages)
                 {
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Controllers/EmployerTeamController.cs b/src/SFA.DAS.EmployerAccounts.Web/Controllers/EmployerTeamController.cs
index 59509e59af..df11528a3e 100644
--- a/src/SFA.DAS.EmployerAccounts.Web/Controllers/EmployerTeamController.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web/Controllers/EmployerTeamController.cs
@@ -1,6 +1,5 @@
 using SFA.DAS.Authentication;
 using SFA.DAS.Authorization.Mvc.Attributes;
-using SFA.DAS.Authorization.Services;
 using SFA.DAS.EmployerAccounts.Interfaces;
 using SFA.DAS.EmployerAccounts.Models;
 using SFA.DAS.EmployerAccounts.Web.Extensions;
@@ -23,7 +22,6 @@ namespace SFA.DAS.EmployerAccounts.Web.Controllers
     public class EmployerTeamController : BaseController
     {
         private readonly EmployerTeamOrchestrator _employerTeamOrchestrator;
-        private readonly IAuthorizationService _authorizationService;
 
         public EmployerTeamController(
             IAuthenticationService owinWrapper)
@@ -36,12 +34,10 @@ public EmployerTeamController(
             IAuthenticationService owinWrapper,
             IMultiVariantTestingService multiVariantTestingService,
             ICookieStorageService<FlashMessageViewModel> flashMessage,
-            EmployerTeamOrchestrator employerTeamOrchestrator,
-            IAuthorizationService authorizationService)
+            EmployerTeamOrchestrator employerTeamOrchestrator)
             : base(owinWrapper, multiVariantTestingService, flashMessage)
         {
             _employerTeamOrchestrator = employerTeamOrchestrator;
-            _authorizationService = authorizationService;
         }
 
         [HttpGet]
@@ -399,7 +395,7 @@ public ActionResult Row1Panel1(AccountDashboardViewModel model)
             {
                 viewModel.ViewName = "AddPAYE";                
             }
-            else if (_authorizationService.IsAuthorized("EmployerFeature.CallToAction"))
+            else
             {
                 _employerTeamOrchestrator.GetCallToActionViewName(viewModel);
             }
@@ -407,123 +403,24 @@ public ActionResult Row1Panel1(AccountDashboardViewModel model)
             return PartialView(viewModel);
         }
 
-        [ChildActionOnly]
-        public ActionResult Row1Panel2(AccountDashboardViewModel model)
-        {
-            var viewModel = new PanelViewModel<AccountDashboardViewModel> { ViewName = "Tasks", Data = model };
-
-            if (model.PayeSchemeCount == 0)
-            {
-                viewModel.ViewName = "Empty";
-            }
-
-            return PartialView(viewModel);
-        }
-
-        [ChildActionOnly]
-        public ActionResult Row2Panel1(AccountDashboardViewModel model)
-        {
-            var viewModel = new PanelViewModel<AccountDashboardViewModel> { ViewName = "Dashboard", Data = model };
-
-            if (model.PayeSchemeCount == 0)
-            {
-                viewModel.ViewName = "Empty";
-            }
-
-            return PartialView(viewModel);
-        }
-
-        [ChildActionOnly]
-        public ActionResult Row2Panel2(AccountDashboardViewModel model)
-        {
-            var viewModel = new PanelViewModel<AccountDashboardViewModel> { ViewName = "Empty", Data = model };
-
-            return PartialView(viewModel);
-        }
-
         [ChildActionOnly]
         public ActionResult AddPAYE(AccountDashboardViewModel model)
         {
             return PartialView(model);
         }
 
-        [ChildActionOnly]
-        public ActionResult V2AddPAYE(AccountDashboardViewModel model)
-        {
-            return PartialView(model);
-        }
-
         [ChildActionOnly]
         public ActionResult SignAgreement(AccountDashboardViewModel model)
         {
             return PartialView(model);
         }        
 
-        [ChildActionOnly]
-        public ActionResult V2SignAgreement(AccountDashboardViewModel model)
-        {
-            return PartialView(model);
-        }
-
         [ChildActionOnly]
         public ActionResult Empty(AccountDashboardViewModel model)
         {
             return PartialView(model);
         }
 
-        [ChildActionOnly]
-        public ActionResult Tasks(AccountDashboardViewModel model)
-        {
-            return PartialView(model);
-        }
-
-        [ChildActionOnly]
-        public ActionResult Dashboard(AccountDashboardViewModel model)
-        {
-            return PartialView(model);
-        }
-
-        [ChildActionOnly]
-        public ActionResult ProviderPermissions(AccountDashboardViewModel model)
-        {
-            return PartialView(model);
-        }
-
-        [ChildActionOnly]
-        public ActionResult ProviderPermissionsMultiple(AccountDashboardViewModel model)
-        {
-            return PartialView(model);
-        }
-
-        [ChildActionOnly]
-        public ActionResult ProviderPermissionsDenied(AccountDashboardViewModel model)
-        {
-            return PartialView(model);
-        }
-
-        [ChildActionOnly]
-        public ActionResult FinancialTransactions(AccountDashboardViewModel model)
-        {
-            return PartialView(model);
-        }
-
-        public ActionResult SingleProvider(AccountDashboardViewModel model)
-        {
-            return PartialView(model);
-        }
-
-        [ChildActionOnly]
-        public ActionResult SavedProviders(AccountDashboardViewModel model)
-        {
-            return PartialView(model);
-        }
-
-        [ChildActionOnly]
-        public ActionResult AccountSettings(AccountDashboardViewModel model)
-        {
-            return PartialView(model);
-        }
-
         [ChildActionOnly]
         public ActionResult CheckFunding(AccountDashboardViewModel model)
         {
@@ -538,18 +435,6 @@ public ActionResult ContinueSetupForSingleReservation(AccountDashboardViewModel
             return PartialView(viewModel);
         }
 
-        [ChildActionOnly]
-        public ActionResult V2CheckFunding(AccountDashboardViewModel model)
-        {
-            return PartialView(model);
-        }
-
-        [ChildActionOnly]
-        public ActionResult FundingComplete(AccountDashboardViewModel model)
-        {
-            return PartialView(model);
-        }
-
         [ChildActionOnly]
         public ActionResult VacancyDraft(AccountDashboardViewModel model)
         {   
@@ -580,43 +465,6 @@ public ActionResult VacancyClosed(AccountDashboardViewModel model)
             return PartialView(model.CallToActionViewModel.VacanciesViewModel.Vacancies.First(m => m.Status == EmployerAccounts.Models.Recruit.VacancyStatus.Closed));
         }
 
-        [ChildActionOnly]
-        public ActionResult CreateVacancy(AccountDashboardViewModel model)
-        {
-            return PartialView(model);
-        }
-
-        [ChildActionOnly]
-        public ActionResult MultipleVacancies(AccountDashboardViewModel model)
-        {
-            return PartialView(model);
-        }
-
-        [ChildActionOnly]
-        public ActionResult PrePayeRecruitment(AccountDashboardViewModel model)
-        {
-            return PartialView(model);
-        }
-
-        [ChildActionOnly]
-        public ActionResult SearchBar()
-        {
-            return PartialView();
-        }
-
-        [ChildActionOnly]
-        public ActionResult MostActiveLinks(AccountDashboardViewModel model)
-        {
-            return PartialView(model);
-        }
-
-        [ChildActionOnly]
-        public ActionResult OtherTasksPanel(AccountDashboardViewModel model)
-        {
-            return PartialView(model);
-        }
-        
-
         private async Task<OrchestratorResponse<AccountDashboardViewModel>> GetAccountInformation(string hashedAccountId)
         {
             var externalUserId = OwinWrapper.GetClaimValue(ControllerConstants.UserRefClaimKeyName);
diff --git a/src/SFA.DAS.EmployerAccounts.Web/FeatureToggles/FeatureToggleViewEngine.cs b/src/SFA.DAS.EmployerAccounts.Web/FeatureToggles/FeatureToggleViewEngine.cs
deleted file mode 100644
index 3467a4f336..0000000000
--- a/src/SFA.DAS.EmployerAccounts.Web/FeatureToggles/FeatureToggleViewEngine.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.Linq;
-using System.Web.Mvc;
-
-namespace SFA.DAS.EmployerAccounts.Web.FeatureToggles
-{
-    public class NewHomepageViewEngine : RazorViewEngine
-    {
-        public NewHomepageViewEngine()
-            : base()
-        {            
-            PartialViewLocationFormats = PartialViewLocationFormats.Concat(new[] { "~/Views/{1}/V2/{0}.cshtml" }).ToArray();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Global.asax.cs b/src/SFA.DAS.EmployerAccounts.Web/Global.asax.cs
index 1981de953c..42250eb3b0 100644
--- a/src/SFA.DAS.EmployerAccounts.Web/Global.asax.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web/Global.asax.cs
@@ -28,7 +28,6 @@
 using SFA.DAS.Audit.Types;
 using SFA.DAS.Audit.Client.Web;
 using SFA.DAS.AutoConfiguration;
-using SFA.DAS.EmployerAccounts.Web.FeatureToggles;
 using SFA.DAS.EmployerUsers.WebClientComponents;
 using SFA.DAS.NServiceBus.Configuration;
 using SFA.DAS.UnitOfWork.NServiceBus.Configuration;
@@ -56,9 +55,6 @@ protected void Application_Start()
             WebMessageBuilders.UserIdClaim = DasClaimTypes.Id;
             WebMessageBuilders.UserEmailClaim = DasClaimTypes.Email;
 
-            ViewEngines.Engines.Clear();
-            ViewEngines.Engines.Add(new NewHomepageViewEngine());
-
             AuditMessageFactory.RegisterBuilder(m =>
             {
                 m.Source = new Source
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs b/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs
index 46d351e57c..e364d7b8e1 100644
--- a/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs
@@ -1,6 +1,5 @@
 using AutoMapper;
 using MediatR;
-using SFA.DAS.Authorization.Services;
 using SFA.DAS.EAS.Account.Api.Client;
 using SFA.DAS.EAS.Account.Api.Types;
 using SFA.DAS.EmployerAccounts.Commands.ChangeTeamMemberRole;
@@ -49,20 +48,17 @@ public class EmployerTeamOrchestrator : UserVerificationOrchestratorBase
         private readonly ICurrentDateTime _currentDateTime;
         private readonly IAccountApiClient _accountApiClient;       
         private readonly IMapper _mapper;
-        private readonly IAuthorizationService _authorizationService;
 
         public EmployerTeamOrchestrator(IMediator mediator,
             ICurrentDateTime currentDateTime,
             IAccountApiClient accountApiClient,           
-            IMapper mapper,
-            IAuthorizationService authorizationService)
+            IMapper mapper)
             : base(mediator)
         {
             _mediator = mediator;
             _currentDateTime = currentDateTime;
             _accountApiClient = accountApiClient;            
             _mapper = mapper;
-            _authorizationService = authorizationService;
         }
 
         //Needed for tests
@@ -669,9 +665,11 @@ public virtual async Task<OrchestratorResponse<AccountSummaryViewModel>> GetAcco
 
         public void GetCallToActionViewName(PanelViewModel<AccountDashboardViewModel> viewModel)
         {
-            var rules = new Dictionary<int, EvalutateCallToActionRuleDelegate>();
-            rules.Add(100, EvalutateSignAgreementCallToActionRule);
-            rules.Add(101, vm => vm.Data.CallToActionViewModel.UnableToDetermineCallToAction);
+            var rules = new Dictionary<int, EvalutateCallToActionRuleDelegate>
+            {
+                { 100, EvalutateSignAgreementCallToActionRule },
+                { 101, vm => vm.Data.CallToActionViewModel.UnableToDetermineCallToAction }
+            };
 
             if (viewModel.Data.ApprenticeshipEmployerType == ApprenticeshipEmployerType.NonLevy)
             {
diff --git a/src/SFA.DAS.EmployerAccounts.Web/SFA.DAS.EmployerAccounts.Web.csproj b/src/SFA.DAS.EmployerAccounts.Web/SFA.DAS.EmployerAccounts.Web.csproj
index db2aad7080..8528147ca7 100644
--- a/src/SFA.DAS.EmployerAccounts.Web/SFA.DAS.EmployerAccounts.Web.csproj
+++ b/src/SFA.DAS.EmployerAccounts.Web/SFA.DAS.EmployerAccounts.Web.csproj
@@ -235,7 +235,6 @@
     <Compile Include="Extensions\AccountDashboardViewModelExtensions.cs" />
     <Compile Include="Extensions\TransferRequestDtoExtensions.cs" />
     <Compile Include="Extensions\UrlHelperExtensions.cs" />
-    <Compile Include="FeatureToggles\FeatureToggleViewEngine.cs" />
     <Compile Include="Filters\GoogleAnalyticsFilter.cs" />
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
@@ -813,36 +812,14 @@
     <Content Include="Views\EmployerAccountPaye\Remove.cshtml" />
     <Content Include="Views\Shared\_WhatIsEnglishPercentage.cshtml" />
     <Content Include="Views\EmployerAccount\GetApprenticeshipFunding.cshtml" />
-    <Content Include="Views\EmployerTeam\V2\Index.cshtml" />
-    <Content Include="Views\EmployerTeam\V2\Row1Panel1.cshtml" />
-    <Content Include="Views\EmployerTeam\V2\Row1Panel2.cshtml" />
-    <Content Include="Views\EmployerTeam\V2\Row2Panel2.cshtml" />
-    <Content Include="Views\EmployerTeam\V2\Row2Panel1.cshtml" />
-    <Content Include="Views\EmployerTeam\V2\V2SignAgreement.cshtml" />
-    <Content Include="Views\EmployerTeam\V2\ProviderPermissions.cshtml" />
-    <Content Include="Views\EmployerTeam\V2\AccountSettings.cshtml" />
-    <Content Include="Views\EmployerTeam\V2\V2CheckFunding.cshtml" />
-    <Content Include="Views\EmployerTeam\V2\ProviderPermissionsDenied.cshtml" />
+    <Content Include="Views\EmployerTeam\Row1Panel1.cshtml" />
     <Content Include="Views\EmployerAccount\PayeError.cshtml" />
-    <Content Include="Views\EmployerTeam\V2\CreateVacancy.cshtml" />
-    <Content Include="Views\EmployerTeam\V2\FundingComplete.cshtml" />
-    <Content Include="Views\EmployerTeam\V2\FinancialTransactions.cshtml" />
-    <Content Include="Views\EmployerTeam\V2\ApprenticeshipDetails.cshtml" />
-    <Content Include="Views\EmployerTeam\V2\SearchBar.cshtml" />
-    <Content Include="Views\EmployerTeam\V2\MostActiveLinks.cshtml" />
-    <Content Include="Views\EmployerTeam\V2\PrePayeRecruitment.cshtml" />
-    <Content Include="Views\EmployerTeam\V2\V2AddPaye.cshtml" />
-    <Content Include="Views\EmployerTeam\V2\OtherTasksPanel.cshtml" />
-    <Content Include="Views\EmployerTeam\V2\SingleProvider.cshtml" />
-    <Content Include="Views\EmployerTeam\V2\ProviderPermissionsMultiple.cshtml" />
     <Content Include="Views\SearchPensionRegulator\SearchPensionRegulatorResults.cshtml" />
     <Content Include="Views\SearchPensionRegulator\SearchPensionRegulatorByAorn.cshtml" />
     <Content Include="Views\EmployerAgreement\SignAgreement.cshtml" />
     <Content Include="Views\Shared\_NonLevy_Agreement_V1.cshtml" />
     <Content Include="Views\Shared\_Agreement_v2_body.cshtml" />
-    <Content Include="Views\EmployerTeam\V2\MultipleVacancies.cshtml" />
     <Content Include="Views\Shared\_NonLevy_Agreement_V1_body.cshtml" />
-    <Content Include="Views\EmployerTeam\V2\VacancyStatus.cshtml" />
     <Content Include="Views\EmployerAgreement\AboutYourDocument.cshtml" />
     <Content Include="Views\Shared\_GoogleTagManager.cshtml" />
     <Content Include="Views\Shared\_GoogleTagManagerNoScript.cshtml" />
@@ -853,9 +830,6 @@
     <Content Include="Views\Shared\_ZenDeskWidget.cshtml" />
     <Content Include="Views\EmployerAgreement\WhenDoYouWantToView.cshtml" />
     <Content Include="Views\Shared\_Agreement_v3.cshtml" />
-    <Content Include="Views\EmployerTeam\V2\Empty.cshtml" />
-    <Content Include="Views\EmployerTeam\Tasks.cshtml" />
-    <Content Include="Views\EmployerTeam\Dashboard.cshtml" />
     <Content Include="Views\EmployerTeam\AddPAYE.cshtml" />
     <Content Include="Views\EmployerTeam\SignAgreement.cshtml" />
     <Content Include="Views\EmployerTeam\CheckFunding.cshtml" />
@@ -866,7 +840,6 @@
     <Content Include="Views\Shared\_CookieBanner.cshtml" />
     <Content Include="Views\Report\ReportTrainingProvider.cshtml" />
     <Content Include="Views\Shared\_SupportUserBanner.cshtml" />
-    <Content Include="Views\EmployerTeam\V2\NotCurrentlyInStorage.cshtml" />
     <Content Include="Views\EmployerTeam\ContinueSetupForSingleReservation.cshtml" />
     <Content Include="Views\EmployerTeam\ContinueSetupCreateAdvert.cshtml" />
     <Content Include="Views\EmployerTeam\VacancyDraft.cshtml" />
@@ -882,6 +855,7 @@
     <Content Include="Views\EmployerTeam\SingleApprenticeshipWithTrainingProvider.cshtml" />
     <Content Include="Views\EmployerTeam\SingleApprenticeshipReadyForReview.cshtml" />
     <Content Include="Views\EmployerTeam\SingleApprenticeshipContinueWithProvider.cshtml" />
+    <Content Include="Views\EmployerTeam\Empty.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\SFA.DAS.Account.Api.Client\SFA.DAS.EAS.Account.Api.Client.csproj">
diff --git a/src/SFA.DAS.EmployerAccounts.Web/ViewModels/CallToActionViewModel.cs b/src/SFA.DAS.EmployerAccounts.Web/ViewModels/CallToActionViewModel.cs
index 43f296ca74..f478dab14f 100644
--- a/src/SFA.DAS.EmployerAccounts.Web/ViewModels/CallToActionViewModel.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web/ViewModels/CallToActionViewModel.cs
@@ -21,5 +21,10 @@ public class CallToActionViewModel
         public bool HasSingleReservation => Reservations?.Count == 1 && CohortsCount == 1;
         public VacanciesViewModel VacanciesViewModel { get; set; }
         public bool UnableToDetermineCallToAction { get; set; }
+
+        public CallToActionViewModel()
+        {
+            VacanciesViewModel = new VacanciesViewModel();
+        }
     }
 }
\ No newline at end of file
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/Dashboard.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/Dashboard.cshtml
deleted file mode 100644
index 933a33ff15..0000000000
--- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/Dashboard.cshtml
+++ /dev/null
@@ -1,84 +0,0 @@
-@using SFA.DAS.Authorization
-@using SFA.DAS.Authorization.Mvc
-@using SFA.DAS.Common.Domain.Types
-
-@model SFA.DAS.EmployerAccounts.Web.ViewModels.AccountDashboardViewModel
-
-<section class="dashboard-section">
-    <div class="grid-row">
-        <div class="column-two-thirds">
-            <h2 class="section-heading heading-large">Apprenticeships</h2>
-            <p class="section-description">Manage your apprentices, recruit apprentice and set training provider permissions</p>
-        </div>
-    </div>
-    <div class="cards">
-        <div class="card">
-            <h3 class="heading-medium"><a href="@Url.EmployerCommitmentsAction("apprentices/home")">Apprentices</a></h3>
-            <p>Add apprentices, update details of existing apprentices and authorise payments to training providers.</p>
-        </div>
-        @if (Html.IsAuthorized(FeatureType.Recruitments))
-        {
-            <div class="card">
-                <h3 class="heading-medium"><a href="@Url.EmployerRecruitAction()">Recruitment</a></h3>
-                <p>Recruit an apprentice by creating a vacancy. This vacancy will be advertised on Find an apprenticeship.</p>
-            </div>
-        }
-        @if (Html.IsAuthorized(FeatureType.ProviderRelationships))
-        {
-            <div class="card">
-                <h3 class="heading-medium"><a href="@Url.ProviderRelationshipsAction("providers")">Training provider permissions</a></h3>
-                <p>Set training provider permissions and control what tasks they can do on your behalf.</p>
-            </div>
-        }
-        <div class="card">
-            <h3 class="heading-medium"><a href="https://findapprenticeshiptraining.apprenticeships.education.gov.uk/Apprenticeship/Search" rel="external" target="_blank">Find apprenticeship training</a></h3>
-            <p>Search for apprenticeships and see details of approved providers who can deliver the training.</p>
-        </div>
-    </div>
-</section>
-
-<section class="dashboard-section">
-    <div class="grid-row">
-        <div class="column-two-thirds">
-            <h2 class="section-heading heading-large">Finances</h2>
-            <p class="section-description">Manage your apprenticeship funds</p>
-        </div>
-    </div>
-    <div class="cards">
-        @if (Model.ShowYourFundingReservationsLink())
-        {
-            <div class="card">
-                <h3 class="heading-medium"><a href="@Url.ReservationsAction("reservations/manage")">Your funding reservations</a></h3>
-                <p>Reserve and manage funding.</p>
-            </div>
-        }
-        
-        <div class="card">
-            <h3 class="heading-medium"><a href="@Url.EmployerFinanceAction("finance")">Your finances</a></h3>
-            <p>View your financial transactions, connect with other employers and @(Model.ApprenticeshipEmployerType ==  ApprenticeshipEmployerType.Levy ? "send or " : "")receive transfer funds.</p>
-        </div>
-    </div>
-</section>
-
-<section class="dashboard-section">
-    <div class="grid-row">
-        <div class="column-two-thirds">
-            <h2 class="section-heading heading-large">Account</h2>
-            <p class="section-description">Manage your account details and team</p>
-        </div>
-    </div>
-    <div class="cards">
-        <div class="card">
-            <h3 class="heading-medium"><a href="@Url.Action("Index", "EmployerAgreement")">Your organisations and agreements</a></h3>
-            <p>Add your organisations that will make contracts with training providers.</p>
-        </div>
-        <div class="card">
-            <h3 class="heading-medium"><a href="@Url.Action("ViewTeam")">Your team</a></h3>
-            <p>Control what your team can do and invite new team members.</p>
-        </div>
-        <div class="card">
-            <h3 class="heading-medium"><a href="@Url.Action("Index", "EmployerAccountPaye")">PAYE schemes</a></h3>
-            <p>Add or remove PAYE schemes.</p>
-        </div>
-    </div>
-</section>
\ No newline at end of file
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/Empty.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/Empty.cshtml
similarity index 100%
rename from src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/Empty.cshtml
rename to src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/Empty.cshtml
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/Row1Panel1.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/Row1Panel1.cshtml
similarity index 100%
rename from src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/Row1Panel1.cshtml
rename to src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/Row1Panel1.cshtml
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/Tasks.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/Tasks.cshtml
deleted file mode 100644
index d47819ef50..0000000000
--- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/Tasks.cshtml
+++ /dev/null
@@ -1,89 +0,0 @@
-@using SFA.DAS.Authorization
-@using SFA.DAS.Authorization.Mvc
-@using SFA.DAS.EmployerAccounts.Web.Helpers
-@using SFA.DAS.Tasks.API.Types.Enums
-
-@model SFA.DAS.EmployerAccounts.Web.ViewModels.AccountDashboardViewModel
-
-
-<section>
-    <nav>
-        <ul class="js-tabs" role="tablist">
-            <li role="tab" id="tab-tasks" aria-controls="pane-tasks"><a href="#pane-tasks">Tasks</a></li>
-            @if (Html.IsAuthorized(FeatureType.Activities))
-            {
-                <li role="tab" id="tab-activity" aria-controls="pane-activity"><a href="#pane-activity">Activity</a></li>
-            }
-        </ul>
-    </nav>
-    <div class="panes">
-        <div class="js-tab-pane" id="pane-tasks" role="tabpanel">
-            @if (Model.Tasks.Count > 0)
-            {
-                <ul class="task-list">
-                    @{
-                        var priorityOrderTaskList = Model.Tasks.OrderBy(AccountTaskHelper.GetTaskPriority).ToArray();
-                    }
-
-                    @foreach (var task in priorityOrderTaskList)
-                    {
-                        <li>
-                            @switch (task.Type)
-                            {
-                                case "LevyDeclarationDue":
-                                    <p>
-                                        Levy declaration due by 19 @DateTime.Now.ToString("MMMM")
-                                    </p>
-                                    <form action="@Url.Action("DismissTask", "Task")" method="POST">
-                                        <input type="hidden" name="taskType" value="@Enum.GetName(typeof(TaskType), TaskType.LevyDeclarationDue)" />
-                                        <button class="button-link" type="submit">Dismiss this message</button>
-                                    </form>
-                                    break;
-                                case "AgreementToSign":
-                                    <p>
-                                        @task.ItemsDueCount agreement@(task.ItemsDueCount > 1 ? "s" : "") to sign <a href="@Url.Action("ViewUnsignedAgreements", "EmployerAgreement")">View agreements</a>
-                                    </p>
-                                    break;
-                                case "AddApprentices":
-                                    <p>
-                                        <a href="@Url.EmployerCommitmentsAction("apprentices/inform")">Start adding apprentices now</a>
-                                    </p>
-                                    break;
-                                case "ApprenticeChangesToReview":
-                                    <p>
-                                        @task.ItemsDueCount apprentice change@(task.ItemsDueCount > 1 ? "s" : "") to review <a href="@Url.EmployerCommitmentsAction("apprentices/manage/all?RecordStatus=ChangesForReview")">View changes</a>
-                                    </p>
-                                    break;
-                                case "CohortRequestReadyForApproval":
-                                    <p>
-                                        @task.ItemsDueCount cohort request@(task.ItemsDueCount > 1 ? "s" : "") ready for approval <a href="@Url.EmployerCommitmentsAction("apprentices/cohorts/review")">View cohorts</a>
-                                    </p>
-                                    break;
-                                case "ReviewConnectionRequest":
-                                    <p>
-                                        @task.ItemsDueCount connection request@(task.ItemsDueCount > 1 ? "s" : "") to review <a href="@Url.Action("Index", "Transfers")">View details</a>
-                                    </p>
-                                    break;
-                                case "TransferRequestReceived":
-                                    <p>
-                                        Transfer request received<a href="@Url.Action("Index", "Transfers")">View details</a>
-                                    </p>
-                                    break;
-                            }
-                        </li>
-                    }
-                </ul>
-            }
-            else
-            {
-                <p>You do not have any tasks</p>
-            }
-        </div>
-        @if (Html.IsAuthorized(FeatureType.Activities))
-        {
-            <div class="js-tab-pane" id="pane-activity" role="tabpanel">
-                @Html.Action("Latest", "Activities")
-            </div>
-        }
-    </div>
-</section>
\ No newline at end of file
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/AccountSettings.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/AccountSettings.cshtml
deleted file mode 100644
index 93973aba8b..0000000000
--- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/AccountSettings.cshtml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-<h3 class="das-panel__heading">Your account settings</h3>
-<ul class="govuk-list">
-    <li><a href="#" class="govuk-link">Your accounts</a> </li>
-    <li><a href="#" class="govuk-link">Rename account </a> </li>
-    <li><a href="#" class="govuk-link">Change your password </a> </li>
-    <li><a href="#" class="govuk-link">Change your email address </a> </li>
-    <li><a href="#" class="govuk-link">Notification settings </a> </li>
-</ul>
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/ApprenticeshipDetails.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/ApprenticeshipDetails.cshtml
deleted file mode 100644
index fde4f32213..0000000000
--- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/ApprenticeshipDetails.cshtml
+++ /dev/null
@@ -1,28 +0,0 @@
-@model SFA.DAS.EmployerAccounts.Web.ViewModels.ApprenticeDetailsViewModel
-
-<h3 class="govuk-heading-l">Apprentice details </h3>
-
-<dl class="das-definition-list">
-    <dt class="das-definition-list__title">Name</dt>
-    <dd class="das-definition-list__definition govuk-!-margin-bottom-3">@Model.ApprenticeName</dd>
-
-    <dt class="das-definition-list__title">Apprenticeship training provider</dt>
-    <dd class="das-definition-list__definition govuk-!-margin-bottom-3">@Model.TrainingProviderName</dd>
-
-    <dt class="das-definition-list__title">Apprenticeship training course</dt>
-    <dd class="das-definition-list__definition govuk-!-margin-bottom-3">@Model.CourseName</dd>
-
-    <dt class="das-definition-list__title">Apprenticeship training start date</dt>
-    <dd class="das-definition-list__definition govuk-!-margin-bottom-3">@Model.StartDateText</dd>
-
-    <dt class="das-definition-list__title">Planned apprenticeship training end date</dt>
-    <dd class="das-definition-list__definition govuk-!-margin-bottom-3">@Model.EndDateText</dd>
-
-    <dt class="das-definition-list__title">Agreed apprenticeship training course price</dt>
-    <dd class="das-definition-list__definition">@Model.ProposedCostText</dd>
-</dl>
-
-@if (!Model.IsApproved)
-{
-    <p><a href="@Url.EmployerCommitmentsAction("apprentices/cohorts/review")" class="das-panel__link govuk-link--no-visited-state">Review and approve</a> </p>
-}
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/CreateVacancy.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/CreateVacancy.cshtml
deleted file mode 100644
index 5a909b5f37..0000000000
--- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/CreateVacancy.cshtml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-@model SFA.DAS.EmployerAccounts.Web.ViewModels.AccountDashboardViewModel
-
-<h3 class="das-panel__heading">Create an apprentice vacancy</h3>
-<p>Advertise your apprenticeship vacancies. This is your opportunity to make your vacancy attract the best candidates.</p>
-<p><a href="@Url.EmployerRecruitAction("create-vacancy/")" class="govuk-link">Create vacancy</a></p>
\ No newline at end of file
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/FinancialTransactions.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/FinancialTransactions.cshtml
deleted file mode 100644
index 83c0fca153..0000000000
--- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/FinancialTransactions.cshtml
+++ /dev/null
@@ -1,4 +0,0 @@
-@model SFA.DAS.EmployerAccounts.Web.ViewModels.AccountDashboardViewModel
-
-<h3 class="das-panel__heading">Financial Transactions</h3>
-<p>View your transactions here once you start making payments.</p>
\ No newline at end of file
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/FundingComplete.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/FundingComplete.cshtml
deleted file mode 100644
index 4ca0cadc5d..0000000000
--- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/FundingComplete.cshtml
+++ /dev/null
@@ -1,14 +0,0 @@
-@model SFA.DAS.EmployerAccounts.Web.ViewModels.AccountDashboardViewModel
-
-
-    <h3 class="das-panel__heading">You've secured apprenticeship funding</h3>
-    <dl class="das-definition-list das-definition-list--with-separator">
-        <dt class="das-definition-list__title">Employer:</dt>
-        <dd class="das-definition-list__definition">@Model.ReservedFundingOrgName</dd>
-        <dt class="das-definition-list__title">Apprenticeship training start date: </dt>
-        <dd class="das-definition-list__definition">@Model.ReservedFundingToShow.StartDate.ToString("MMMM yyyy") to @Model.ReservedFundingToShow.EndDate.ToString("MMMM yyyy")</dd>
-        <dt class="das-definition-list__title">Apprenticeship training:</dt>
-        <dd class="das-definition-list__definition">@Model.ReservedFundingToShow.CourseName</dd>
-    </dl>
-
-<p><a href="@Url.ReservationsAction("reservations/manage")" class="das-panel__link">Manage reservations</a> </p>
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/Index.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/Index.cshtml
deleted file mode 100644
index 1422cbf493..0000000000
--- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/Index.cshtml
+++ /dev/null
@@ -1,77 +0,0 @@
-@model SFA.DAS.EmployerAccounts.Web.OrchestratorResponse<SFA.DAS.EmployerAccounts.Web.ViewModels.AccountDashboardViewModel>
-
-@{
-    ViewBag.Title = "Home";
-    ViewBag.PageID = "page-company-homepage";
-}
-
-<div class="das-dashboard-header das-section--header">
-    <div class="govuk-width-container das-dashboard-header__border">
-        <h1 class="govuk-heading-m das-account__title">Account ID: @Model.Data.Account.PublicHashedId</h1>
-        <h2 class="govuk-heading-l das-account__account-name">@Model.Data.Account.Name</h2>
-        <a href="@Url.FavouritesAction("apprenticeships")" class="das-favourites-link govuk-body">
-            <span class="das-favourites-link__icon"><img src="@Html.CdnLink("images", "favourite-unchecked-black.svg")" alt=""></span>
-            <span class="das-favourites-link__text">View saved favourites</span>
-        </a>
-</div>
-</div>
-
-@if (Model.Data.ShowSearchBar)
-{
-    @Html.Action("SearchBar")
-}
-
-<main class="govuk-main-wrapper das-section--dashboard" id="main-content" role="main">
-    <div class="govuk-width-container">
-        <div class="das-panels">
-            <div class="das-panels__col das-panels__col--primary">
-                @Html.Action("Row1Panel1", new { model = Model.Data })
-                @Html.Action("Row2Panel1", new { model = Model.Data })
-            </div>
-            <div class="das-panels__col das-panels__col--secondary">
-                @Html.Action("Row1Panel2", new { model = Model.Data })
-                @Html.Action("Row2Panel2", new { model = Model.Data })
-            </div>
-        </div>
-    </div>
-    @if (Model.Data.ShowSearchBar)
-    {
-        @Html.Action("OtherTasksPanel", new {model = Model.Data})
-    }
-
-</main>
-
-
-@if (Model.Data.ShowMostActiveLinks)
-{
-    @Html.Action("MostActiveLinks", new { model = Model.Data });
-}
-
-@section pageSpecificJS {
-<script>
-    $(function () {
-        var $link = $('#other-tasks-link'),
-            $pageContent = $('.das-panels'),
-            $target = $('#das-dashboard-other-tasks'),
-            activeClass = 'das-dashboard-header__tasks-link--active';
-        $link.on('click', function (e) {
-            if ($link.hasClass(activeClass)) {
-                $link.removeClass(activeClass);
-                $target.hide();
-                $pageContent.show();
-            } else {
-                $link.addClass(activeClass);
-                $target.show();
-                $pageContent.hide();
-            }
-            e.preventDefault();
-        });
-        $link.on('keydown', function (e) {
-            if (e.which === 9 && $link.hasClass(activeClass)) {
-                $('.das-section__inner-wrap').focus();
-            }
-        });
-    });
-</script>
-
-}
\ No newline at end of file
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/MostActiveLinks.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/MostActiveLinks.cshtml
deleted file mode 100644
index 89a56fb712..0000000000
--- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/MostActiveLinks.cshtml
+++ /dev/null
@@ -1,29 +0,0 @@
-@model SFA.DAS.EmployerAccounts.Web.ViewModels.AccountDashboardViewModel
-<section class="das-section das-section--main das-dashboard-footer" aria-labelledby="more-title">
-    <div class="govuk-width-container">
-        <div class="govuk-grid-row">
-            <hr class="das-section-break das-section-break--l das-section-break--heavy das-section-break--gutters">
-            <div class="das-dashboard-footer__column das-dashboard-footer__column--title">
-                <h2 id="more-title" class="das-dashboard-footer__title">More on the Apprenticeships Service</h2>
-            </div>
-            <div class="das-dashboard-footer__column">
-                <h3 class="govuk-heading-m das-dashboard-footer__sub-title">Most active</h3>
-                <ul class="govuk-list das-list--featured">
-                    <li><a href="@Url.EmployerCommitmentsAction("apprentices/Inform")" class="govuk-link govuk-link--no-visited-state">Add an apprentice</a></li>
-                    <li><a href="@Url.EmployerCommitmentsAction("apprentices/manage/all")" class="govuk-link govuk-link--no-visited-state">Manage your apprentices</a></li>
-                    <li><a href="@Url.ProviderRelationshipsAction("providers")" class="govuk-link govuk-link--no-visited-state">Add a new training provider</a></li>
-                    <li><a href="@("/accounts/"+Model.HashedAccountId+"/agreements")" class="govuk-link govuk-link--no-visited-state">Add a new organisation</a></li>
-                    <li><a href="@("/accounts/"+Model.HashedAccountId+"/rename")" class="govuk-link govuk-link--no-visited-state">Rename your account</a></li>
-                </ul>
-            </div>
-            <div class="das-dashboard-footer__column">
-                <a class="das-promo" href="#">
-                    What you need to know about apprenticeships
-                </a>
-                <p>
-                    <a href="#" class="govuk-link govuk-link--no-visited-state">Find out more</a> about what the Apprenticeship Service can do for your organisation.
-                </p>
-            </div>
-        </div>
-    </div>
-</section>
\ No newline at end of file
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/MultipleVacancies.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/MultipleVacancies.cshtml
deleted file mode 100644
index ca34df6397..0000000000
--- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/MultipleVacancies.cshtml
+++ /dev/null
@@ -1,6 +0,0 @@
-@model SFA.DAS.EmployerAccounts.Web.ViewModels.AccountDashboardViewModel
-
-<h3 class="das-panel__heading">Recruitment</h3>
-<p>Recruit an apprentice by creating a vacancy. This vacancy will be advertised on Find an apprenticeship.</p>
-<p><a href="@Url.EmployerRecruitAction("employer-manage-vacancy")" class="govuk-link">Manage your vacancies</a></p>
-<p><a href="@Url.EmployerRecruitAction("employer-create-vacancy")" class="govuk-link">Create vacancy</a></p>
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/NotCurrentlyInStorage.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/NotCurrentlyInStorage.cshtml
deleted file mode 100644
index 94b2ed47b2..0000000000
--- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/NotCurrentlyInStorage.cshtml
+++ /dev/null
@@ -1,3 +0,0 @@
-@model SFA.DAS.EmployerAccounts.Web.ViewModels.AccountDashboardViewModel
-
-    <h3 class="das-panel__heading">We're dealing with your request, please check back later.</h3>
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/OtherTasksPanel.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/OtherTasksPanel.cshtml
deleted file mode 100644
index 8cf03a2fb3..0000000000
--- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/OtherTasksPanel.cshtml
+++ /dev/null
@@ -1,167 +0,0 @@
-@using SFA.DAS.Authorization
-@using SFA.DAS.Authorization.Mvc
-@using SFA.DAS.EmployerAccounts.Web.Helpers
-@using SFA.DAS.Tasks.API.Types.Enums
-@using SFA.DAS.EmployerAccounts.Web.Extensions
-
-
-@model SFA.DAS.EmployerAccounts.Web.ViewModels.AccountDashboardViewModel
-
-<section class="das-section das-section--overlay" aria-labelledby="other-tasks-link" id="das-dashboard-other-tasks">
-    <div class="govuk-width-container das-section__inner-wrap" tabindex="-1">
-        <div class="govuk-grid-row">
-            <div class="govuk-grid-column-two-thirds">
-                <section class="das-section-dashboard">
-                    <h2 class="das-section__heading govuk-heading-l">Apprenticeships</h2>
-                    <p class="das-section__description">Manage your apprentices, recruit apprentice and set training provider permissions.</p>
-                    <div class="das-cards">
-                        <div class="das-card">
-                            <h3 class="govuk-heading-m das-card__heading"><a href="@Url.EmployerCommitmentsAction("apprentices/home")" class="govuk-link">Apprentices</a></h3>
-                            <p>Add apprentices, update details of existing apprentices and authorise payments to training providers.</p>
-                        </div>
-                        <div class="das-card">
-                            <h3 class="govuk-heading-m das-card__heading"><a href="@Url.EmployerRecruitAction()" class="govuk-link">Recruitment</a></h3>
-                            <p>Recruit an apprentice by creating a vacancy. This vacancy will be advertised on Find an apprenticeship.</p>
-                        </div>
-                        <div class="das-card">
-                            <h3 class="govuk-heading-m das-card__heading"><a href="@Url.ProviderRelationshipsAction("providers")" class="govuk-link">Training provider permissions</a></h3>
-                            <p>Set training provider permissions and control what tasks they can do on your behalf.</p>
-                        </div>
-                        <div class="das-card">
-                            <h3 class="govuk-heading-m"><a href="https://findapprenticeshiptraining.apprenticeships.education.gov.uk/Apprenticeship/Search" rel="external" class="govuk-link">Find apprenticeship training</a></h3>
-                            <p>Search for apprenticeships and see details of approved providers who can deliver the training.</p>
-                        </div>
-                    </div>
-                </section>
-                <section class="das-section-dashboard">
-                    <h2 class="das-section__heading govuk-heading-l">Finances</h2>
-                    <p class="das-section__description">Manage your apprenticeship funds.</p>
-                    <div class="das-cards">
-                        <div class="das-card">
-                            <h3 class="govuk-heading-m das-card__heading"><a href="@Url.ReservationsAction("reservations/manage")" class="govuk-link">Manage your funds</a></h3>
-                            <p>Reserve and manage funding.</p>
-                        </div>
-                        <div class="das-card">
-                            <h3 class="govuk-heading-m das-card__heading"><a href="@Url.EmployerFinanceAction("finance")" class="govuk-link">Manage your levy</a></h3>
-                            <p>View your financial transactions, connect with other employers and send or receive transfer funds.</p>
-                        </div>
-                    </div>
-                </section>
-                <section class="das-section-dashboard--last">
-                    <h2 class="das-section__heading govuk-heading-l">Account</h2>
-                    <p class="das-section__description">Manage your account details and team.</p>
-                    <div class="das-cards">
-                        <div class="das-card">
-                            <h3 class="govuk-heading-m das-card__heading"><a href="@Url.Action("Index", "EmployerAgreement")" class="govuk-link">Your organisations and agreements</a></h3>
-                            <p>Add your organisations that will make contracts with training providers.</p>
-                        </div>
-                        <div class="das-card">
-                            <h3 class="govuk-heading-m das-card__heading"><a href="@Url.Action("ViewTeam")" class="govuk-link">Your team</a></h3>
-                            <p>Control what your team can do and invite new team members.</p>
-                        </div>
-                        <div class="das-card">
-                            <h3 class="govuk-heading-m das-card__heading"><a href="@Url.Action("Index", "EmployerAccountPaye")" class="govuk-link">PAYE schemes</a></h3>
-                            <p>Add or remove PAYE schemes.</p>
-                        </div>
-                    </div>
-                </section>
-            </div>
-            <div class="govuk-grid-column-one-third">
-                <div class="govuk-tabs" data-module="tabs">
-
-                    <ul class="govuk-tabs__list">
-                        <li class="govuk-tabs__list-item">
-                            <a class="govuk-tabs__tab govuk-tabs__tab--selected" href="#tab-tasks">
-                                Tasks
-                            </a>
-                        </li>
-                    @if (Html.IsAuthorized("EmployerFeature.Activities"))
-                    {
-                        <li class="govuk-tabs__list-item">
-                            <a class="govuk-tabs__tab" href="#tab-activity">
-                                Activity
-                            </a>
-                        </li>
-                    }
-                    </ul>
-
-                    <section class="govuk-tabs__panel" id="tab-tasks">
-                        <div class="panes">
-                            <div class="js-tab-pane" id="pane-tasks" role="tabpanel">
-                                @if (Model.Tasks.Count > 0)
-                                {
-                                    <ul class="task-list">
-                                        @{
-                                            var priorityOrderTaskList = Model.Tasks.OrderBy(AccountTaskHelper.GetTaskPriority).ToArray();
-                                        }
-
-                                        @foreach (var task in priorityOrderTaskList)
-                                        {
-                                            <li>
-                                                @switch (task.Type)
-                                                {
-                                                    case "LevyDeclarationDue":
-                                                        <p>
-                                                            Levy declaration due by 19 @DateTime.Now.ToString("MMMM")
-                                                        </p>
-                                                        <form action="@Url.Action("DismissTask", "Task")" method="POST">
-                                                            <input type="hidden" name="taskType" value="@Enum.GetName(typeof(TaskType), TaskType.LevyDeclarationDue)" />
-                                                            <button class="button-link" type="submit">Dismiss this message</button>
-                                                        </form>
-                                                        break;
-                                                    case "AgreementToSign":
-                                                        <p>
-                                                            @task.ItemsDueCount agreement@(task.ItemsDueCount > 1 ? "s" : "") to sign <a href="@Url.Action("ViewUnsignedAgreements", "EmployerAgreement")">View agreements</a>
-                                                        </p>
-                                                        break;
-                                                    case "AddApprentices":
-                                                        <p>
-                                                            <a href="@Url.EmployerCommitmentsAction("apprentices/inform")">Start adding apprentices now</a>
-                                                        </p>
-                                                        break;
-                                                    case "ApprenticeChangesToReview":
-                                                        <p>
-                                                            @task.ItemsDueCount apprentice change@(task.ItemsDueCount > 1 ? "s" : "") to review <a href="@Url.EmployerCommitmentsAction("apprentices/manage/all?RecordStatus=ChangesForReview")">View changes</a>
-                                                        </p>
-                                                        break;
-                                                    case "CohortRequestReadyForApproval":
-                                                        <p>
-                                                            @task.ItemsDueCount cohort request@(task.ItemsDueCount > 1 ? "s" : "") ready for approval <a href="@Url.EmployerCommitmentsAction("apprentices/cohorts/review")">View cohorts</a>
-                                                        </p>
-                                                        break;
-                                                    case "ReviewConnectionRequest":
-                                                        <p>
-                                                            @task.ItemsDueCount connection request@(task.ItemsDueCount > 1 ? "s" : "") to review <a href="@Url.Action("Index", "Transfers")">View details</a>
-                                                        </p>
-                                                        break;
-                                                    case "TransferRequestReceived":
-                                                        <p>
-                                                            Transfer request received<a href="@Url.Action("Index", "Transfers")">View details</a>
-                                                        </p>
-                                                        break;
-                                                }
-                                            </li>
-                                        }
-                                    </ul>
-                                }
-                                else
-                                {
-                                    <p>You do not have any tasks</p>
-                                }
-                            </div>
-   
-                        </div>
-                    </section>
-                    <section class="govuk-tabs__panel govuk-tabs__panel--hidden" id="tab-activity">
-                        @if (Html.IsAuthorized("EmployerFeature.Activities"))
-                        {
-                            <div class="js-tab-pane" id="pane-activity" role="tabpanel">
-                                @Html.Action("Latest", "Activities")
-                            </div>
-                        }
-                    </section>
-                </div>
-            </div>
-        </div>
-    </div>
-</section>
\ No newline at end of file
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/PrePAYERecruitment.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/PrePAYERecruitment.cshtml
deleted file mode 100644
index b02d576586..0000000000
--- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/PrePAYERecruitment.cshtml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-@model SFA.DAS.EmployerAccounts.Web.ViewModels.AccountDashboardViewModel
-
-<h3 class="das-panel__heading">Create an apprentice vacancy</h3>
-<p>Add your PAYE scheme first, then you can advertise apprenticeship vacancies.</p>
\ No newline at end of file
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/ProviderPermissions.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/ProviderPermissions.cshtml
deleted file mode 100644
index c92b5dee2c..0000000000
--- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/ProviderPermissions.cshtml
+++ /dev/null
@@ -1,7 +0,0 @@
-@model SFA.DAS.EmployerAccounts.Web.ViewModels.AccountDashboardViewModel
-
-    <h3 class="das-panel__heading">Add a training provider</h3>
-
-<p>Add a training provider and control what tasks you would like your training provider to do on your behalf.</p>
-<p><a href="@Url.ProviderRelationshipsAction("providers")" class="govuk-link">Add a new training provider</a> </p>
-
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/ProviderPermissionsDenied.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/ProviderPermissionsDenied.cshtml
deleted file mode 100644
index 797b3fefa6..0000000000
--- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/ProviderPermissionsDenied.cshtml
+++ /dev/null
@@ -1,6 +0,0 @@
-@model SFA.DAS.EmployerAccounts.Web.ViewModels.AccountDashboardViewModel
-
-<h3 class="das-panel__heading">Add a training provider</h3>
-<p>You must sign your employer agreement before you can add a training provider and control what tasks you would like your training provider to do on your behalf.</p>
-
-
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/ProviderPermissionsMultiple.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/ProviderPermissionsMultiple.cshtml
deleted file mode 100644
index 7693d32851..0000000000
--- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/ProviderPermissionsMultiple.cshtml
+++ /dev/null
@@ -1,7 +0,0 @@
-@model SFA.DAS.EmployerAccounts.Web.ViewModels.AccountDashboardViewModel
-
-<h3 class="das-panel__heading">Training providers</h3>
-
-<p>Set permissions for what you want training providers to do on your behalf.</p>
-<p><a href="@Url.ProviderRelationshipsAction("providers")" class="govuk-link">View permissions</a> </p>
-
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/Row1Panel2.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/Row1Panel2.cshtml
deleted file mode 100644
index 1e3dbf95ae..0000000000
--- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/Row1Panel2.cshtml
+++ /dev/null
@@ -1,5 +0,0 @@
-@model SFA.DAS.EmployerAccounts.Web.ViewModels.PanelViewModel<SFA.DAS.EmployerAccounts.Web.ViewModels.AccountDashboardViewModel>
-
-<div class="das-panel">
-    @Html.Action(Model.ViewName, new { model = Model.Data })
-</div>
\ No newline at end of file
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/Row2Panel1.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/Row2Panel1.cshtml
deleted file mode 100644
index 1e3dbf95ae..0000000000
--- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/Row2Panel1.cshtml
+++ /dev/null
@@ -1,5 +0,0 @@
-@model SFA.DAS.EmployerAccounts.Web.ViewModels.PanelViewModel<SFA.DAS.EmployerAccounts.Web.ViewModels.AccountDashboardViewModel>
-
-<div class="das-panel">
-    @Html.Action(Model.ViewName, new { model = Model.Data })
-</div>
\ No newline at end of file
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/Row2Panel2.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/Row2Panel2.cshtml
deleted file mode 100644
index 1e3dbf95ae..0000000000
--- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/Row2Panel2.cshtml
+++ /dev/null
@@ -1,5 +0,0 @@
-@model SFA.DAS.EmployerAccounts.Web.ViewModels.PanelViewModel<SFA.DAS.EmployerAccounts.Web.ViewModels.AccountDashboardViewModel>
-
-<div class="das-panel">
-    @Html.Action(Model.ViewName, new { model = Model.Data })
-</div>
\ No newline at end of file
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/SearchBar.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/SearchBar.cshtml
deleted file mode 100644
index 1d5b9cac49..0000000000
--- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/SearchBar.cshtml
+++ /dev/null
@@ -1,22 +0,0 @@
-<section class="das-section das-section--search">
-    <div class="govuk-width-container">
-        <div class="das-dashboard-header__row">
-            <div class="das-dashboard-header__col das-dashboard-header__col--primary">
-                <form>
-                    <div class="govuk-form-group das-form-group-inline das-dashboard-search">
-                        <label for="search" class="govuk-visually-hidden">Search</label>
-                        <input class="govuk-input das-dashboard-search__input" id="search" type="search" placeholder="Search" disabled="disabled">
-                        <div class="das-form-group-inline__button-wrap">
-                            <button class="govuk-button das-dashboard-search__button" type="submit">Search</button>
-                        </div>
-                    </div>
-                </form>
-            </div>
-            <div class="das-dashboard-header__col das-dashboard-header__col--secondary">
-                <a class="das-dashboard-header__tasks-link" href="#das-dashbaord-other-tasks" id="other-tasks-link">
-                    Other tasks you can do
-                </a>
-            </div>
-        </div>
-    </div>
-</section>
\ No newline at end of file
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/SingleProvider.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/SingleProvider.cshtml
deleted file mode 100644
index d59424d6e6..0000000000
--- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/SingleProvider.cshtml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-@using Microsoft.Ajax.Utilities
-@model SFA.DAS.EmployerAccounts.Web.ViewModels.AccountDashboardViewModel
-    
-    <h3 class="das-panel__heading">@Model.AccountViewModel.Providers.First().Name</h3>
-    <dl class="das-definition-list das-definition-list--inline das-definition-list--muted govuk-!-font-size-16">
-        <dt class="das-definition-list__title">UK Provider Reference Number</dt>
-        <dd class="das-definition-list__definition">@Model.AccountViewModel.Providers.First().Ukprn</dd>
-    </dl>
-    <p>
-        @if (@Model.AccountViewModel.Providers.First().Street != null)
-        {
-            @(Model.AccountViewModel.Providers.First().Street)@:, <br>
-        }
-        @(Model.AccountViewModel.Providers.First().Town)<text>, </text>@(Model.AccountViewModel.Providers.First().Postcode)
-    </p>
-    <dl class="das-definition-list das-definition-list--table-narrow">
-        @if (!Model.AccountViewModel.Providers.First().Phone.IsNullOrWhiteSpace())
-        {
-            <dt class="das-definition-list__title">Tel</dt>
-            <dd class="das-definition-list__definition"><span class="das-breakable">@Model.AccountViewModel.Providers.First().Phone</span></dd>
-        }
-        @if (!Model.AccountViewModel.Providers.First().Email.IsNullOrWhiteSpace())
-        {
-            <dt class="das-definition-list__title">Email</dt>
-            <dd class="das-definition-list__definition"><span class="das-breakable">@Model.AccountViewModel.Providers.First().Email</span></dd>
-        }
-    </dl>
-    <p><a href="@Url.ProviderRelationshipsAction("providers")" class="govuk-link govuk-link--no-visited-state">View permissions</a> </p>
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/V2AddPaye.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/V2AddPaye.cshtml
deleted file mode 100644
index 5f01491307..0000000000
--- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/V2AddPaye.cshtml
+++ /dev/null
@@ -1,6 +0,0 @@
-@using SFA.DAS.EmployerAccounts.Web.Helpers
-@model SFA.DAS.EmployerAccounts.Web.ViewModels.AccountDashboardViewModel
-
-<h3 class="das-panel__heading">You've successfully registered your account </h3>
-<p>Add your organisation's PAYE scheme and sign your employer agreement with the Education and Skills Funding Agency to get funding for apprenticeship training and assessment.</p>
-<p><a href="@("/accounts/" + Model.HashedAccountId + "/" + ControllerConstants.GetApprenticeshipFundingActionName)" class="das-panel__link">Add your PAYE scheme</a> </p>
\ No newline at end of file
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/V2CheckFunding.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/V2CheckFunding.cshtml
deleted file mode 100644
index cc89d7d5b2..0000000000
--- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/V2CheckFunding.cshtml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-@model SFA.DAS.EmployerAccounts.Web.ViewModels.AccountDashboardViewModel
-
-<h3 class="das-panel__heading">Check if funding is available for apprenticeship training </h3>
-<p>Use funding to pay for part or all of the cost of apprenticeship training.</p>
-
-<p><a href="@Url.ReservationsAction("reservations")" class="das-panel__link">Check and reserve funding now</a> </p>
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/V2SignAgreement.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/V2SignAgreement.cshtml
deleted file mode 100644
index 5f887c3d75..0000000000
--- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/V2SignAgreement.cshtml
+++ /dev/null
@@ -1,5 +0,0 @@
-@model SFA.DAS.EmployerAccounts.Web.ViewModels.AccountDashboardViewModel
-
-<h3 class="das-panel__heading">You've successfully registered your account</h3>
-<p>Sign your employer agreement with the Education and Skills Funding Agency to get funding for apprenticeship training.</p>
-<p><a href="@Url.Action("AboutYourAgreement", "EmployerAgreement", new { agreementId = Model.PendingAgreements.FirstOrDefault().HashedAgreementId, hashedAccountId = Model.HashedAccountId })" class="das-panel__link">Sign your employer agreement</a> </p>
diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/VacancyStatus.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/VacancyStatus.cshtml
deleted file mode 100644
index 4a2f72bd63..0000000000
--- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/V2/VacancyStatus.cshtml
+++ /dev/null
@@ -1,22 +0,0 @@
-@model SFA.DAS.EmployerAccounts.Web.ViewModels.VacancyStatusViewModel
-
-<h3 class="das-panel__heading">Your vacancy</h3>
-<p>@Model.VacancyTitle <span class="das-!-display--block das-text--muted">@Model.Reference</span></p>
-<dl class="das-definition-list das-definition-list--inline">
-    <dt class="das-definition-list__title">Closing date</dt>
-    <dd class="das-definition-list__definition">@Model.ClosingDateText</dd>
-
-    @{ if (Model.Applications != null)
-        {
-            <dt class="das-definition-list__title">Applications</dt>
-            <dd class="das-definition-list__definition">@Model.Applications</dd>
-        }
-    }
-
-    <dt class="das-definition-list__title">Status</dt>
-    <dd class="das-definition-list__definition">@Model.Status</dd>
-</dl>
-<ul class="govuk-list">
-    <li><a href="@Model.ManageVacancyLinkUrl" class="govuk-link govuk-link--no-visited-state">@Model.ManageVacancyLinkText</a> </li>
-    <li><a href="@Url.EmployerRecruitAction("create-options/")" class="govuk-link govuk-link--no-visited-state">Create vacancy</a> </li>
-</ul>
\ No newline at end of file

From 6e5e077f52d116314d9c31786b655cf3a37346dd Mon Sep 17 00:00:00 2001
From: Kevin <kevin@stephek.co.uk>
Date: Fri, 3 Apr 2020 15:46:35 +0100
Subject: [PATCH 2/4] CON-1619-tidy-up

---
 .../Orchestrators/EmployerTeamOrchestrator.cs         | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs b/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs
index e364d7b8e1..3b9779ce4d 100644
--- a/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs
@@ -1,5 +1,6 @@
 using AutoMapper;
 using MediatR;
+using SFA.DAS.Common.Domain.Types;
 using SFA.DAS.EAS.Account.Api.Client;
 using SFA.DAS.EAS.Account.Api.Types;
 using SFA.DAS.EmployerAccounts.Commands.ChangeTeamMemberRole;
@@ -13,7 +14,7 @@
 using SFA.DAS.EmployerAccounts.Models.Account;
 using SFA.DAS.EmployerAccounts.Models.AccountTeam;
 using SFA.DAS.EmployerAccounts.Models.CommitmentsV2;
-using SFA.DAS.EmployerAccounts.Queries.GetSingleCohort;
+using SFA.DAS.EmployerAccounts.Models.Recruit;
 using SFA.DAS.EmployerAccounts.Queries.GetAccountEmployerAgreements;
 using SFA.DAS.EmployerAccounts.Queries.GetAccountStats;
 using SFA.DAS.EmployerAccounts.Queries.GetAccountTasks;
@@ -23,8 +24,10 @@
 using SFA.DAS.EmployerAccounts.Queries.GetInvitation;
 using SFA.DAS.EmployerAccounts.Queries.GetMember;
 using SFA.DAS.EmployerAccounts.Queries.GetReservations;
+using SFA.DAS.EmployerAccounts.Queries.GetSingleCohort;
 using SFA.DAS.EmployerAccounts.Queries.GetTeamUser;
 using SFA.DAS.EmployerAccounts.Queries.GetUser;
+using SFA.DAS.EmployerAccounts.Queries.GetVacancies;
 using SFA.DAS.EmployerAccounts.Web.ViewModels;
 using SFA.DAS.Validation;
 using System;
@@ -32,13 +35,7 @@
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
-using SFA.DAS.Authorization.Services;
-using SFA.DAS.EmployerAccounts.Models;
-using SFA.DAS.CommitmentsV2.Api.Client;
-using SFA.DAS.EmployerAccounts.Queries.GetVacancies;
-using SFA.DAS.EmployerAccounts.Models.Recruit;
 using ResourceNotFoundException = SFA.DAS.EmployerAccounts.Web.Exceptions.ResourceNotFoundException;
-using SFA.DAS.Common.Domain.Types;
 
 namespace SFA.DAS.EmployerAccounts.Web.Orchestrators
 {

From 280eb410c230c4483ad73f175467639cb41ffb3a Mon Sep 17 00:00:00 2001
From: Kevin <kevin@stephek.co.uk>
Date: Tue, 7 Apr 2020 09:10:02 +0100
Subject: [PATCH 3/4] CON-1619-clean -up-tests

---
 .../WhenAgreementToSign.cs                    |  2 +-
 .../WhenAgreementToSign.cs                    | 58 ------------
 .../WhenFundsToReserve.cs                     | 88 -------------------
 .../WhenFundsToReserve.cs                     | 33 ++++++-
 .../WhenNoPayeScheme.cs                       |  2 +-
 .../WhenSetupSingleApprentice.cs              |  2 +-
 .../WhenSetupSingleApprenticeByProvider.cs    |  2 +-
 .../WhenSetupSingleApprenticeStatus.cs        |  2 +-
 .../WhenSetupSingleReservation.cs             |  2 +-
 .../WhenSupportUserBannerIsRendered.cs        |  2 +-
 .../WhenVacancyInProgress.cs                  |  2 +-
 11 files changed, 39 insertions(+), 156 deletions(-)
 delete mode 100644 src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenAgreementToSign.cs
 delete mode 100644 src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenFundsToReserve.cs
 rename src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/{WhenCallToActionToggleIsEnabled => }/WhenSetupSingleApprentice.cs (98%)
 rename src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/{WhenCallToActionToggleIsEnabled => }/WhenSetupSingleApprenticeByProvider.cs (98%)
 rename src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/{WhenCallToActionToggleIsEnabled => }/WhenSetupSingleApprenticeStatus.cs (99%)
 rename src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/{WhenCallToActionToggleIsEnabled => }/WhenSetupSingleReservation.cs (97%)

diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenAgreementToSign.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenAgreementToSign.cs
index 5776acaade..d33cd0b0b9 100644
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenAgreementToSign.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenAgreementToSign.cs
@@ -7,7 +7,7 @@
 using SFA.DAS.EmployerAccounts.Web.Orchestrators;
 using SFA.DAS.EmployerAccounts.Web.ViewModels;
 
-namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests.WhenHomePageToggleIsEnabled
+namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests
 {
     public class WhenAgreementToSign
     {
diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenAgreementToSign.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenAgreementToSign.cs
deleted file mode 100644
index dd34f60248..0000000000
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenAgreementToSign.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System.Web.Mvc;
-using Moq;
-using NUnit.Framework;
-using SFA.DAS.Authentication;
-using SFA.DAS.EmployerAccounts.Interfaces;
-using SFA.DAS.EmployerAccounts.Web.Controllers;
-using SFA.DAS.EmployerAccounts.Web.Orchestrators;
-using SFA.DAS.EmployerAccounts.Web.ViewModels;
-
-namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests.WhenCallToActionToggleIsEnabled
-{
-    public class WhenAgreementToSign
-    {
-        private EmployerTeamController _controller;
-
-        private Mock<IAuthenticationService> mockAuthenticationService;
-        private Mock<IMultiVariantTestingService> mockMultiVariantTestingService;
-        private Mock<ICookieStorageService<FlashMessageViewModel>> mockCookieStorageService;
-        private Mock<EmployerTeamOrchestrator> mockEmployerTeamOrchestrator;
-
-        [SetUp]
-        public void Arrange()
-        {
-            mockAuthenticationService = new Mock<IAuthenticationService>();
-            mockMultiVariantTestingService = new Mock<IMultiVariantTestingService>();
-            mockCookieStorageService = new Mock<ICookieStorageService<FlashMessageViewModel>>();
-            mockEmployerTeamOrchestrator = new Mock<EmployerTeamOrchestrator>();
-
-            _controller = new EmployerTeamController(
-                mockAuthenticationService.Object,
-                mockMultiVariantTestingService.Object,
-                mockCookieStorageService.Object,
-                mockEmployerTeamOrchestrator.Object);
-        }
-
-        [Test]
-        public void ThenTheSignAgreementViewIsReturnedAtRow1Panel1()
-        {
-            // Arrange
-            var model = new AccountDashboardViewModel
-            {
-                PayeSchemeCount = 1,
-                CallToActionViewModel = new CallToActionViewModel
-                {
-                    AgreementsToSign = true
-                }
-            };
-
-            //Act
-            var result = _controller.Row1Panel1(model) as PartialViewResult;
-
-            //Assert
-            Assert.IsNotNull(result);
-            Assert.AreEqual("SignAgreement", (result.Model as dynamic).ViewName);
-            Assert.AreEqual(PanelType.Interruption, (result.Model as dynamic).PanelType);
-        }
-    }
-}
diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenFundsToReserve.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenFundsToReserve.cs
deleted file mode 100644
index de5174e185..0000000000
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenFundsToReserve.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using System.Collections.Generic;
-using System.Web.Mvc;
-using Moq;
-using NUnit.Framework;
-using SFA.DAS.Authentication;
-using SFA.DAS.EmployerAccounts.Interfaces;
-using SFA.DAS.EmployerAccounts.Models.Reservations;
-using SFA.DAS.EmployerAccounts.Web.Controllers;
-using SFA.DAS.EmployerAccounts.Web.Orchestrators;
-using SFA.DAS.EmployerAccounts.Web.ViewModels;
-
-namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests.WhenCallToActionToggleIsEnabled
-{
-    public class WhenFundsToReserve
-    {
-        private EmployerTeamController _controller;
-
-        private Mock<IAuthenticationService> mockAuthenticationService;
-        private Mock<IMultiVariantTestingService> mockMultiVariantTestingService;
-        private Mock<ICookieStorageService<FlashMessageViewModel>> mockCookieStorageService;
-        private Mock<EmployerTeamOrchestrator> mockEmployerTeamOrchestrator;
-
-        [SetUp]
-        public void Arrange()
-        {
-            mockAuthenticationService = new Mock<IAuthenticationService>();
-            mockMultiVariantTestingService = new Mock<IMultiVariantTestingService>();
-            mockCookieStorageService = new Mock<ICookieStorageService<FlashMessageViewModel>>();
-            mockEmployerTeamOrchestrator = new Mock<EmployerTeamOrchestrator>();
-
-            _controller = new EmployerTeamController(
-                mockAuthenticationService.Object,
-                mockMultiVariantTestingService.Object,
-                mockCookieStorageService.Object,
-                mockEmployerTeamOrchestrator.Object);
-        }
-
-        [Test]
-        public void ThenForNonLevyTheCheckFundingViewIsReturnedAtRow1Panel1()
-        {
-            // Arrange
-            var model = new AccountDashboardViewModel()
-            {
-                PayeSchemeCount = 1,
-                CallToActionViewModel = new CallToActionViewModel
-                {
-                    AgreementsToSign = false,
-                    VacanciesViewModel = new VacanciesViewModel()
-                },
-                ApprenticeshipEmployerType = Common.Domain.Types.ApprenticeshipEmployerType.NonLevy
-            };
-            
-            //Act
-            var result = _controller.Row1Panel1(model) as PartialViewResult;
-
-            //Assert
-            Assert.IsNotNull(result);
-            Assert.AreEqual("CheckFunding", (result.Model as dynamic).ViewName);
-            Assert.AreEqual(PanelType.Action, (result.Model as dynamic).PanelType);
-        }
-
-        [Test]
-        public void ThenForNonLevyTheContinueSetupForSingleReservationViewIsReturnedAtRow1Panel1()
-        {
-            // Arrange
-            var model = new AccountDashboardViewModel
-            {
-                PayeSchemeCount = 1,
-                CallToActionViewModel = new CallToActionViewModel
-                {
-                    AgreementsToSign = false,
-                    Reservations = new List<Reservation> { new Reservation { Status = ReservationStatus.Pending } },
-                    VacanciesViewModel = new VacanciesViewModel()
-                },
-
-                ApprenticeshipEmployerType = Common.Domain.Types.ApprenticeshipEmployerType.NonLevy
-            };
-
-            //Act
-            var result = _controller.Row1Panel1(model) as PartialViewResult;
-
-            //Assert
-            Assert.IsNotNull(result);
-            Assert.AreEqual("ContinueSetupForSingleReservation", (result.Model as dynamic).ViewName);
-            Assert.AreEqual(PanelType.Summary, (result.Model as dynamic).PanelType);
-        }
-    }
-}
diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenFundsToReserve.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenFundsToReserve.cs
index 8ab4d21ff6..292891e9a5 100644
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenFundsToReserve.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenFundsToReserve.cs
@@ -1,13 +1,15 @@
-using System.Web.Mvc;
+using System.Collections.Generic;
+using System.Web.Mvc;
 using Moq;
 using NUnit.Framework;
 using SFA.DAS.Authentication;
 using SFA.DAS.EmployerAccounts.Interfaces;
+using SFA.DAS.EmployerAccounts.Models.Reservations;
 using SFA.DAS.EmployerAccounts.Web.Controllers;
 using SFA.DAS.EmployerAccounts.Web.Orchestrators;
 using SFA.DAS.EmployerAccounts.Web.ViewModels;
 
-namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests.WhenHomePageToggleIsEnabled
+namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests
 {
     public class WhenFundsToReserve
     {
@@ -54,6 +56,7 @@ public void ThenForNonLevyTheCheckFundingViewIsReturnedAtRow1Panel1()
             //Assert
             Assert.IsNotNull(result);
             Assert.AreEqual("CheckFunding", (result.Model as dynamic).ViewName);
+            Assert.AreEqual(PanelType.Action, (result.Model as dynamic).PanelType);
         }
 
         [Test]
@@ -78,5 +81,31 @@ public void ThenForLevyTheEmptyViewIsReturnedAtRow1Panel1()
             Assert.IsNotNull(result);
             Assert.AreEqual("Empty", (result.Model as dynamic).ViewName);
         }
+
+        [Test]
+        public void ThenForNonLevyTheContinueSetupForSingleReservationViewIsReturnedAtRow1Panel1()
+        {
+            // Arrange
+            var model = new AccountDashboardViewModel
+            {
+                PayeSchemeCount = 1,
+                CallToActionViewModel = new CallToActionViewModel
+                {
+                    AgreementsToSign = false,
+                    Reservations = new List<Reservation> { new Reservation { Status = ReservationStatus.Pending } },
+                    VacanciesViewModel = new VacanciesViewModel()
+                },
+
+                ApprenticeshipEmployerType = Common.Domain.Types.ApprenticeshipEmployerType.NonLevy
+            };
+
+            //Act
+            var result = _controller.Row1Panel1(model) as PartialViewResult;
+
+            //Assert
+            Assert.IsNotNull(result);
+            Assert.AreEqual("ContinueSetupForSingleReservation", (result.Model as dynamic).ViewName);
+            Assert.AreEqual(PanelType.Summary, (result.Model as dynamic).PanelType);
+        }
     }
 }
diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenNoPayeScheme.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenNoPayeScheme.cs
index 9332c11961..75a38e01d1 100644
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenNoPayeScheme.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenNoPayeScheme.cs
@@ -7,7 +7,7 @@
 using SFA.DAS.EmployerAccounts.Web.Orchestrators;
 using SFA.DAS.EmployerAccounts.Web.ViewModels;
 
-namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests.WhenHomePageToggleIsEnabled
+namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests
 {
     public class WhenNoPayeScheme
     {
diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenSetupSingleApprentice.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenSetupSingleApprentice.cs
similarity index 98%
rename from src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenSetupSingleApprentice.cs
rename to src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenSetupSingleApprentice.cs
index b86bfd1861..b55a9d09d7 100644
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenSetupSingleApprentice.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenSetupSingleApprentice.cs
@@ -11,7 +11,7 @@
 using SFA.DAS.EmployerAccounts.Web.Orchestrators;
 using SFA.DAS.EmployerAccounts.Web.ViewModels;
 
-namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests.WhenCallToActionToggleIsEnabled
+namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests
 {
     public class WhenSetupSingleApprentice
     {
diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenSetupSingleApprenticeByProvider.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenSetupSingleApprenticeByProvider.cs
similarity index 98%
rename from src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenSetupSingleApprenticeByProvider.cs
rename to src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenSetupSingleApprenticeByProvider.cs
index 637b3485ec..eee6cd09c9 100644
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenSetupSingleApprenticeByProvider.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenSetupSingleApprenticeByProvider.cs
@@ -10,7 +10,7 @@
 using SFA.DAS.EmployerAccounts.Web.Orchestrators;
 using SFA.DAS.EmployerAccounts.Web.ViewModels;
 
-namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests.WhenCallToActionToggleIsEnabled
+namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests
 {
     public class WhenSetupSingleApprenticeByProvider
     {
diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenSetupSingleApprenticeStatus.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenSetupSingleApprenticeStatus.cs
similarity index 99%
rename from src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenSetupSingleApprenticeStatus.cs
rename to src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenSetupSingleApprenticeStatus.cs
index 19689d11ec..39d1285d6f 100644
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenSetupSingleApprenticeStatus.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenSetupSingleApprenticeStatus.cs
@@ -10,7 +10,7 @@
 using SFA.DAS.EmployerAccounts.Web.Orchestrators;
 using SFA.DAS.EmployerAccounts.Web.ViewModels;
 
-namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests.WhenCallToActionToggleIsEnabled
+namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests
 {
     public class WhenSetupSingleApprenticeStatus
     {
diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenSetupSingleReservation.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenSetupSingleReservation.cs
similarity index 97%
rename from src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenSetupSingleReservation.cs
rename to src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenSetupSingleReservation.cs
index df6185f5bc..ab3bd65a9e 100644
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenCallToActionToggleIsEnabled/WhenSetupSingleReservation.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenSetupSingleReservation.cs
@@ -9,7 +9,7 @@
 using SFA.DAS.EmployerAccounts.Web.Orchestrators;
 using SFA.DAS.EmployerAccounts.Web.ViewModels;
 
-namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests.WhenCallToActionToggleIsEnabled
+namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests
 {
     public class WhenSetupSingleReservation
     {
diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenSupportUserBannerIsRendered.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenSupportUserBannerIsRendered.cs
index 8170ee0e94..3456f43acb 100644
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenSupportUserBannerIsRendered.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenSupportUserBannerIsRendered.cs
@@ -14,7 +14,7 @@
 using SFA.DAS.EmployerAccounts.Web.ViewModels;
 using SFA.DAS.EmployerAccounts.Models.Account;
 
-namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests.WhenHomePageToggleIsEnabled
+namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests
 {
     public class WhenSupportUserBannerIsRendered
     {
diff --git a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenVacancyInProgress.cs b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenVacancyInProgress.cs
index 24be2c2a2c..dc70371dca 100644
--- a/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenVacancyInProgress.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web.UnitTests/Controllers/EmployerTeamControllerTests/WhenVacancyInProgress.cs
@@ -8,7 +8,7 @@
 using SFA.DAS.EmployerAccounts.Web.Orchestrators;
 using SFA.DAS.EmployerAccounts.Web.ViewModels;
 
-namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests.WhenHomePageToggleIsEnabled
+namespace SFA.DAS.EmployerAccounts.Web.UnitTests.Controllers.EmployerTeamControllerTests
 {
     public class WhenVacancyInProgress
     {

From 312ef90214f0e0b9296c8620d6e5d81fa097883e Mon Sep 17 00:00:00 2001
From: Kevin <kevin@stephek.co.uk>
Date: Mon, 27 Apr 2020 11:37:24 +0100
Subject: [PATCH 4/4] CON-1619-tidy-up-using-statements

---
 .../Orchestrators/EmployerTeamOrchestrator.cs              | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs b/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs
index 0493ccca14..1e78a6f8ab 100644
--- a/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs
+++ b/src/SFA.DAS.EmployerAccounts.Web/Orchestrators/EmployerTeamOrchestrator.cs
@@ -14,8 +14,6 @@
 using SFA.DAS.EmployerAccounts.Models.Account;
 using SFA.DAS.EmployerAccounts.Models.AccountTeam;
 using SFA.DAS.EmployerAccounts.Models.CommitmentsV2;
-using SFA.DAS.EmployerAccounts.Queries.GetSingleCohort;
-using SFA.DAS.EmployerAccounts.Models.CommitmentsV2;
 using SFA.DAS.EmployerAccounts.Models.Recruit;
 using SFA.DAS.EmployerAccounts.Queries.GetAccountEmployerAgreements;
 using SFA.DAS.EmployerAccounts.Queries.GetAccountStats;
@@ -26,7 +24,7 @@
 using SFA.DAS.EmployerAccounts.Queries.GetInvitation;
 using SFA.DAS.EmployerAccounts.Queries.GetMember;
 using SFA.DAS.EmployerAccounts.Queries.GetReservations;
-using SFA.DAS.EmployerAccounts.Queries.GetSingleCohort;
+using SFA.DAS.EmployerAccounts.Queries.GetSingleCohort;
 using SFA.DAS.EmployerAccounts.Queries.GetTeamUser;
 using SFA.DAS.EmployerAccounts.Queries.GetUser;
 using SFA.DAS.EmployerAccounts.Queries.GetVacancies;
@@ -37,10 +35,7 @@
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
-using SFA.DAS.EmployerAccounts.Queries.GetVacancies;
-using SFA.DAS.EmployerAccounts.Models.Recruit;
 using ResourceNotFoundException = SFA.DAS.EmployerAccounts.Web.Exceptions.ResourceNotFoundException;
-using SFA.DAS.Common.Domain.Types;
 
 namespace SFA.DAS.EmployerAccounts.Web.Orchestrators
 {