diff --git a/resources/views/portal/ninja2020/layout/clean_setup.blade.php b/resources/views/setup/clean_setup.blade.php
similarity index 89%
rename from resources/views/portal/ninja2020/layout/clean_setup.blade.php
rename to resources/views/setup/clean_setup.blade.php
index 62d64724417a..d1bd3dfd792a 100644
--- a/resources/views/portal/ninja2020/layout/clean_setup.blade.php
+++ b/resources/views/setup/clean_setup.blade.php
@@ -42,13 +42,7 @@
         @endif
 
         <!-- Title -->
-        @auth('contact')
-            <title>@yield('meta_title', '') — {{ auth()->guard('contact')->user()->user->account->isPaid() ? auth()->guard('contact')->user()->company->present()->name() : 'Invoice Ninja' }}</title>
-        @endauth
-
-        @guest
-            <title>@yield('meta_title', '') — {{ config('app.name') }}</title>
-        @endguest
+        <title>@yield('meta_title', '') — {{ config('app.name') }}</title>
 
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -86,10 +80,6 @@
             <link href="{{ str_replace("setup", "", Request::url())}}css/app.css" rel="stylesheet">
         @endif
 
-        @if(auth()->guard('contact')->user() && !auth()->guard('contact')->user()->user->account->isPaid())
-        {{-- <link href="{{ mix('favicon.png') }}" rel="shortcut icon" type="image/png"> --}}
-        @endif
-
         <link rel="canonical" href="{{ config('ninja.app_url') }}/{{ request()->path() }}"/>
 
         {{-- Feel free to push anything to header using @push('header') --}}
@@ -102,8 +92,6 @@
         <link rel="stylesheet" type="text/css" href="{{ asset('vendor/cookieconsent@3/cookieconsent.min.css') }}" />
     </head>
 
-    @include('portal.ninja2020.components.primary-color')
-
     <body class="antialiased {{ $custom_body_class ?? '' }}">
         @if(session()->has('message'))
             <div class="py-1 text-sm text-center text-white bg-primary disposable-alert">
diff --git a/resources/views/setup/index.blade.php b/resources/views/setup/index.blade.php
index cc80a848317c..c77d84ef06d1 100644
--- a/resources/views/setup/index.blade.php
+++ b/resources/views/setup/index.blade.php
@@ -1,4 +1,4 @@
-@extends('portal.ninja2020.layout.clean_setup')
+@extends('setup.clean_setup')
 @section('meta_title', ctrans('texts.setup'))
 
 @section('body')
