diff --git a/templates/corporate_member_zone/.aldryn-folder b/templates/corporate_member_zone/.aldryn-folder
deleted file mode 100644
index e69de29..0000000
diff --git a/templates/corporate_member_zone/account_edit.html b/templates/corporate_member_zone/account_edit.html
deleted file mode 100644
index da05689..0000000
--- a/templates/corporate_member_zone/account_edit.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% load i18n %}
-<form action="{% url 'baker_street_corporate_member_zone:account_edit' %}" method="post">
-    {% csrf_token %}
-    <div class="control__item__fields">
-        {% include 'project/content/includes/_field.html' with field=form.gender label=True small=True %}
-        {% include 'project/content/includes/_field.html' with field=form.title label=True small=True %}
-        {% include 'project/content/includes/_field.html' with field=form.first_name label=True small=True %}
-        {% include 'project/content/includes/_field.html' with field=form.last_name label=True small=True %}
-    </div>
-    <button class="button button--small">
-        <span class="button__wrapper">
-            {% include 'project/assets/tick.svg' %}
-            <b>{% trans 'Speichern' %}</b>
-        </span>
-        {% include 'project/assets/tick.svg' %}
-    </button>
-</form>
diff --git a/templates/corporate_member_zone/account_edit_done.html b/templates/corporate_member_zone/account_edit_done.html
deleted file mode 100644
index b670f65..0000000
--- a/templates/corporate_member_zone/account_edit_done.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% load i18n %}
-<div class="control__item__success">
-    <span class="tag tag--black">{% trans 'Ihre Benutzerdaten wurden erfolgreich geändert' %}</span>
-    <a href="#" class="button button--small control__item__close">
-        <span class="button__wrapper">
-            {% include 'project/assets/close.svg' %}
-            <b>{% trans 'Schliessen' %}</b>
-        </span>
-        {% include 'project/assets/close.svg' %}
-    </a>
-</div>
\ No newline at end of file
diff --git a/templates/corporate_member_zone/activate_user.html b/templates/corporate_member_zone/activate_user.html
deleted file mode 100644
index fc317d0..0000000
--- a/templates/corporate_member_zone/activate_user.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends 'project/dialog.html' %}
-{% load i18n static %}
-
-{% block extra_meta %}
-  <meta name="robots" content="noindex, nofollow">
-{% endblock %}
-
-{% block dialog_content %}
-  {% if validlink %}
-    <h1>Link ist OK</h1>
-    <form method="post" action="{% url 'baker_street_corporate_member_zone:activate_user' uidb64=uidb64 token=token %}">
-    {% csrf_token %}
-     {{ form.as_p }}
-    <button>Passwort setzten</button>
-    </form>
-  {% else %}
-    <h1>Link ist ivalid</h1>
-  {% endif %}
-
-{% endblock %}
\ No newline at end of file
diff --git a/templates/corporate_member_zone/activate_user_done.html b/templates/corporate_member_zone/activate_user_done.html
deleted file mode 100644
index 311f253..0000000
--- a/templates/corporate_member_zone/activate_user_done.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends 'project/dialog.html' %}
-{% load i18n static %}
-
-{% block extra_meta %}
-  <meta name="robots" content="noindex, nofollow">
-{% endblock %}
-
-{% block dialog_content %}
-    <h1>User is now Activated</h1>
-    <a href="{% url 'baker_street_corporate_member_zone:login' %}">Login</a>
-{% endblock %}
\ No newline at end of file
diff --git a/templates/corporate_member_zone/change_password.html b/templates/corporate_member_zone/change_password.html
deleted file mode 100644
index 418ad4c..0000000
--- a/templates/corporate_member_zone/change_password.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% load i18n %}
-<form action="{% url 'baker_street_corporate_member_zone:change_password' %}" method="post">
-    {% csrf_token %}
-    <div class="control__item__fields">
-        {% include 'project/content/includes/_field.html' with field=form.old_password label=True small=True %}
-        {% include 'project/content/includes/_field.html' with field=form.new_password1 label=True small=True %}
-        {% include 'project/content/includes/_field.html' with field=form.new_password2 label=True small=True %}
-    </div>
-    <button class="button button--small">
-        <span class="button__wrapper">
-            {% include 'project/assets/tick.svg' %}
-            <b>{% trans 'ändern' %}</b>
-        </span>
-        {% include 'project/assets/tick.svg' %}
-    </button>
-</form>
diff --git a/templates/corporate_member_zone/change_password_done.html b/templates/corporate_member_zone/change_password_done.html
deleted file mode 100644
index bf3a1f9..0000000
--- a/templates/corporate_member_zone/change_password_done.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% load i18n %}
-<div class="control__item__success">
-    <span class="tag tag--black">{% trans 'Ihr Passwort wurden erfolgreich geändert' %}</span>
-    <a href="#" class="button button--small control__item__close">
-        <span class="button__wrapper">
-            {% include 'project/assets/close.svg' %}
-            <b>{% trans 'Schliessen' %}</b>
-        </span>
-        {% include 'project/assets/close.svg' %}
-    </a>
-</div>
\ No newline at end of file
diff --git a/templates/corporate_member_zone/company_edit.html b/templates/corporate_member_zone/company_edit.html
deleted file mode 100644
index 0bebc82..0000000
--- a/templates/corporate_member_zone/company_edit.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% load i18n %}
-<form action="{% url 'baker_street_corporate_member_zone:company_edit' %}" method="post">
-    {% csrf_token %}
-    <div class="control__item__fields">
-        {% include 'project/content/includes/_field.html' with field=form.street label=True small=True %}
-        {% include 'project/content/includes/_field.html' with field=form.zip label=True small=True %}
-        {% include 'project/content/includes/_field.html' with field=form.city label=True small=True %}
-    </div>
-    <button class="button button--small">
-        <span class="button__wrapper">
-            {% include 'project/assets/tick.svg' %}
-            <b>{% trans 'Speichern' %}</b>
-        </span>
-        {% include 'project/assets/tick.svg' %}
-    </button>
-</form>
diff --git a/templates/corporate_member_zone/company_edit_done.html b/templates/corporate_member_zone/company_edit_done.html
deleted file mode 100644
index a6ea25b..0000000
--- a/templates/corporate_member_zone/company_edit_done.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% load i18n %}
-<div class="control__item__success">
-    <span class="tag tag--black">{% trans 'Ihre Firmendaten wurden erfolgreich geändert' %}</span>
-    <a href="#" class="button button--small control__item__close">
-        <span class="button__wrapper">
-            {% include 'project/assets/close.svg' %}
-            <b>{% trans 'Schliessen' %}</b>
-        </span>
-        {% include 'project/assets/close.svg' %}
-    </a>
-</div>
\ No newline at end of file
diff --git a/templates/corporate_member_zone/email/.aldryn-folder b/templates/corporate_member_zone/email/.aldryn-folder
deleted file mode 100644
index e69de29..0000000
diff --git a/templates/corporate_member_zone/email/email_activation.html b/templates/corporate_member_zone/email/email_activation.html
deleted file mode 100644
index 774ee93..0000000
--- a/templates/corporate_member_zone/email/email_activation.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html>
-
-  <head>
-    <title>{{ subject }}</title>
-  </head>
-
-<body>
-<h1>{{ user.get_full_name }}</h1>
-<p>
-  <a href="{{ protocol }}://{{ domain }}{% url 'baker_street_corporate_member_zone:activate_user' uidb64=uid token=token %}">Jetzt aktivieren</a>
-</p>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/templates/corporate_member_zone/email/email_approval_confirm.html b/templates/corporate_member_zone/email/email_approval_confirm.html
deleted file mode 100644
index 389cf0d..0000000
--- a/templates/corporate_member_zone/email/email_approval_confirm.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html>
-
-  <head>
-    <title>{{ subject }}</title>
-  </head>
-
-<body>
-<h1>{{ user.get_full_name }}</h1>
-<p>Dein Benutzer wurde aktiviert.</p>
-<p>  <a href="{{ protocol }}://{{ domain }}{% url 'baker_street_corporate_member_zone:login' %}">Hier gehts zum Login</a>
-</p>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/templates/corporate_member_zone/email/member_registration_confirmation_email.html b/templates/corporate_member_zone/email/member_registration_confirmation_email.html
deleted file mode 100644
index 7a7f5b5..0000000
--- a/templates/corporate_member_zone/email/member_registration_confirmation_email.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html>
-<head>{{ subject }}</head>
-<body>
-<h1>{{ subject }}</h1>
-<hr>
-{% for data_set in data %}
-  <ul>
-    {% for label, value in data_set %}
-      <li><strong>{{ label }}:</strong> {{ value }}</li>
-    {% endfor %}
-  </ul>
-{% endfor %}
-</body>
-</html>
diff --git a/templates/corporate_member_zone/email/new_user_registered.html b/templates/corporate_member_zone/email/new_user_registered.html
deleted file mode 100644
index 9df132b..0000000
--- a/templates/corporate_member_zone/email/new_user_registered.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html>
-
-  <head>
-    <title>{{ subject }}</title>
-  </head>
-
-<body>
-<h1>{{ subject }}</h1>
-<p>
-  <a href="{{ protocol }}://{{ domain }}{% url 'admin:baker_street_corporate_member_zone_user_change' user.pk %}">Jetzt freischalten</a>
-</p>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/templates/corporate_member_zone/includes/.aldryn-folder b/templates/corporate_member_zone/includes/.aldryn-folder
deleted file mode 100644
index e69de29..0000000
diff --git a/templates/corporate_member_zone/includes/_downloads.html b/templates/corporate_member_zone/includes/_downloads.html
deleted file mode 100644
index 3ef5ee8..0000000
--- a/templates/corporate_member_zone/includes/_downloads.html
+++ /dev/null
@@ -1,56 +0,0 @@
-{% load i18n static util_tags thumbnail %}
-
-
-<div id="downloads" class="downloads{% if light %} downloads--light{% endif %}{% if flat %} downloads--flat{% endif %} reveal_self reveal reveal_animation">
-    <div class="downloads__content">
-        {% if title != False %}
-            <h2 class="{% if not light %}white{% endif %} reveal_self reveal reveal_animation">{% trans title %}</h2>
-        {% endif %}
-        {% if search %}
-            <form class="downloads__filter reveal_self reveal reveal_animation" action="{{ request.path }}#downloads" method="get">
-                <div class="input__frame input__frame--blue input__frame--icon">
-                    <input name="q" {% if request.GET.q %}value="{{ request.GET.q }}"{% endif %} id="downloads_search"
-                           type="text" placeholder="{% trans 'Suchbegriff eingeben' %}">
-                    <button>{% trans 'Suchen' %}{% include 'project/assets/search.svg' %}</button>
-                </div>
-            </form>
-        {% endif %}
-        {% for group, files, sorting in grouped_downloads %}
-            <div class="downloads__section reveal_container">
-                <div class="downloads__section__title{% if flat %} downloads__section__title--flat{% endif %} reveal reveal_animation">
-                    <h3 class="tag{% if flat %} tag--black{% endif %}{% if not light %} white{% endif %}">{{ group }}</h3>
-                </div>
-                <div class="downloads__list reveal reveal_animation">
-                    {% for file in files %}
-                        <div class="downloads__item__frame">
-                            <a target="_blank" href="{{ file.file.url }}" class="downloads__item">
-                                <div class="downloads__item__main">
-                                    <div class="downloads__item__content reveal reveal_animation">
-                                        <span class="downloads__item__icon tag">
-                                            {% include 'project/assets/download.svg' %}
-                                            {{ file.file.name|split:'.'|last }}
-                                        </span>
-                                        {% if file.thumbnail %}
-                                            <img class="downloads__item__thumbnail"
-                                                 src="{{ file.thumbnail.url }}">
-                                        {% elif file.file.name|split:'.'|last == 'pdf' %}
-                                            <img class="downloads__item__thumbnail"
-                                                 src="{% download_thumbnail file %}">
-                                        {% else %}
-                                            {% thumbnail file.file 118x167 crop=True as thumb %}
-                                            {% static 'img/pdf_default.jpg' as static %}
-                                            <img class="downloads__item__thumbnail"
-                                                 src="{{ thumb.url|default:static }}">
-                                        {% endif %}
-                                    </div>
-                                </div>
-                                <span class="p downloads__item__text">{{ file }}</span>
-                                <span class="downloads__item__tags">{{ file.tag_list }}</span>
-                            </a>
-                        </div>
-                    {% endfor %}
-                </div>
-            </div>
-        {% endfor %}
-    </div>
-</div>
\ No newline at end of file
diff --git a/templates/corporate_member_zone/login.html b/templates/corporate_member_zone/login.html
deleted file mode 100644
index e0e7f04..0000000
--- a/templates/corporate_member_zone/login.html
+++ /dev/null
@@ -1,75 +0,0 @@
-{% extends 'project/dialog.html' %}
-{% load i18n static %}
-
-{% block extra_meta %}
-    <meta name="robots" content="noindex, nofollow">
-{% endblock %}
-
-{% block dialog_content %}
-    <div class="dialog_form" data-mode="{% if registration %}1{% else %}0{% endif %}">
-        <ul class="dialog_form__navigation reveal reveal_animation">
-            <li>
-                <a href="#" data-id="0"
-                   class="tag tag--light dialog_form__navigation__item dialog_form__navigation__control data_id_0">
-                    {% trans 'Login' %}
-                </a>
-            </li>
-            <li>
-                <a href="#" data-id="1"
-                   class="tag tag--light dialog_form__navigation__item dialog_form__navigation__control data_id_1">
-                    {% trans 'Registrierung beantragen' %}
-                </a>
-            </li>
-        </ul>
-        <div class="dialog_form__content reveal reveal_animation">
-            {% with login_form as form %}
-                <form class="dialog_form__form data_id_0" action="{% url 'baker_street_corporate_member_zone:login' %}?next={{ next }}"
-                      method="post">
-                    {% csrf_token %}
-                    {% if form.non_field_errors %}
-                        <div class="input__frame">
-                            <span class="tag tag--light input__errors">{{ form.non_field_errors.0 }}</span>
-                        </div>
-                    {% endif %}
-                    {% for field in form %}
-                        {% include 'project/content/includes/_field.html' with field=field %}
-                    {% endfor %}
-                    <div class="form__controls">
-                        <button class="button">
-                            <span class="button__wrapper">
-                                {% include 'project/assets/arrow-right-long.svg' %}
-                                <b>{% trans 'Einloggen' %}</b>
-                            </span>
-                            {% include 'project/assets/arrow-right-long.svg' %}
-                        </button>
-                        <a href="{% url 'password_reset' %}" class="button button--light">
-                            <span class="button__wrapper">
-                                {% include 'project/assets/arrow-right-long.svg' %}
-                                <b>{% trans 'Passwort vergessen?' %}</b>
-                            </span>
-                        </a>
-                    </div>
-                </form>
-            {% endwith %}
-            {% with registration_form as form %}
-                <form class="dialog_form__form data_id_1" action="{% url 'baker_street_corporate_member_zone:registration' %}"
-                      method="post">
-                    {% csrf_token %}
-                    {% for field in form %}
-                        {% include 'project/content/includes/_field.html' with field=field %}
-                    {% endfor %}
-                    {% include 'project/content/includes/_field.html' %}
-                    <div class="form__controls">
-                        <button class="button">
-                            <span class="button__wrapper">
-                                {% include 'project/assets/arrow-right-long.svg' %}
-                                <b>{% trans 'Registrierung beantragen' %}</b>
-                            </span>
-                            {% include 'project/assets/arrow-right-long.svg' %}
-                        </button>
-                    </div>
-                </form>
-            {% endwith %}
-        </div>
-    </div>
-{% endblock %}
\ No newline at end of file
diff --git a/templates/corporate_member_zone/overview.html b/templates/corporate_member_zone/overview.html
deleted file mode 100644
index 5bbcf96..0000000
--- a/templates/corporate_member_zone/overview.html
+++ /dev/null
@@ -1,180 +0,0 @@
-{% extends 'project/content.html' %}
-{% load i18n static task_tags %}
-
-{% block intro_extra %}
-    <div class="form__controls">
-        <a href="{% url 'agenda' %}" class="button">
-            <span class="button__wrapper">
-                {% include 'project/assets/arrow-right-long.svg' %}
-                <b>{% trans 'Zur Agenda' %}</b>
-            </span>
-            {% include 'project/assets/arrow-right-long.svg' %}
-        </a>
-        <a href="{% url 'baker_street_corporate_member_zone:logout' %}" class="button">
-            <span class="button__wrapper">
-                {% include 'project/assets/arrow-right-long.svg' %}
-                <b>{% trans 'Logout' %}</b>
-            </span>
-            {% include 'project/assets/arrow-right-long.svg' %}
-        </a>
-    </div>
-{% endblock %}
-
-{% block content_content %}
-    <div class="control_panel reveal_self reveal reveal_animation">
-        <div class="control_panel__content">
-            <div class="todo">
-                <h2 class="reveal_self reveal reveal_animation">{% trans 'Aktuell' %}</h2>
-                <div id="todo" class="load__frame">
-                    <div class="load__main">
-                        <ul class="control__list reveal_container">
-                            {% if open_tasks %}
-                                {% for object in open_tasks %}
-                                    <li class="data_id_{{ forloop.counter0 }} reveal reveal_animation">
-                                        <a href="{{ object.get_absolute_url }}"
-                                           class="p control__item control__item--arrow control__item--status {{ object|task_status:request.user }}">
-                                            <span class="control__item__title">
-                                                <span class="control__item__status">
-                                                    {% if object.is_expired %}
-                                                        {% include 'project/assets/close.svg' %}
-                                                    {% else %}
-                                                        {% include 'project/assets/tick.svg' %}
-                                                    {% endif %}
-                                                </span>
-                                                {{ object.title }}
-                                                <span class="control__item__arrow">
-                                                    {% include 'project/assets/arrow-bottom.svg' %}
-                                                </span>
-                                            </span>
-                                        </a>
-                                    </li>
-                                {% endfor %}
-                            {% else %}
-                                {% for object in object_list %}
-                                    <li class="data_id_{{ forloop.counter0 }} reveal reveal_animation">
-                                        <a href="{{ object.get_absolute_url }}"
-                                           class="p control__item control__item--arrow control__item--status {{ object|task_status:request.user }}">
-                                            <span class="control__item__title">
-                                                <span class="control__item__status">
-                                                    {% if object.is_expired %}
-                                                        {% include 'project/assets/close.svg' %}
-                                                    {% else %}
-                                                        {% include 'project/assets/tick.svg' %}
-                                                    {% endif %}
-                                                </span>
-                                                {{ object.title }}
-                                                <span class="control__item__arrow">
-                                                    {% include 'project/assets/arrow-bottom.svg' %}
-                                                </span>
-                                            </span>
-                                        </a>
-                                    </li>
-                                {% endfor %}
-                            {% endif %}
-                        </ul>
-                        {% if page_obj.has_next or open_tasks and paginator.count > 0 %}
-                            <div class="load__replace data_id_3 reveal_self reveal reveal_animation">
-                                <a href="{% url 'baker_street_corporate_member_zone:overview' %}?page=
-                                        {% if open_tasks %}{{ page_obj.start_index }}{% else %}{{ page_obj.next_page_number }}{% endif %}"
-                                   class="button button--load list__button button--small">
-                                    <span class="button__wrapper">
-                                        {% include 'project/assets/dots.svg' %}
-                                        <b>{% trans 'Ältere laden' %}</b>
-                                    </span>
-                                    {% include 'project/assets/dots.svg' %}
-                                </a>
-                            </div>
-                        {% endif %}
-                    </div>
-                </div>
-            </div>
-            <div class="settings">
-                <h2 class="reveal_self reveal reveal_animation">{% trans 'Einstellungen' %}</h2>
-                <ul class="control__list reveal_container">
-                    <li class="data_id_0 reveal reveal_animation">
-                        <div class="p control__item control__item--button">
-                            <span class="control__item__title">
-                                {% trans 'Benutzerdaten' %}
-                                <a href="#" data-href="{% url 'baker_street_corporate_member_zone:account_edit' %}"
-                                   class="button button--small button--load control__item__open">
-                                    <span class="button__wrapper">
-                                        {% include 'project/assets/dots.svg' %}
-                                        <b>{% trans 'Bearbeiten' %}</b>
-                                    </span>
-                                    {% include 'project/assets/dots.svg' %}
-                                </a>
-                                <a href="#" class="button button--small button--ghost control__item__close">
-                                    <span class="button__wrapper">
-                                        {% include 'project/assets/close.svg' %}
-                                        <b>{% trans 'Abbrechen' %}</b>
-                                    </span>
-                                    {% include 'project/assets/close.svg' %}
-                                </a>
-                            </span>
-                            <div class="control__item__content">
-                                <div class="control__item__content__main">
-                                </div>
-                            </div>
-                        </div>
-                    </li>
-                    <li class="data_id_1 reveal reveal_animation">
-                        <div class="p control__item control__item--button">
-                            <span class="control__item__title">
-                                {% trans 'Passwort' %}
-                                <a href="#" data-href="{% url 'baker_street_corporate_member_zone:change_password' %}"
-                                   class="button button--small button--load control__item__open">
-                                    <span class="button__wrapper">
-                                        {% include 'project/assets/dots.svg' %}
-                                        <b>{% trans 'Bearbeiten' %}</b>
-                                    </span>
-                                    {% include 'project/assets/dots.svg' %}
-                                </a>
-                                <a href="#" class="button button--small button--ghost control__item__close">
-                                    <span class="button__wrapper">
-                                        {% include 'project/assets/close.svg' %}
-                                        <b>{% trans 'Abbrechen' %}</b>
-                                    </span>
-                                    {% include 'project/assets/close.svg' %}
-                                </a>
-                            </span>
-                            <div class="control__item__content">
-                                <div class="control__item__content__main">
-                                </div>
-                            </div>
-                        </div>
-                    </li>
-                    {% if request.user.company_responsible %}
-                        <li class="data_id_2 reveal reveal_animation">
-                            <div class="p control__item control__item--button">
-                                <span class="control__item__title">
-                                    {% trans 'Firmendaten' %}
-                                    <a href="#" data-href="{% url 'baker_street_corporate_member_zone:company_edit' %}"
-                                       class="button button--small button--load control__item__open">
-                                        <span class="button__wrapper">
-                                            {% include 'project/assets/dots.svg' %}
-                                            <b>{% trans 'Bearbeiten' %}</b>
-                                        </span>
-                                        {% include 'project/assets/dots.svg' %}
-                                    </a>
-                                    <a href="#" class="button button--small button--ghost control__item__close">
-                                        <span class="button__wrapper">
-                                            {% include 'project/assets/close.svg' %}
-                                            <b>{% trans 'Abbrechen' %}</b>
-                                        </span>
-                                        {% include 'project/assets/close.svg' %}
-                                    </a>
-                                </span>
-                                <div class="control__item__content">
-                                    <div class="control__item__content__main">
-                                    </div>
-                                </div>
-                            </div>
-                        </li>
-                    {% endif %}
-                </ul>
-            </div>
-        </div>
-    </div>
-
-    {% include 'baker_street_corporate_member_zone/includes/_downloads.html' with search=True title='Downloads' %}
-{% endblock %}
\ No newline at end of file
diff --git a/templates/corporate_member_zone/registration_success.html b/templates/corporate_member_zone/registration_success.html
deleted file mode 100644
index c306253..0000000
--- a/templates/corporate_member_zone/registration_success.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends 'project/dialog.html' %}
-{% load i18n static %}
-
-{% block extra_meta %}
-    <meta name="robots" content="noindex, nofollow">
-{% endblock %}
-
-{% block dialog_content %}
-    <div class="dialog__text reveal_self reveal reveal_animation">
-        <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et
-            dolore magna aliquyam</p>
-        <a href="{% url 'landing' %}" class="button">
-            <span class="button__wrapper">
-                {% include 'project/assets/arrow-right-long.svg' %}
-                <b>{% trans 'Zur Startseite' %}</b>
-            </span>
-            {% include 'project/assets/arrow-right-long.svg' %}
-        </a>
-    </div>
-{% endblock %}
\ No newline at end of file
diff --git a/templates/corporate_member_zone/task.html b/templates/corporate_member_zone/task.html
deleted file mode 100644
index 4170269..0000000
--- a/templates/corporate_member_zone/task.html
+++ /dev/null
@@ -1,139 +0,0 @@
-{% extends 'project/content.html' %}
-{% load i18n static thumbnail task_tags %}
-https://source.unsplash.com/random/1200x900
-
-{% block body_class %}header-close{% endblock %}
-{% block header_menu_url %}{% url 'baker_street_corporate_member_zone:overview' %}{% endblock %}
-
-{% block intro_class %}intro--image{% endblock %}
-{% block intro_image %}{% if object.image %}
-    {% thumbnail object.image "1200x900" crop="center" subject_location=object.image.subject_location %}
-{% endif %}{% endblock %}
-
-{% block content_content %}
-    <div class="text text--full text--narrow reveal_container">
-        <div class="text__content">
-            <div class="text__content__frame">
-                <div class="text__content__main">{{ object.bodytext | add_animation_classes | safe }}</div>
-            </div>
-        </div>
-    </div>
-
-    {% include 'project/content/includes/_grid.html' with grid=grid last=True %}
-
-    <div id="form"></div>
-    <div class="text text--full text--narrow reveal_container">
-        <div class="text__content">
-            <div class="text__content__frame">
-                <div class="text__content__main">
-                    {% if formset and not object.is_expired %}
-                        {{ object.form_bodytext | add_animation_classes | safe }}
-                        {% if formset.errors %}
-                            <span class="tag tag--light input__errors reveal reveal_animation">
-                                {% trans 'Bitte korrigieren Sie die markierten Felder.' %}
-                            </span>
-                        {% endif %}
-                        {% if formset.non_form_errors %}
-                            <span class="tag tag--light input__errors reveal reveal_animation">
-                                {{ formset.non_form_errors }}
-                            </span>
-                        {% endif %}
-                        <form action="{% url 'baker_street_corporate_member_zone:task' object.slug %}" method="post"
-                              class="task__form text__content__form reveal reveal_animation {% if formset.errors %}errors{% endif %}"
-                              data-formset-prefix="{{ formset.prefix }}">
-                            {% csrf_token %}
-                            {{ formset.management_form }}
-
-                            <div data-formset-body>
-                                {% for form in formset %}
-                                    <fieldset data-formset-form>
-                                        {% if object.max_num > 1 %}
-                                            <div class="fieldset__title">
-                                                <h3 class="tag" data-id="{{ forloop.counter }}">{{ forloop.counter }}.
-                                                    Person</h3>
-                                                {% if forloop.counter0 > 0 %}
-                                                    <a class="tag" data-formset-delete-button>
-                                                        {% include 'project/assets/close.svg' %}
-                                                        {% trans 'Entfernen' %}
-                                                    </a>
-                                                {% endif %}
-                                            </div>
-                                        {% endif %}
-
-                                        {% if form.non_field_errors %}
-                                            <span class="tag tag--light input__errors">
-                                                {{ formset.non_field_errors }}
-                                            </span>
-                                        {% endif %}
-
-                                        {% for field in form %}
-                                            {% if field.name == 'DELETE' %}
-                                                {% include 'project/content/includes/_field.html' with field=field label=True hidden=True %}
-                                            {% else %}
-                                                {% include 'project/content/includes/_field.html' with field=field label=True %}
-                                            {% endif %}
-                                        {% endfor %}
-                                    </fieldset>
-                                {% endfor %}
-                            </div>
-
-                            <script type="form-template" data-formset-empty-form>
-                                <fieldset data-formset-form>
-                                    <div class="fieldset__title">
-                                        <h3 class="tag" data-id="{{ formset.empty_form.prefix }}">%(id). Person</h3>
-                                        <a class="tag" data-formset-delete-button>
-                                            {% include 'project/assets/close.svg' %}
-                                            {% trans 'Entfernen' %}
-                                        </a>
-                                    </div>
-                                    {% for field in formset.empty_form %}
-                                        {% if field.name == 'DELETE' %}
-                                            {% include 'project/content/includes/_field.html' with field=field label=True hidden=True %}
-                                        {% else %}
-                                            {% include 'project/content/includes/_field.html' with field=field label=True %}
-                                        {% endif %}
-                                    {% endfor %}
-                                </fieldset>
-                            </script>
-
-                            <div class="form__controls">
-                                <button class="button">
-                                    <span class="button__wrapper">
-                                        {% include 'project/assets/arrow-right-long.svg' %}
-                                        <b>{{ object.submit_text }}</b>
-                                    </span>
-                                    {% include 'project/assets/arrow-right-long.svg' %}
-                                </button>
-                                {% if object.max_num > 1 %}
-                                    <a class="button button--light" data-formset-add>
-                                        <span class="button__wrapper">
-                                            {% include 'project/assets/plus.svg' %}
-                                            <b>{% trans 'Weitere Person hinzufügen' %}</b>
-                                        </span>
-                                    </a>
-                                {% endif %}
-                            </div>
-                        </form>
-                    {% else %}
-                        {% if object.is_expired %}
-                            <h3 class="reveal reveal_animation">{% trans 'Die Anmeldungsfrist abgelaufen' %}</h3>
-                            <p class="reveal reveal_animation">
-                                Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor
-                                invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et
-                                accusam et
-                            </p>
-                        {% else %}
-                            <h3 class="reveal reveal_animation">{% trans "Bereits abgeschlossen" %}</h3>
-                            <p class="reveal reveal_animation">
-                                Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor
-                                invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et
-                                accusam et
-                            </p>
-                        {% endif %}
-                    {% endif %}
-                </div>
-            </div>
-        </div>
-    </div>
-
-{% endblock %}
\ No newline at end of file
diff --git a/templates/corporate_member_zone/task_success.html b/templates/corporate_member_zone/task_success.html
deleted file mode 100644
index 270a47d..0000000
--- a/templates/corporate_member_zone/task_success.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends 'project/dialog.html' %}
-{% load i18n static %}
-
-{% block extra_meta %}
-    <meta name="robots" content="noindex, nofollow">
-{% endblock %}
-
-{% block dialog_content %}
-    <div class="dialog__text reveal_self reveal reveal_animation">
-        {{ object.success_bodytext | safe }}
-
-        <a href="{% url 'baker_street_corporate_member_zone:overview' %}" class="button">
-            <span class="button__wrapper">
-                {% include 'project/assets/arrow-right-long.svg' %}
-                <b>{% trans 'Zur Accountübersicht' %}</b>
-            </span>
-            {% include 'project/assets/arrow-right-long.svg' %}
-        </a>
-    </div>
-{% endblock %}
\ No newline at end of file
diff --git a/templates/corporate_member_zone/wait_for_approval.html b/templates/corporate_member_zone/wait_for_approval.html
deleted file mode 100644
index b47bfcd..0000000
--- a/templates/corporate_member_zone/wait_for_approval.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% extends 'project/dialog.html' %}
-{% load i18n static %}
-
-{% block extra_meta %}
-    <meta name="robots" content="noindex, nofollow">
-{% endblock %}
-
-{% block dialog_content %}
-    <div class="dialog__text reveal_self reveal reveal_animation">
-        <p>Ihr Account wurde leider noch nicht Freigegeben. Wir werden ihr Profil so bald wie möglich überprüfen</p>
-        <a href="{% url 'landing' %}" class="button">
-            <span class="button__wrapper">
-                {% include 'project/assets/arrow-right-long.svg' %}
-                <b>{% trans 'Zur Startseite' %}</b>
-            </span>
-            {% include 'project/assets/arrow-right-long.svg' %}
-        </a>
-    </div>
-{% endblock %}
\ No newline at end of file