diff --git a/src/postorius/templates/postorius/confirm_dialog.html b/src/postorius/templates/postorius/confirm_dialog.html
deleted file mode 100644
index 29d7acc..0000000
--- a/src/postorius/templates/postorius/confirm_dialog.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% extends postorius_base_template %}
-{% load url from future %}
-{% load i18n %}
-
-{% block main %}
-    <h1>{% trans 'Confirm' %}</h1>
-    <p>{% trans "Are you sure?" %}</p>
-    <form action="{{submit_url}}" method="post"> {% csrf_token %}
-        <button class="btn btn-danger" type="submit">{% trans "OK" %}</button>
-        <a class="btn" href="{{cancel_url}}">{% trans "Cancel" %}</a>
-    </form>
-{% endblock main %}
diff --git a/src/postorius/templates/postorius/lists/settings_legacy.html b/src/postorius/templates/postorius/lists/settings_legacy.html
deleted file mode 100644
index 5998cbb..0000000
--- a/src/postorius/templates/postorius/lists/settings_legacy.html
+++ /dev/null
@@ -1,34 +0,0 @@
-{% extends postorius_base_template %}
-{% load url from future %}
-{% load i18n %}
-{% load nav_helpers %}
-
-{% block main %}
-    {% if message %}<p class="alert">{{ message }}</p>{% endif %}
-    {% list_nav 'list_settings' 'Settings' %}
-    <ul class="nav nav-tabs">
-        {% for section in section_names %}
-        <li {% if section.0 == visible_section %}class="active"{% endif %}><a href="{% url 'list_settings' list_id=list.list_id visible_section=section.0 %}">{{section.1}}</a></li>
-        {% endfor %}
-    </ul>
-
-    {% if visible_section %}
-
-        <table class="well">
-        <form class="well" action="{% url 'list_settings' list_id=list.list_id visible_section=visible_section %}" method="post" class="list_settings"> {% csrf_token %}
-			{% for field in form %}
-            <tr><td>
-                {{ field.errors }}
-                {{ field.label_tag }} <br />
-                [<span class="more_info"><a href="{% url 'more_info_tab'  formid='list_settings' helpid=field.name %}">{% trans "More info" %}</a><span>{{ field.help_text }}
-                </span></span>]
-            </td><td>{{ field }}</td></tr>
-        {% endfor %}
-        <tr><td colspan="2">
-	         <button class="btn btn-primary" type="submit">{% trans "Save changes" %}</button>
-        </td></tr>
-        </form>
-        </table>
-    {% endif %}
-
-{% endblock %}
diff --git a/src/postorius/templates/postorius/lists/subscribe.html b/src/postorius/templates/postorius/lists/subscribe.html
deleted file mode 100644
index 4d1f763..0000000
--- a/src/postorius/templates/postorius/lists/subscribe.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends postorius_base_template %}
-{% load url from future %}
-{% load i18n %}
-
-{% block subtitle %}
-{% trans "Subscribe | " as page_title %}{{ page_title|add:list.fqdn_listname }}
-{% endblock %}
-
-{% block main %}
-    <h1>{% trans 'Subscribe' %} <span>{{ list.fqdn_listname}}</span></h1>
-    <form action="{% url 'list_subscribe' list.fqdn_listname %}" method="post" class="list_subscribe"> {% csrf_token %}
-        {{form.as_p}}
-        <input class="btn btn-primary" type="submit" value="{% trans 'Subscribe' %}" />
-    </form>
-{% endblock main %}
diff --git a/src/postorius/templates/postorius/lists/unsubscribe.html b/src/postorius/templates/postorius/lists/unsubscribe.html
deleted file mode 100644
index dfd709a..0000000
--- a/src/postorius/templates/postorius/lists/unsubscribe.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% extends postorius_base_template %}
-{% load url from future %}
-{% load i18n %}
-
-{% block subtitle %}
-{% trans "Confirm List Delete" as page_title %}{{ page_title|add:list.fqdn_listname}}
-{% endblock %}
-
-{% block main %}
-    <h1>{% trans 'Delete List' %} <span>{{ list.fqdn_listname}}</span></h1>
-    <p>{% trans 'Are you sure you want to delete' %} {{ list.fqdn_listname }}?</p>
-{% endblock main %}
diff --git a/src/postorius/templates/postorius/menu/general.html b/src/postorius/templates/postorius/menu/general.html
deleted file mode 100644
index 0677cd6..0000000
--- a/src/postorius/templates/postorius/menu/general.html
+++ /dev/null
@@ -1,113 +0,0 @@
-{% load url from future %}
-{% load i18n %}
-
-{% block menu_general %}
-    {% trans "General" %}
-    <div id="menu_general"><ul>
-    
-        <li {% if selected == "notifications" %}id="selected"{% endif %}>
-            <a href="{% url 'domains' %}">
-                {% trans "Notifications" %} Link:TODO
-            </a>
-            <div><ul>
-                <li {% if selected == "admin_immend_notify" %}id="selected"{% endif %}>
-                    <a href="{% comment %}{% url ... %}{% endcomment %}">
-                        {% trans "admin_immend_notify" %} Link:TODO
-                    </a>
-                </li>
-                <li {% if selected == "admin_notify_mchanges" %}id="selected"{% endif %}>
-                    <a href="{% comment %}{% url ... %}{% endcomment %}">
-                        {% trans "admin_notify_mchanges" %} Link:TODO
-                    </a>
-                </li>                              
-            </ul></div>
-        </li>
-        <li {% if selected == "formatting" %}id="selected"{% endif %}>
-            <a href="{% url 'list_new' %}">
-                {% trans "Formatting" %} Link:TODO
-            </a>
-            <div><ul>
-                <li {% if selected == "include_list_post_header" %}id="selected"{% endif %}>
-                    <a href="{% comment %}{% url ... %}{% endcomment %}">
-                        {% trans "include_list_post_header" %} Link:TODO
-                    </a>
-                </li>
-                <li {% if selected == "include_rfc2369_headers" %}id="selected"{% endif %}>
-                    <a href="{% comment %}{% url ... %}{% endcomment %}">
-                        {% trans "include_rfc2369_headers" %} Link:TODO
-                    </a>
-                </li>         
-                <li {% if selected == "convert_html_to_plaintext" %}id="selected"{% endif %}>
-                    <a href="{% comment %}{% url ... %}{% endcomment %}">
-                        {% trans "convert_html_to_plaintext" %} Link:TODO
-                    </a>
-                </li>                                         
-            </ul></div>            
-        </li>
-        <li {% if selected == "gateways" %}id="selected"{% endif %}>
-            <a href="{% comment %}{% url 'list_delete' list.fqdn_listname %}TODO add List{% endcomment %}">
-                {% trans "Gateways" %} Link:TODO
-            </a>
-        </li>
-        <li{% if selected == "language" %}id="selected"{% endif %}>
-            <a href="{% comment %}{% url 'list_settings' list.fqdn_listname %}TODO add List{% endcomment %}">
-                {% trans "Language" %} Link:TODO
-            </a>
-        </li>
-        <li{% if selected == "subscription_rules" %}id="selected"{% endif %}>
-            <a href="{% comment %}{% url 'list_settings' list.fqdn_listname %}TODO add List{% endcomment %}">
-                {% trans "Subscription rules" %} Link:TODO
-            </a>
-            <div><ul>
-                <li {% if selected == "send_welcome_message" %}id="selected"{% endif %}>
-                    <a href="{% comment %}{% url ... %}{% endcomment %}">
-                        {% trans "send_welcome_message" %} Link:TODO
-                    </a>
-                </li>
-                <li {% if selected == "advertised" %}id="selected"{% endif %}>
-                    <a href="{% comment %}{% url ... %}{% endcomment %}">
-                        {% trans "advertised" %} Link:TODO
-                    </a>
-                </li>         
-                <li {% if selected == "anonymous_list" %}id="selected"{% endif %}>
-                    <a href="{% comment %}{% url ... %}{% endcomment %}">
-                        {% trans "anonymous_list" %} Link:TODO
-                    </a>
-                </li>                                         
-            </ul></div>     
-        </li>
-        <li{% if selected == "bounces" %}id="selected"{% endif %}>
-            <a href="{% comment %}{% url 'list_settings' list.fqdn_listname %}TODO add List{% endcomment %}">
-                {% trans "Bounces" %} Link:TODO
-            </a>
-        </li>
-        <li{% if selected == "digest" %}id="selected"{% endif %}>
-            <a href="{% comment %}{% url 'list_settings' list.fqdn_listname %}TODO add List{% endcomment %}">
-                {% trans "Digest" %} Link:TODO
-            </a>
-            <div><ul>
-                <li {% if selected == "next_digest_number" %}id="selected"{% endif %}>
-                    <a href="{% comment %}{% url ... %}{% endcomment %}">
-                        {% trans "next_digest_number" %} Link:TODO
-                    </a>
-                </li>
-                <li {% if selected == "digest_size_threshold" %}id="selected"{% endif %}>
-                    <a href="{% comment %}{% url ... %}{% endcomment %}">
-                        {% trans "digest_size_threshold" %} Link:TODO
-                    </a>
-                </li>         
-                <li {% if selected == "digest_last_send_at" %}id="selected"{% endif %}>
-                    <a href="{% comment %}{% url ... %}{% endcomment %}">
-                        {% trans "digest_last_send_at" %} Link:TODO
-                    </a>
-                </li>                                         
-            </ul> </div>               
-        </li>  
-        <li {% if selected == "description" %}id="selected"{% endif %}>
-            <a href="{% comment %}{% url 'list_settings' list.fqdn_listname %}TODO add List{% endcomment %}">
-                {% trans "List Description" %} Link:TODO
-            </a>
-        </li>              
-    
-    </ul></div>
-{% endblock%}
diff --git a/src/postorius/templates/postorius/menu/info.html b/src/postorius/templates/postorius/menu/info.html
deleted file mode 100644
index c019b84..0000000
--- a/src/postorius/templates/postorius/menu/info.html
+++ /dev/null
@@ -1,52 +0,0 @@
-{% load url from future %}
-{% load i18n %}
-
-{% block menu_info %}
-    {% trans "Info" %}
-    <div><ul>
-         <li {% if selected == "info_list" %}id="selected"{% endif %}>
-            <a href="{% comment %}{% url ... %}TODO add List{% endcomment %}">
-                {% trans "List" %} Link:TODO
-            </a>
-            <div><ul>
-                 <li {% if selected == "description" %}id="selected"{% endif %}>
-                    <a href="{% comment %}{% url ... %}TODO add List{% endcomment %}">
-                        {% trans "Description" %} Link:TODO
-                    </a>
-                </li> 
-                 <li {% if selected == "last_post_at" %}id="selected"{% endif %}>
-                    <a href="{% comment %}{% url ... %}TODO add List{% endcomment %}">
-                        {% trans "Last post at" %} Link:TODO
-                    </a>
-                </li>  
-                <li {% if selected == "info_digest_last_sent" %}id="selected"{% endif %}>
-                    <a href="{% comment %}{% url ... %}TODO add List{% endcomment %}">
-                        {% trans "Last post at" %} Link:TODO
-                    </a>
-                </li>  
-                <li {% if selected == "created at" %}id="selected"{% endif %}>
-                    <a href="{% comment %}{% url ... %}TODO add List{% endcomment %}">
-                        {% trans "Created at" %} Link:TODO
-                    </a>
-                </li>  
-            </ul></div>
-        </li>  
-        <li {% if selected == "info_system" %}id="selected"{% endif %}>
-            <a href="{% comment %}{% url ... %}TODO add List{% endcomment %}">
-                {% trans "System" %} Link:TODO
-            </a>
-            <div><ul>
-                 <li {% if selected == "info_mail_host" %}id="selected"{% endif %}>
-                    <a href="{% comment %}{% url ... %}TODO add List{% endcomment %}">
-                        {% trans "Mail Host" %} Link:TODO
-                    </a>
-                </li>  
-                <li {% if selected == "info_web_host" %}id="selected"{% endif %}>
-                    <a href="{% comment %}{% url ... %}TODO add List{% endcomment %}">
-                        {% trans "Web Host" %} Link:TODO
-                    </a>
-                </li>  
-            </ul></div>
-        </li>  
-    </ul></div>
-{% endblock%}
diff --git a/src/postorius/templates/postorius/menu/maintanance.html b/src/postorius/templates/postorius/menu/maintanance.html
deleted file mode 100644
index 8cedccf..0000000
--- a/src/postorius/templates/postorius/menu/maintanance.html
+++ /dev/null
@@ -1,84 +0,0 @@
-{% load url from future %}
-{% load i18n %}
-
-{% block menu_maintanance %}
-{% if fqdn_listname %}
-    {% trans "Maintanance" %}
-    <div><ul class="menu">
-        <li {% if selected == "archive" %}id="selected"{% endif %}>
-            <a href="{% url 'domains' %}">
-                {% trans "Archive" %} #TODO link
-            </a>
-        </li>
-        <li {% if selected == "auto_responder" %}id="selected"{% endif %}>
-            <a href="{% url 'list_settings' fqdn_listname=fqdn_listname visible_section='Automatic Responses' visible_option=None %}">
-                {% trans "Auto Responder" %}
-            </a>
-            <div><ul>
-                <li {% if selected == "autorespond_postings" %}id="selected"{% endif %}>
-                    <a href="{% url 'list_settings' fqdn_listname=fqdn_listname visible_section='Automatic Responses' visible_option='autorespond_postings' %}">
-                        {% trans "Postings" %}
-                    </a>
-                </li>
-                <li {% if selected == "autorespond_requests" %}id="selected"{% endif %}>
-                    <a href="{% url 'list_settings' fqdn_listname=fqdn_listname visible_section='Automatic Responses' visible_option='autorespond_requests' %}">
-                        {% trans "Requests" %}
-                    </a>
-                </li>
-                <li {% if selected == "autorespond_owner" %}id="selected"{% endif %}>
-                    <a href="{% url 'list_settings' fqdn_listname=fqdn_listname visible_section='Automatic Responses' visible_option='autorespond_owner' %}">
-                        {% trans "Owner" %}
-                    </a>
-                </li>                                
-            </ul></div>
-        </li>
-        </li>
-        <li {% if selected == "filter" %}id="selected"{% endif %}>
-            <a href="{% comment %}{% url ... %}TODO add List{% endcomment %}">
-                {% trans "Filter" %} Link:TODO
-            </a>
-            <div><ul>
-                <li {% if selected == "filter_content" %}id="selected"{% endif %}>
-                    <a href="{% comment %}{% url ... %}{% endcomment %}">
-                        {% trans "Filter content" %} Link:TODO
-                    </a>
-                </li>
-                <li {% if selected == "filter_sender" %}id="selected"{% endif %}>
-                    <a href="{% comment %}{% url ... %}{% endcomment %}">
-                        {% trans "Sender" %} Link:TODO
-                    </a>
-                </li>
-                <li {% if selected == "filter_message" %}id="selected"{% endif %}>
-                    <a href="{% comment %}{% url ... %}{% endcomment %}">
-                        {% trans "Message" %} Link:TODO
-                    </a>
-                </li>
-                <li {% if selected == "filter_recipient" %}id="selected"{% endif %}>
-                    <a href="{% comment %}{% url ... %}{% endcomment %}">
-                        {% trans "Recipient" %} Link:TODO
-                    </a>
-                </li>
-                <li {% if selected == "filter_spam" %}id="selected"{% endif %}>
-                    <a href="{% comment %}{% url ... %}{% endcomment %}">
-                        {% trans "Spam" %} Link:TODO
-                    </a>
-                </li>
-                <li {% if selected == "filter_topics" %}id="selected"{% endif %}>
-                    <a href="{% comment %}{% url ... %}{% endcomment %}">
-                        {% trans "Topics" %} Link:TODO
-                    </a>
-                </li>                   
-            </ul></div>
-        </li>
-        {% comment %} {% if user in list.admin %}{% endcomment %}
-        ACL:TODO
-        <li{% if selected == "requests" %}id="selected"{% endif %}>
-            <a href="{% comment %}{% url ... %}TODO add List{% endcomment %}">
-                {% trans "Requests" %} Link:TODO
-            </a>
-        </li>
-        {% comment %}{% endif %}{% endcomment %}
-        
-    </ul></div>
-{% endif %}
-{% endblock%}
diff --git a/src/postorius/templates/postorius/menu/mm_user_nav.html b/src/postorius/templates/postorius/menu/mm_user_nav.html
deleted file mode 100644
index f91a820..0000000
--- a/src/postorius/templates/postorius/menu/mm_user_nav.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% load url from future %}
-{% load i18n %}
-{% load nav_helpers %}
-<div class="mm_subHeader">
-    <ul class="mm_nav">
-        <li class="mm_nav_item"><a class="{% nav_active_class current 'user_summary' %}" href="{% url 'user_summary' mm_user.user_id %}">{% trans "User Info" %}</a></li>
-        <li class="mm_nav_item"><a class="{% nav_active_class current 'user_delete' %}" href="">{% trans "Delete User" %}</a></li>
-    </ul>
-</div>
diff --git a/src/postorius/templates/postorius/menu/user_options.html b/src/postorius/templates/postorius/menu/user_options.html
deleted file mode 100644
index ef5a22c..0000000
--- a/src/postorius/templates/postorius/menu/user_options.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% load url from future %}
-{% load i18n %}
-
-{% block menu_user_options %}
-    {% trans "User Options" %}
-    <div><ul class="menu">
-         <li {% if selected == "description" %}id="selected"{% endif %}>
-            <a href="{% comment %}{% url ... %}TODO add List{% endcomment %}">
-                {% trans "Description" %} Link:TODO
-            </a>
-         </li>
-     </ul> </div>
-{% endblock %}     
diff --git a/src/postorius/templates/postorius/menu/users_nav.html b/src/postorius/templates/postorius/menu/users_nav.html
deleted file mode 100644
index 2db6455..0000000
--- a/src/postorius/templates/postorius/menu/users_nav.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% load url from future %}
-{% load i18n %}
-{% load nav_helpers %}
-<div class="mm_subHeader">
-    <span class="mm_context"><a href="{% url 'user_index' %}">{% trans 'Users' %}</a> &raquo; {{ title }}</span>
-    <ul class="mm_nav">
-        <li class="mm_nav_item"><a class="{% nav_active_class current 'user_index' %}" href="{% url 'user_index' %}">{% trans "Mailman Users" %}</a></li>
-        <li class="mm_nav_item"><a class="{% nav_active_class current 'web_user_index' %}" href="{% url 'user_index' %}">{% trans "Web Users" %}</a></li>
-        <li class="mm_new_user mm_action"><a class="btn btn-mini btn-success" href="{% url 'user_new' %}">{% trans "Create User" %}</a></li>
-    </ul>
-</div>
diff --git a/src/postorius/templates/postorius/user_settings.html b/src/postorius/templates/postorius/user_settings.html
deleted file mode 100644
index e982710..0000000
--- a/src/postorius/templates/postorius/user_settings.html
+++ /dev/null
@@ -1,57 +0,0 @@
-{% extends postorius_base_template %}
-{% load url from future %}
-{% load i18n %}
-
-{% block subtitle %}
-{% trans "User Settings | " as page_title %}{{ page_title|add:list.fqdn_listname}}
-{% endblock %}
-
-{% block main %}
-    {% include 'postorius/menu/user_nav.html' %}
-    <h1>{% trans "Membership" %}</h1>
-    {% ifequal tab "membership"%}
-        {% trans "Membership Settings" %} 
-        {% if list %}<span>{% trans "for"%}{% endif %} {{ list.fqdn_listname }}</span>
-    {% else %}
-        {% trans "User Settings" %}
-    {% endifequal %}
-
-    <div class="mm_box mm_clear">
-        <div class="mm_boxHeader">
-        {% trans "Content" %}
-        </div>  
-        <p>{% trans "Use this page to manage your account. You'll be able to see a list of your subscribed lists, modify these membership settings of the list and your personal preferences in user_settings <a href='https://bugs.launchpad.net/mailman/+bug/821438' >LP:821438</a> is solved <br>" %}</p>
-        {% if form %}
-            <form action="" method="post" class="user" name="user"> {% csrf_token %}
-            <ul class="">
-                {{ form.as_div }}
-                <li class="field">
-                    <button type="submit">{% trans "Save changes" %}</button>
-                </li>
-            </ul>
-            </form>
-        {% endif %}
-    </div>
-
-    <ul class="mm_actionButtons">
-        <li class="mm_user_settings"><a href="{% url 'user_settings' %}">{% trans "My Account" %}</a></li>
-        <li class="mm_user_subscriptions"><a href="{% url 'membership_settings' %}">{% trans "All my Subscriptions" %}</a></li>
-    </ul>    
-
-    {% if membership_lists %}
-        {% for list in membership_lists %}
-        <div class="mm_box mm_smallBox {% cycle 'mm_clear' '' %}">
-            <div class="mm_boxHeader">
-                <a href="{% url 'list_summary' fqdn_listname=list.fqdn_listname %}">
-                    {{ list.display_name }} {% if not list.settings.advertised %}(non-public){% endif %}
-                </a>
-            </div>
-            <ul>
-                <li><a href="{% url 'membership_settings' fqdn_listname=list.fqdn_listname%}"> {% trans "My Membership" %}</li>
-                <li><a href="{% url 'membership_settings' fqdn_listname=list.fqdn_listname %}"> 
-                {% trans "My Subscription" %}</a></li>
-            </ul>
-        </div>
-        {% endfor %}
-    {% endif %}
-{% endblock %}
diff --git a/src/postorius/templates/postorius/user_tasks.html b/src/postorius/templates/postorius/user_tasks.html
deleted file mode 100644
index e3fb93e..0000000
--- a/src/postorius/templates/postorius/user_tasks.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% extends postorius_base_template %}
-{% load url from future %}
-{% load i18n %}
-
-{% block subtitle %}
-{% trans "To Do" as page_title %}{{ page_title }}
-{% endblock %}
-
-{% block main %}
-    <h1>{% trans "To Do" %}</h1>
-    <p>{% trans "There are no pending tasks at the present time." %}</p>
-{% endblock main %}
diff --git a/src/postorius/templatetags/nav_helpers.py b/src/postorius/templatetags/nav_helpers.py
index 5ca23c3..440ab91 100644
--- a/src/postorius/templatetags/nav_helpers.py
+++ b/src/postorius/templatetags/nav_helpers.py
@@ -33,25 +33,6 @@
                 title=title)
 
 
-@register.inclusion_tag('postorius/menu/mm_user_nav.html', takes_context=True)
-def user_nav(context, current, title=None):
-    if title is None:
-        title = ''
-    return dict(mm_user=context['mm_user'],
-                current=current,
-                user=context['request'].user,
-                title=title)
-
-
-@register.inclusion_tag('postorius/menu/users_nav.html', takes_context=True)
-def users_nav(context, current, title=None):
-    if title is None:
-        title = ''
-    return dict(current=current,
-                user=context['request'].user,
-                title=title)
-
-
 @register.simple_tag
 def page_url(view_name, *args, **kwargs):
     return reverse(view_name, *args, **kwargs)