diff --git a/client/src/components/ContentBlock.vue b/client/src/components/ContentBlock.vue
index d3e47114..d0301771 100644
--- a/client/src/components/ContentBlock.vue
+++ b/client/src/components/ContentBlock.vue
@@ -41,9 +41,6 @@
   import MoreOptionsWidget from '@/components/MoreOptionsWidget';
   import UserWidget from '@/components/UserWidget';
   import VisibilityAction from '@/components/visibility/VisibilityAction';
-  import EyeIcon from '@/components/icons/EyeIcon';
-  import PenIcon from '@/components/icons/PenIcon';
-  import TrashIcon from '@/components/icons/TrashIcon';
   import ContentComponent from '@/components/content-blocks/ContentComponent';
 
   import CHAPTER_QUERY from '@/graphql/gql/chapterQuery.gql';
@@ -70,9 +67,6 @@
       ContentComponent,
       AddContentButton,
       VisibilityAction,
-      EyeIcon,
-      PenIcon,
-      TrashIcon,
       MoreOptionsWidget,
       UserWidget
     },
diff --git a/client/src/components/ContentNavigation.vue b/client/src/components/ContentNavigation.vue
deleted file mode 100644
index 28ccf46e..00000000
--- a/client/src/components/ContentNavigation.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-  <nav class="top-navigation" :class="{'top-navigation--mobile': mobile}">
-    <div class="top-navigation__item">
-      <router-link to="/book/topic/berufliche-grundbildung" active-class="top-navigation__link--active"
-                   :class="{'top-navigation__link--active': isActive('book')}"
-                   @click.native="hideMobileNavigation"
-                   class="top-navigation__link">Inhalte
-      </router-link>
-
-      <mobile-subnavigation v-if="mobile"></mobile-subnavigation>
-
-    </div>
-
-    <div class="top-navigation__item">
-      <router-link to="/rooms" active-class="top-navigation__link--active" @click.native="hideMobileNavigation"
-                   class="top-navigation__link">Räume
-      </router-link>
-    </div>
-
-    <div class="top-navigation__item">
-      <router-link to="/portfolio" active-class="top-navigation__link--active" @click.native="hideMobileNavigation"
-                   class="top-navigation__link">Portfolio
-      </router-link>
-    </div>
-
-  </nav>
-</template>
-
-<script>
-  import MobileSubnavigation from '@/components/book-navigation/MobileSubnavigation';
-
-  export default {
-    props: {
-      mobile: {
-        default: false
-      }
-    },
-
-    components: {
-      MobileSubnavigation
-    },
-
-    methods: {
-      isActive(linkName) {
-        return linkName === 'book' && this.$route.path.indexOf('module') > -1;
-      },
-      hideMobileNavigation() {
-        this.$store.dispatch('showMobileNavigation', false);
-      }
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-  @import "@/styles/_variables.scss";
-  @import "@/styles/_mixins.scss";
-
-  .top-navigation {
-    display: flex;
-
-    &__link {
-      padding: 0 24px;
-      @include default-link;
-    }
-
-    $parent: &;
-
-    &--mobile {
-      flex-direction: column;
-
-      #{$parent}__link {
-        color: $color-white;
-        @include heading-4;
-        line-height: 2.5em;
-        padding: 0;
-        display: block;
-        margin-bottom: 0.5*$small-spacing;
-
-        &:only-child {
-          margin-bottom: 0;
-        }
-
-      }
-
-      #{$parent}__item {
-        border-bottom: 1px solid $color-white;
-
-        &:nth-child(1) {
-          order: 3;
-          border-bottom: 0;
-        }
-
-        &:nth-child(2) {
-          order: 1;
-        }
-
-        &:nth-child(3) {
-          order: 2;
-        }
-      }
-    }
-  }
-</style>
diff --git a/client/src/components/HeaderBar.vue b/client/src/components/HeaderBar.vue
index 917866eb..95a61c01 100644
--- a/client/src/components/HeaderBar.vue
+++ b/client/src/components/HeaderBar.vue
@@ -17,7 +17,7 @@
 </template>
 
 <script>
-  import ContentNavigation from '@/components/ContentNavigation.vue';
+  import ContentNavigation from '@/components/book-navigation/ContentNavigation.vue';
   import BookNavigation from '@/components/book-navigation/BookNavigation';
   import UserWidget from '@/components/UserWidget.vue';
   import Logo from '@/components/icons/Logo';
