diff --git a/frontend/src/App.spec.js b/frontend/src/App.spec.js
index ba37c0cd4..861e801a5 100644
--- a/frontend/src/App.spec.js
+++ b/frontend/src/App.spec.js
@@ -1,10 +1,7 @@
 import { mount, RouterLinkStub } from '@vue/test-utils'
 import App from './App'
-// import VueRouter from 'vue-router'
 
 const localVue = global.localVue
-// localVue.use(VueRouter)
-// const router = new VueRouter()
 const mockStoreCommit = jest.fn()
 
 const stubs = {
diff --git a/frontend/src/components/Auth/Carousel.vue b/frontend/src/components/Auth/Carousel.vue
index 024c7e653..293091bd5 100644
--- a/frontend/src/components/Auth/Carousel.vue
+++ b/frontend/src/components/Auth/Carousel.vue
@@ -1,14 +1,6 @@
 <template>
   <div>
-    <b-carousel
-      id="carousel-1"
-      v-model="slide"
-      :interval="30000"
-      controls
-      indicators
-      @sliding-start="onSlideStart"
-      @sliding-end="onSlideEnd"
-    >
+    <b-carousel :interval="30000">
       <b-carousel-slide img-src="/img/template/Foto_01.jpg"></b-carousel-slide>
       <b-carousel-slide img-src="https://picsum.photos/1324/2324/?image=50"></b-carousel-slide>
       <b-carousel-slide img-src="https://picsum.photos/1024/2024/?image=58"></b-carousel-slide>
@@ -20,33 +12,17 @@
 <script>
 export default {
   name: 'AuthCarousel',
-  data() {
-    return {
-      slide: 0,
-      sliding: null,
-    }
-  },
-  methods: {
-    onSlideStart(slide) {
-      this.sliding = true
-    },
-    onSlideEnd(slide) {
-      this.sliding = false
-    },
-  },
 }
 </script>
 <style>
 .carousel {
   position: relative;
-  height: 120%;
-  top: -138px;
-  bottom: -369px;
+  height: 110%;
+  top: -16px;
 }
 
 .carousel-inner {
-  background-color: brown;
   height: 100%;
-  border-radius: 0 94% 63% 0/0 78% 54% 0;
+  border-radius: 0% 49% 49% 0% / 0% 51% 49% 0%;
 }
 </style>
diff --git a/frontend/src/components/Auth/Header.vue b/frontend/src/components/Auth/Header.vue
index 0a0804c24..415167573 100644
--- a/frontend/src/components/Auth/Header.vue
+++ b/frontend/src/components/Auth/Header.vue
@@ -13,7 +13,6 @@
       <b-navbar-toggle target="nav-collapse"></b-navbar-toggle>
 
       <b-collapse id="nav-collapse" is-nav>
-        <!-- Right aligned nav items -->
         <b-navbar-nav class="ml-auto" right>
           <b-nav-item href="https://gradido.net/de/" target="_blank">
             {{ $t('auth.navbar.overGradido') }}
@@ -69,19 +68,6 @@ export default {
   padding-bottom: 10px;
 }
 
-.g-logo-radius {
-  -webkit-border-top-right-radius: 77px;
-  -webkit-border-bottom-right-radius: 137px;
-  -webkit-border-bottom-left-radius: 0px;
-  -moz-border-radius-topright: 77px;
-  -moz-border-radius-bottomright: 137px;
-  -moz-border-radius-bottomleft: 0px;
-  border-top-right-radius: 77px;
-  border-bottom-right-radius: 137px;
-  border-bottom-left-radius: 0px;
-  z-index: 1;
-}
-
 .header-img {
   position: absolute;
   top: -11px;
diff --git a/frontend/src/components/LanguageSwitch2.vue b/frontend/src/components/LanguageSwitch2.vue
index de034d5e7..1359e2e16 100644
--- a/frontend/src/components/LanguageSwitch2.vue
+++ b/frontend/src/components/LanguageSwitch2.vue
@@ -30,7 +30,7 @@ export default {
       this.currentLanguage = this.getLocaleObject(locale)
     },
     async saveLocale(locale) {
-      // if (this.$i18n.locale === locale) return
+      if (this.$i18n.locale === locale) return
       this.setLocale(locale)
       if (this.$store.state.email) {
         this.$apollo
diff --git a/frontend/src/layouts/AuthLayout_gdd.spec.js b/frontend/src/layouts/AuthLayout_gdd.spec.js
index e4aa10a23..0a5ad6933 100644
--- a/frontend/src/layouts/AuthLayout_gdd.spec.js
+++ b/frontend/src/layouts/AuthLayout_gdd.spec.js
@@ -59,16 +59,5 @@ describe('AuthLayoutGdd', () => {
       wrapper.vm.setTextSize('85')
       expect(wrapper.vm.$refs.pageFontSize.style.fontSize).toBe('85rem')
     })
-
-    // describe('check LanguageSwitch on register page', () => {
-    //   beforeEach(() => {
-    //     mocks.$route.path = '/register'
-    //     wrapper = Wrapper()
-    //   })
-    //
-    //   it('has not LanguageSwitch', () => {
-    //     expect(wrapper.findComponent({ name: 'LanguageSwitch' }).exists()).toBeFalsy()
-    //   })
-    // })
   })
 })
