diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco/UmbracoBackOffice/Default.cshtml b/src/Umbraco.Web.UI.NetCore/Umbraco/UmbracoBackOffice/Default.cshtml
deleted file mode 100644
index 55959c27a8..0000000000
--- a/src/Umbraco.Web.UI.NetCore/Umbraco/UmbracoBackOffice/Default.cshtml
+++ /dev/null
@@ -1,128 +0,0 @@
-﻿@using Umbraco.Core
-@using Umbraco.Web.WebAssets
-@using Umbraco.Web.Common.Security
-@using Umbraco.Core.WebAssets
-@using Umbraco.Core.Configuration
-@using Umbraco.Core.Hosting
-@using Umbraco.Extensions
-@using Umbraco.Core.Logging
-@using Umbraco.Web.BackOffice.Controllers
-@inject BackOfficeSignInManager signInManager
-@inject BackOfficeServerVariables backOfficeServerVariables
-@inject IUmbracoVersion umbracoVersion
-@inject IHostingEnvironment hostingEnvironment
-@inject IGlobalSettings globalSettings
-@inject IRuntimeMinifier runtimeMinifier
-@inject IProfilerHtml profilerHtml
-
-@{
-    var isDebug = false;
-    var qryDebug = Context.Request.Query["umbDebug"].ToString().TryConvertTo<bool>();
-    isDebug = qryDebug.Success && qryDebug.Result;
-    var backOfficePath = globalSettings.GetBackOfficePath(hostingEnvironment);
-}
-
-<!DOCTYPE html>
-
-<html lang="en">
-<head>
-    <base href="@backOfficePath.EnsureEndsWith('/')" />
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="robots" content="noindex, nofollow">
-    <meta name="pinterest" content="nopin" />
-
-    <title ng-bind="$root.locationTitle">Umbraco</title>
-
-    @Html.Raw(await runtimeMinifier.RenderCssHereAsync(BackOfficeWebAssets.UmbracoInitCssBundleName))
-
-</head>
-<body ng-class="{'touch':touchDevice, 'emptySection':emptySection, 'umb-drawer-is-visible':drawer.show, 'umb-tour-is-visible': tour.show, 'tabbing-active':tabbingActive}" ng-controller="Umbraco.MainController" id="umbracoMainPageBody">
-
-    <noscript>
-        <div style="margin: 10px;">
-            <h3><img src="assets/img/application/logo.png" alt="Umbraco logo" style="vertical-align: text-bottom;" /> Umbraco</h3>
-            <p>For full functionality of Umbraco CMS it is necessary to enable JavaScript.</p>
-            <p>Here are the <a href="https://www.enable-javascript.com/" target="_blank" style="text-decoration: underline;">instructions how to enable JavaScript in your web browser</a>.</p>
-        </div>
-    </noscript>
-
-    <div ng-hide="!authenticated" ng-cloak>
-
-        <div style="display: none;" id="mainwrapper" class="clearfix">
-
-            <umb-app-header></umb-app-header>
-
-            <div class="umb-app-content">
-
-                <umb-navigation></umb-navigation>
-
-                <section id="contentwrapper">
-
-                    <div id="contentcolumn">
-                        <div class="umb-editor" ng-view></div>
-                    </div>
-
-                </section>
-
-            </div>
-
-            <umb-notifications></umb-notifications>
-
-        </div>
-
-        <umb-tour ng-if="tour.show"
-                  model="tour">
-        </umb-tour>
-
-        <!-- help dialog controller by the help button - this also forces the backoffice UI to shift 400px  -->
-        <umb-drawer data-element="drawer" ng-if="drawer.show" model="drawer.model" view="drawer.view"></umb-drawer>
-
-        <umb-search ng-if="search.show" on-close="closeSearch()"></umb-search>
-
-    </div>
-
-    <umb-backdrop ng-if="backdrop.show || infiniteMode"
-                  backdrop-opacity="backdrop.opacity"
-                  highlight-element="backdrop.element"
-                  highlight-prevent-click="backdrop.elementPreventClick"
-                  disable-events-on-click="backdrop.disableEventsOnClick">
-    </umb-backdrop>
-
-    <umb-overlay ng-if="overlay.show"
-                 model="overlay"
-                 position="{{overlay.position}}"
-                 view="overlay.view"
-                 parent-scope="overlay.parentScope">
-    </umb-overlay>
-
-    <umb-editors ng-show="infiniteMode"></umb-editors>
-
-    <umb-login ng-if="login.show"
-               on-login="hideLoginScreen()">
-    </umb-login>
-
-    @await Html.BareMinimumServerVariablesScriptAsync(backOfficeServerVariables)
-
-    <script>
-        document.angularReady = function(app) {
-            @await Html.AngularValueExternalLoginInfoScriptAsync(signInManager, ViewData.GetExternalSignInError())
-            @Html.AngularValueResetPasswordCodeInfoScript(ViewData["PasswordResetCode"])
-            @await Html.AngularValueTinyMceAssetsAsync(runtimeMinifier)
-            //required for the noscript trick
-            document.getElementById("mainwrapper").style.display = "inherit";
-        }
-    </script>
-
-    <script src="lib/lazyload-js/LazyLoad.min.js"></script>
-    <script src="@Url.GetUrlWithCacheBust("Application", "BackOffice", null, hostingEnvironment, umbracoVersion, runtimeMinifier)"></script>
-
-    @if (isDebug)
-    {
-        @Html.Raw(profilerHtml.Render())
-    }
-
-</body>
-</html>
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml
similarity index 100%
rename from src/Umbraco.Web.UI.NetCore/Umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml
rename to src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml
diff --git a/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml b/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
index d399817502..c71957e77d 100644
--- a/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
+++ b/src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
@@ -16,9 +16,7 @@
 @inject IProfilerHtml profilerHtml
 
 @{
-    var isDebug = false;
-    var qryDebug = Context.Request.Query["umbDebug"].TryConvertTo<bool>();
-    isDebug = qryDebug.Success && qryDebug.Result;
+    bool.TryParse(Context.Request.Query["umbDebug"], out bool isDebug);
     var backOfficePath = globalSettings.GetBackOfficePath(hostingEnvironment);
 }
 