diff --git a/client/src/components/StudentSubmission.vue b/client/src/components/StudentSubmission.vue
index 8790b315..48f24b08 100644
--- a/client/src/components/StudentSubmission.vue
+++ b/client/src/components/StudentSubmission.vue
@@ -16,13 +16,13 @@
 </template>
 
 <script>
-
-  import DocumentIcon from '@/components/icons/DocumentIcon'
   import StudentSubmissionDocument from '@/components/StudentSubmissionDocument';
 
   export default {
     props: ['submission'],
-    components: { DocumentIcon, StudentSubmissionDocument },
+    components: {
+      StudentSubmissionDocument
+    },
 
     computed: {
       name() {
diff --git a/client/src/components/book-navigation/MobileNavigation.vue b/client/src/components/book-navigation/MobileNavigation.vue
index 8a33c58f..245739a0 100644
--- a/client/src/components/book-navigation/MobileNavigation.vue
+++ b/client/src/components/book-navigation/MobileNavigation.vue
@@ -9,18 +9,14 @@
 
 <script>
   import Cross from '@/components/icons/Cross';
-  import UserWidget from '@/components/UserWidget';
-  import ContentNavigation from '@/components/ContentNavigation';
-  import ClassSelectionWidget from '@/components/school-class/ClassSelectionWidget';
+  import ContentNavigation from '@/components/book-navigation/ContentNavigation';
 
   import {meQuery} from '@/graphql/queries';
 
   export default {
     components: {
       ContentNavigation,
-      Cross,
-      UserWidget,
-      ClassSelectionWidget
+      Cross
     },
 
     methods: {
diff --git a/client/src/components/content-blocks/assignment/Assignment.vue b/client/src/components/content-blocks/assignment/Assignment.vue
index 9bc2b8b3..ff8a029d 100644
--- a/client/src/components/content-blocks/assignment/Assignment.vue
+++ b/client/src/components/content-blocks/assignment/Assignment.vue
@@ -47,25 +47,15 @@
   import debounce from 'lodash/debounce';
   import cloneDeep from 'lodash/cloneDeep'
 
-  import FinalSubmission from '@/components/content-blocks/assignment/FinalSubmission';
-  import SubmissionInput from '@/components/content-blocks/assignment/SubmissionInput';
   import SubmissionForm from '@/components/content-blocks/assignment/SubmissionForm';
-  import DocumentForm from '@/components/content-forms/DocumentForm';
-  import DocumentBlock from '@/components/content-blocks/DocumentBlock';
   import Solution from '@/components/content-blocks/Solution';
-  import SimpleFileUpload from '@/components/SimpleFileUpload';
   import SpellCheck from '@/components/content-blocks/assignment/SpellCheck';
 
   export default {
     props: ['value'],
 
     components: {
-      DocumentBlock,
-      DocumentForm,
-      SubmissionInput,
-      FinalSubmission,
       Solution,
-      SimpleFileUpload,
       SubmissionForm,
       SpellCheck
     },
diff --git a/client/src/components/objective-groups/ObjectiveGroup.vue b/client/src/components/objective-groups/ObjectiveGroup.vue
index a02ce908..0c4aa01b 100644
--- a/client/src/components/objective-groups/ObjectiveGroup.vue
+++ b/client/src/components/objective-groups/ObjectiveGroup.vue
@@ -15,10 +15,7 @@
 </template>
 
 <script>
-  import VisibilityAction from '@/components/visibility/VisibilityAction';
   import Objective from '@/components/objective-groups/Objective';
-  import EyeIcon from '@/components/icons/EyeIcon';
-  import PenIcon from '@/components/icons/PenIcon';
 
   import ME_QUERY from '@/graphql/gql/meQuery.gql';
   import AddContentButton from '@/components/AddContentButton';
@@ -35,10 +32,7 @@
 
     components: {
       AddContentButton,
-      VisibilityAction,
-      Objective,
-      EyeIcon,
-      PenIcon
+      Objective
     },
 
     apollo: {
diff --git a/client/src/pages/book.vue b/client/src/pages/book.vue
index b1bf6d59..a7ac5f32 100644
--- a/client/src/pages/book.vue
+++ b/client/src/pages/book.vue
@@ -8,16 +8,6 @@
 
 </template>
 
-<script>
-  import BookNavigation from '@/components/book-navigation/BookNavigation.vue';
-
-  export default {
-    components: {
-      BookNavigation
-    }
-  }
-</script>
-
 <style scoped lang="scss">
   @import "@/styles/_mixins.scss";