diff --git a/frontend/src/layouts/AuthLayout_gdd.vue b/frontend/src/layouts/AuthLayout_gdd.vue
index 7e597bb37..fb43d63db 100644
--- a/frontend/src/layouts/AuthLayout_gdd.vue
+++ b/frontend/src/layouts/AuthLayout_gdd.vue
@@ -116,30 +116,18 @@ export default {
 .left-content-box {
   position: fixed;
   width: 40%;
-  /* background-color: aquamarine; */
   top: 0px;
   bottom: 0px;
 }
 
 .bg-img-box {
-  /* background-color: red; */
   position: absolute;
   top: 0px;
   bottom: 0px;
-  /* margin-top: -308px;
-  margin-left: -118px;
-  position: absolute;
-  top: 33px;
-  bottom: -228px;
-  min-width: 86%;
-  max-width: 800px;
-  /* background-color: bisque; */
-  /* border-radius: 0% 48% 74% 0%/59% 70% 73% 47%; */
 }
 
 /* right */
 .right-content {
-  /* height: 100%; */
   flex-direction: column-reverse;
 }
 .right-content-box {
@@ -162,7 +150,6 @@ export default {
 .bg-txt-box {
   position: relative;
   margin-top: 317px;
-  /* padding-bottom: 20px; */
   text-shadow: 2px 2px 8px #000000;
   max-width: 733px;
 }
diff --git a/frontend/src/pages/ForgotPassword.spec.js b/frontend/src/pages/ForgotPassword.spec.js
index bab7a8364..ecfe5a1a9 100644
--- a/frontend/src/pages/ForgotPassword.spec.js
+++ b/frontend/src/pages/ForgotPassword.spec.js
@@ -121,8 +121,6 @@ describe('ForgotPassword', () => {
             })
 
             it.skip('click redirects to "/login"', async () => {
-              // wrapper.find('.test-message-button').trigger('click')
-              // await wrapper.vm.$nextTick()
               expect(mockRouterPush).toBeCalledWith('/login')
             })
 
@@ -154,10 +152,6 @@ describe('ForgotPassword', () => {
             it('button link redirects to "/login"', () => {
               expect(wrapper.find('.test-message-button').attributes('href')).toBe('/login')
             })
-
-            it.skip('click redirects to "/login"', () => {
-              // expect(mockRouterPush).toBeCalledWith('/login')
-            })
           })
         })
       })
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index c4c309c5c..f2ea97053 100755
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -126,10 +126,8 @@ export default {
             this.errorLinkTo = '/reset-password/login'
             this.toastError(this.$t('error.no-account'))
           } else if (error.message.includes('No user with this credentials')) {
-            // don't show any error on the page! against boots
             this.toastError(this.$t('error.no-user'))
           } else {
-            // don't show any error on the page! against boots
             this.toastError(this.$t('error.unknown-error') + error.message)
           }
           loader.hide()
diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index 9179a0833..d684e34e6 100755
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -164,7 +164,6 @@ export default {
           this.showPageMessage = true
         })
         .catch((error) => {
-          // don't show any error on the page! against boots
           let errorMessage
           switch (error.message) {
             case 'GraphQL error: User already exists.':