diff --git a/datacenterlight/templates/datacenterlight/pricing.html b/datacenterlight/templates/datacenterlight/pricing.html
index d4360f16..55123171 100644
--- a/datacenterlight/templates/datacenterlight/pricing.html
+++ b/datacenterlight/templates/datacenterlight/pricing.html
@@ -163,7 +163,7 @@
 			<h2 class="section-heading">{% trans "Simple and affordable: Try our virtual machine with featherlight price." %}</h2>
 
 			<div class="description">
-				<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ab laudantium quis quam nostrum ipsum est nisi asperiores provident recusandae aliquid, reiciendis vitae quisquam error, porro fuga obcaecati maiores dolores repudiandae?</p>
+				<p>Our VMs are hosted in Glarus, Switzerland. WARNING: We are currently running in BETA mode, especially our website We hope you will not encounter any hiccups, but if you, please let us know at support@datacenterlight.ch</p>
 			</div>
 		</div>
 	</div>
diff --git a/datacenterlight/views.py b/datacenterlight/views.py
index 3e6a7141..b68f7408 100644
--- a/datacenterlight/views.py
+++ b/datacenterlight/views.py
@@ -51,6 +51,9 @@ class PricingView(TemplateView):
 
         request.session['template'] = VirtualMachineTemplateSerializer(template).data
 
+        if not request.user.is_authenticated():
+            request.session['next'] = reverse('hosting:payment')
+
         request.session['specs'] = { 
             'cpu':cores,
             'memory': memory,
diff --git a/design_membership/calendar.html.py b/design_membership/calendar.html.py
deleted file mode 100644
index 76eea89c..00000000
--- a/design_membership/calendar.html.py
+++ /dev/null
@@ -1,110 +0,0 @@
-XXXXX XXXXXXXXXX
-XXXXXX
-
-	XXXXX XXXXXXXXXXXXXXXX
-	XXXXXXXXXXXXXXXXXXXXXXX
-	
-	XXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-
-XXXXXXX
-XXXXXX
-
-	XXXX XXXXXXXXXXXXXXXXXX
-
-		XXXX XXXXXXXXXXXXXXXXX
-
-			XXXXXXXX				
-
-				XXXXXXXXXXXXXXXXXX
-
-				XX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-				XX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-
-			XXXXXXXXX
-			
-			XXXXXXX
-			
-				XXXXXXX
-					
-					XXXX
-						
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-
-					XXXXX
-
-				XXXXXXXX
-
-				XXXXXXX
-					
-					XXXX
-						XXX XXXXXXXXXXXXXXXXXXXXXXXXXX
-						XXX XXXXXXXXXXXXXXXXXXXXXXXXXX
-						XXX XXXXXXXXXXXXXXXXXXXXXXXXXX
-						XXX XXXXXXXXXXXXXXXXXXXXXXXXXX
-						XXX XXXXXXXXXXXXXXXXXXXXXXXXXX
-						XXX XXXXXXXXXXXXXXXXXXXXXXXXXX
-						XXXXXXXXXX
-					XXXXX
-					XXXX
-						XXXXXXXXXX
-						XXXXXXXXXX
-						XXXXXXXXXX
-						XXXXXXXXXX
-						XXXXXXXXXX
-						XXXXXXXXXX
-						XXXXXXXXXX
-					XXXXX
-					XXXX
-						XXXXXXXXXX
-						XXX XXXXXXXXXXXXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-					XXXXX
-					XXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXX XXXXXXXXXXXXXXXXXXXXX
-						XXXXXXXXXXX
-					XXXXX
-
-					XXXX
-						XXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-					XXXXX
-					XXXX
-						XXXXXXXXXXX
-						XXX XXXXXXXXXXXXXXXXXXXXXXXXX
-						XXX XXXXXXXXXXXXXXXXXXXXXXXXX
-						XXX XXXXXXXXXXXXXXXXXXXXXXXXX
-						XXX XXXXXXXXXXXXXXXXXXXXXXXXX
-						XXX XXXXXXXXXXXXXXXXXXXXXXXXX
-						XXX XXXXXXXXXXXXXXXXXXXXXXXXX
-					XXXXX
-
-				XXXXXXXX
-
-			XXXXXXXX
-
-		XXXXXX XXXX XXX XXXXXXXX XXX
-
-	XXXXXX XXXX XXX XXXXXXXXX XXX
-	
-XXXXXXX
-XXXXXXX
\ No newline at end of file
diff --git a/design_membership/calendar/calendar.html.py b/design_membership/calendar/calendar.html.py
deleted file mode 100644
index 49d1a213..00000000
--- a/design_membership/calendar/calendar.html.py
+++ /dev/null
@@ -1,107 +0,0 @@
-XXXXX XXXXXXXXXX
-XXXXXX
-
-	XXXXX XXXXXXXXXXXXXXXX
-	XXXXXXXXXXXXXXXXXXXXXXX
-	
-	XXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-
-XXXXXXX
-XXXXXX
-
-	XXXX XXXXXXXXXXXXXXXXXX
-
-		XXXX XXXXXXXXXXXXXXXXX
-
-			XXXXXXXX				
-				XX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-				XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-
-				XX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-			
-			XXXXXXX
-			
-				XXXXXXX
-					
-					XXXX
-						
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-
-					XXXXX
-
-				XXXXXXXX
-
-				XXXXXXX
-					
-					XXXX
-						XXX XXXXXXXXXXXXXXXXXXXXXXXXXX
-						XXX XXXXXXXXXXXXXXXXXXXXXXXXXX
-						XXX XXXXXXXXXXXXXXXXXXXXXXXXXX
-						XXX XXXXXXXXXXXXXXXXXXXXXXXXXX
-						XXX XXXXXXXXXXXXXXXXXXXXXXXXXX
-						XXX XXXXXXXXXXXXXXXXXXXXXXXXXX
-						XXXXXXXXXX
-					XXXXX
-					XXXX
-						XXXXXXXXXX
-						XXXXXXXXXX
-						XXXXXXXXXX
-						XXXXXXXXXX
-						XXXXXXXXXX
-						XXXXXXXXXX
-						XXXXXXXXXX
-					XXXXX
-					XXXX
-						XXXXXXXXXX
-						XXX XXXXXXXXXXXXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-					XXXXX
-					XXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXX XXXXXXXXXXXXXXXXXXXXX
-						XXXXXXXXXXX
-					XXXXX
-
-					XXXX
-						XXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-						XXXXXXXXXXX
-					XXXXX
-					XXXX
-						XXXXXXXXXXX
-						XXX XXXXXXXXXXXXXXXXXXXXXXXXX
-						XXX XXXXXXXXXXXXXXXXXXXXXXXXX
-						XXX XXXXXXXXXXXXXXXXXXXXXXXXX
-						XXX XXXXXXXXXXXXXXXXXXXXXXXXX
-						XXX XXXXXXXXXXXXXXXXXXXXXXXXX
-						XXX XXXXXXXXXXXXXXXXXXXXXXXXX
-					XXXXX
-
-				XXXXXXXX
-
-			XXXXXXXX
-
-		XXXXXX XXXX XXX XXXXXXXX XXX
-
-	XXXXXX XXXX XXX XXXXXXXXX XXX
-	
-XXXXXXX
-XXXXXXX
\ No newline at end of file
diff --git a/docs/hosting_app_spec.rst.txt.py b/docs/hosting_app_spec.rst.txt.py
deleted file mode 100644
index 6058d2d3..00000000
--- a/docs/hosting_app_spec.rst.txt.py
+++ /dev/null
@@ -1,193 +0,0 @@
-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXX XXXXXXX XXXXXX XXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-
-XXXXXXX XXXX XXXXXXXX
-XXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXX XXX
-XXXXX XXXXXXXXXX
-XXXXXXXXX X XXXXXXXX XXXX XXXX
-
-XXXXX
-XXXXX
-XXXXX
-
-XXXX
-    XXX XXXXXXXXX XXXXXXXXXXXXX XXX XXXXXXXXX XXX XX XXXX XXXXX
-
-XXXXXXXX
-    XXX XXXXXXX XXXXXXXXXXXX XXX XXXXXXXX XXX XXXXXX XXX XXX XXXXXXXX XXXXXXX
-    XXXXXXX
-
-XXXXXXXX
-XXXXXXXX
-XXXXXXXX
-
-XXXXXXXX XXXXXXX XX X XXXXXXXXX XX  X XXXXXXX XXXXXX XXX XXXXXXXX XXXXXXXXXXX
-XXXXXX XXXXXX XXXXXXXX XXXXXXXXX XXXXXX XXXXXXX XXXXXXXXXX XXXXXXXXXXXXXX
-XXXXXXXXXXX XXXXXXX XXX XXXXXXXXXX
-
-XXXXXXXX XXXXXXX XXX XXX XXXX XXXXX XX XXXXX XXXX XXXXXXXXXXX XXXXXXX XXXXXX
-XX XXXXX XXXXX XXX XXXXXXXXXXXX XX XXXXXXXXXXX X XXXXXXXXXX XXXXXXXXXXX
-
-XXXXXX XXXX XX XXX XXXXXXXXXXX XX XXXX XX XXXXXX XXXX XX XXXXXXXX XXXXX XX
-XXXXXXXX XXXXX X XXXXXX XX XXXXXXXXX XX XX XXXXXXXXX
-
-XXXX XXX XXXXXXXX XXXXXXXXX XXXXXXX
-
-X XXXXX XXXXXXXXXXX
-X XXXXXXXXXX XXX XXXXXXXXX
-X XXXX XXXXXXXXXXXXX
-X XXXXXXXXX XXXXXXXXXX XXXXXXXXXXX
-X XXXXX XX XXX XXXXXXX
-X XXXXXXXXX XXXXXXXXXXX
-X XXXX XXXXXX XXXXXXXXXX XXXX
-X XXXXXXXXXX XXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXX
-X XXXXXXX XXX XXXXXXXXXXX
-X XXXX XXXXXXXXXX XXX XXXXXXX XXX XXXXXXXXXXXXX XXXXXX XXX
-
-XXXXXXXX XXXXXXX
-
-XXXXXX XXXXXXX
-
-X XXXX XXXXXXXXXX
-  X XXXXXXX
-X XXXXXXXXXXX
-  X XXXX XX XXXXX
-  X XXX
-X XXX XXXXXXXX
-  X XXXXX
-  X XXX
-X XXXXXXXXXXX XXXXXXXX
-  X XXXXXXX
-  X XXXXXXXXX
-  X XXXX XXX
-X XXXXXXXXXX
-  X XXXXXXXXXX
-  X XXXXX XXX
-  X XXXXXXX XXX
-X XXXXXXXX
-  X XXXXXXXXX XXX
-  X XXXXX XXXXXXX XXXXX XXX XX XXX XXXXX XXXXXX XXX XXXX XXXX XX XXXXX XXX
-X XXXXX
-  X XXXXXXXXXXXX XXXX XXXXXXXXXXXXXXXX X
-
-XXXXXXXX XXXXXXX
-
-X XX XXXXXXX XXXX XXXXX XXX XXXXXXXX
-X XXXXXXXXXXX XXXXXXXX
-  X XXXXXXXX
-  X XXXXX
-X XXXXXXXXXXX
-  X XXXXXX
-  X XXX
-X XXXXX
-  X XXXXXXXXXXXXXX
-  X XXX
-
-XXXXXX XXXXXXX
-
-X XX XXXXXXX XXXX XXXXX XXX XXXXXXXX
-X XXXXXXXXXXX
-  X XXXXXXX
-  X XXXXXX
-  X XXXXXX
-X XXXXXXXXXX
-  X XXX
-  X XXXXXXX XXXXXXXX
-X XXXXX
-  X XXX
-  X XXX
-  X XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-  X XXX
-
-XXXXX XXXXXXX XX XXX XX XXXXXX
-
-XX XXX XXXXXX XXXX XX XX XXXXXXXX XXXXXXX XXXXXXX XX XXXXXXXXX
-XX XXXX XXXXXX XXX XXX XXXXXX XXX XXXXX XXX XXXXXXX XXXXXXX XXXXXXXXXXX XX XXXXX
-   XXXXXXX XXXXXXXXX
-XX XXXXX XXX XXXXXX XXXXXXX X XXXXXXX XXXXXX XXXX XX XXXXX X XXX
-XX XXXX X XX XX XXXXXX XXX XXXXXX XX XXXXXXXXXX XX X XXXXXX XXXX XXXX XXXXXXX
-   XXXX XXX XX XXXXXX
-   XX XXXX XXX XX XXXXX XXX X XXXXXX XXX XXXX XXXX XXX XXX XX XXXX XX XXXXXX
-   XX XXX XXXXXXX
-XX XXX XXXXXXXXXXXX XXXX XXXXXXXXXX XXXXXXXXX XXXXXX XXX XXXXXXXXX XXXXXXXXXXXXXX
-   XXX XXXXXX
-XX XXXXXX XX XXXXXXXX XXXX XXX XXX XX XX XXXXX XX XXXX
-XX XXX XXXXXX XXXXXX XXX XXX XX XXX XXXXXXX XXX XXXXXXXXXXXX
-
-XXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXX XXXXXXX X XXXX
-XXXXXXXXXXXXXXXXXXXXXXX
-
-    XX XXXXXXXXX XX XXXX XX XXXXX XXXXXXXXXXXX XXXXXXXX X XXXXXXXXXXXXXX XXX XXXX
-    XXXXXXX XXX XXX XXXXXXXXXXXX XXXXXXX XX XXXXX XXX XXX XXXXXX XX XXXXXXXXXXX
-    XX XX XXXX XXXXXXX XXX XXXXX
-
-XXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXX XXXXXXX X XXXXX X
-XXXXXXXXXXXXXXXXXXXXXXXXXX
-
-XXXX XXXXX XXXX XXXXXXX X XXXXX XXXXXXXXXX XXXXXXX XXX XXXXXXXXXXXXX XXXXXXX XXX
-XXXXXXXXXXXX XX XXX XXXXXXXXX XXXXXXX XXXXX XXXXXX XXXX XXXXXXXXX XX XXXXX
-XXXXXXXX XX XX XXXXX XXX XXX XXXX XXXXX XXXXXXXXXX XX X XXXX XXXXXXXXXX
-XXXX XXXXX XXXX
-
-XXXXX XXXX XXXXX XXXX XXXXX
-
-    X XXXXXX XXX XXXXXXX XX XX XXXXXX XX XX XXXXXXXX X XXXX XXX XXXXX XXXXX
-    X XXX XXXXXXXXXXXXXXXX XXXXXXX XX XXXX XXXXXXXX XXX XXXXX X XX XXXXXXXXX
-      XXXXXXX
-
-XXXXXXXXX
-XXX XXXXX
-XXXXXXXXX
-
-X XXX XXX XXXXXX XX XXXXXXXXXXX XX XX XXXX XXXXXXXX
-X XXXXXXXX XXXXXXXXX XX XXXXXX XXXXX XXXX
-
-XXXXXXXXXXXX
-XXXXXXXXXXXX
-XXXXXXXXXXXX
-
-XX XXXXXXX
-   XXXXXXXXXXX
-
-XX XXXXXXXXXX XXXXXXXX X XXXXXXX XXXXXXXX XXXX
-XX XXXXXXXXXX XXXXXXXX X XXXX XX XXXX XXX XXXXX XXX XXXX XX
-   XXX XXX XXXXXXX XXXX XX XXX XXXXXXX
-XX XXXXXXXXXX XXX XXXXXXX XXXXXX XXXXX XXXXXX XXXX XXXX
-XX XXXXXXX XXX XXXXXXXXX XX XXXXX XXXXXXX XXXXXXX XXXXX
-XX XXXXXX XXXXXXX XXXX XXXXX XXX XXX XXXXXX
-XX XXXXXXX XXX XXXXXX XX XXXXX XXX XXXXX XXX XXXXXXXX XXXX XXXXX
-XX XXXXXXX XXX XXXX XXXXX XXXXXXX XXXXXXXX
-XX XXXXXXX XXX XXXXXXX XX XXXXXXXXX XXXXX XXXXXX
-XX XXXXXXX XXX XXXXXXXX XXXXX XXXX X XXX XXXXXXX XX XXXXXXXXX XXXXXXXX
-XXX XXXXXXX XXX XXXXXXXX XXXXX XXXX XXXXX XXXXXXXX XXXX XX XXXXXXX
-XXX XXXXXXX XXX XXX XXXXXX XXXXX XX XXXXX XXXXXXXXX
-XXX XXXXXXX XXX XXX X XXXXXX XX XXXXX XXXXXXXX
-XXX XXXXXXX XXX XXXXXX XXXXXXXX XXXX
-XXX XXXXXXX XXX XXXXXX XXXX XXXX XXXX XXXX XXX XXX XXXXX XXX
-XXX XXXXXXX XXX XXX XXX XXXXXX XXXXXXX XX XXXXXX XX XXXXX XXX XXX
-XXX XXXXXXX XXX XXXX XXXXX XXXXXXXXX
-XXX XXXXXXX XXX XXXXXX XXXXXXX XX XXXXXXXXXX
-XXX XXXXXXX XXX XXXXXXXXX XXX XXXXXXXXX
-XXX XXXXXXXXXX XXX XXX XXX XXXX XX XXXXXXXX
-XXX XXXXXXXXXX XXX XXXXXX XXX XXX XX XXX XXXXXXXX
-XXX XXXXXXXXXX XX XXXXXXXX XXXXXXXXX XX XXXXXXX XXXX XX XXXXXXX
-XXX XXXXXXXXXX XXXXXXX XXXX XXXXX XXX XXXXX XXXXXXX XX XXX XXXXX
-
-XXXXXXX
-XXXXXXX
-XXXXXXX
-
-XXX
-
-XXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXX XXXXXXX X XXXXX X
-XXXXXXXXXXXXXXXXXXXXXXXXXX
-
-XXXX XXXXX XXXX XXXXXXX XXX XXXXXXXXXXX XXX XXXX XX XXX XXXXXXXX XXXXXXX XXX XXXXXXXXXXXXX
-
-
-    XXX XXX XXXXXXX XX XX XXXXXX XX XX XXXXXXXX X XXXX XXX XXXXX XXXXX
diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html
index 868680aa..7b63c927 100644
--- a/hosting/templates/hosting/order_detail.html
+++ b/hosting/templates/hosting/order_detail.html
@@ -61,7 +61,7 @@
             {% url 'hosting:payment' as payment_url %}
             {% if payment_url in request.META.HTTP_REFERER  %}
             <div class=" content pull-right">
-                <a href="{% url 'hosting:key_pair'%}" ><button class="btn btn-info">{% trans "Finish Configuration"%}</button></a>
+                <a href="{% url 'hosting:virtual_machines'%}" ><button class="btn btn-info">{% trans "Finish Configuration"%}</button></a>
             </div>
             {% endif %}
         </div>
diff --git a/hosting/templates/hosting/virtual_machine_key.html b/hosting/templates/hosting/virtual_machine_key.html
index 157ceea8..d1917381 100644
--- a/hosting/templates/hosting/virtual_machine_key.html
+++ b/hosting/templates/hosting/virtual_machine_key.html
@@ -112,7 +112,6 @@
 </script>
 {%endif%}
 
-
 {% if next_url %}
     <script type="text/javascript"> 
         window.location.href = '{{next_url}}';
diff --git a/hosting/views.py b/hosting/views.py
index b8b04b7d..f08ad1a4 100644
--- a/hosting/views.py
+++ b/hosting/views.py
@@ -31,7 +31,7 @@ from .mixins import ProcessVMSelectionMixin
 
 from opennebula_api.models import OpenNebulaManager
 from opennebula_api.serializers import VirtualMachineSerializer,\
-                                       VirtualMachineTemplateSerializer
+    VirtualMachineTemplateSerializer
 
 
 from oca.exceptions import OpenNebulaException
@@ -40,6 +40,7 @@ from oca.pool import WrongNameError
 CONNECTION_ERROR = "Your VMs cannot be displayed at the moment due to a backend \
                     connection error. please try again in a few minutes."
 
+
 class DjangoHostingView(ProcessVMSelectionMixin, View):
     template_name = "hosting/django.html"
 
@@ -187,9 +188,11 @@ class SignupView(CreateView):
     template_name = 'hosting/signup.html'
     form_class = HostingUserSignupForm
     model = CustomUser
+    success_url = reverse_lazy('hosting:key_pair')
 
     def get_success_url(self):
-        next_url = self.request.session.get('next', reverse_lazy('hosting:virtual_machines'))
+        next_url = self.request.session.get(
+            'next', self.success_url)
         return next_url
 
     def form_valid(self, form):
@@ -243,12 +246,14 @@ class PasswordResetConfirmView(PasswordResetConfirmViewMixin):
 
                 return self.form_valid(form)
             else:
-                messages.error(request, 'Password reset has not been successful.')
+                messages.error(
+                    request, 'Password reset has not been successful.')
                 form.add_error(None, 'Password reset has not been successful.')
                 return self.form_invalid(form)
 
         else:
-            messages.error(request, 'The reset password link is no longer valid.')
+            messages.error(
+                request, 'The reset password link is no longer valid.')
             form.add_error(None, 'The reset password link is no longer valid.')
             return self.form_invalid(form)
 
@@ -319,15 +324,38 @@ class GenerateVMSSHKeysView(LoginRequiredMixin, FormView):
         form.save()
         context = self.get_context_data()
 
+        next_url = self.request.session.get(
+            'next',
+            reverse('hosting:create_virtual_machine')
+        )
+
+        if 'next' in self.request.session:
+            context.update({
+                'next_url': next_url
+            })
+            del (self.request.session['next'])
+
         if form.cleaned_data.get('private_key'):
             context.update({
                 'private_key': form.cleaned_data.get('private_key'),
                 'key_name': form.cleaned_data.get('name'),
                 'form': UserHostingKeyForm(request=self.request),
-                'next_url': reverse('hosting:create_virtual_machine')
             })
 
-        # return HttpResponseRedirect(reverse('hosting:key_pair'))
+        owner = self.request.user
+        # Create OpenNebulaManager
+        manager = OpenNebulaManager(email=owner.email,
+                                    password=owner.password)
+        # Get OpenNebula user id
+        user_pool = manager._get_user_pool()
+        opennebula_user = user_pool.get_by_name(owner.email)
+
+        # Get user ssh key
+        user_key = UserHostingKey.objects.get(user=owner)
+        # Add ssh key to user
+        manager.oneadmin_client.call('user.update', opennebula_user.id,
+                                     '<CONTEXT><SSH_PUBLIC_KEY>{ssh_key}</SSH_PUBLIC_KEY></CONTEXT>'.format(ssh_key=user_key.public_key))
+
         return render(self.request, self.template_name, context)
 
     def post(self, request, *args, **kwargs):
@@ -375,9 +403,11 @@ class PaymentVMView(LoginRequiredMixin, FormView):
         user = self.request.user
 
         # Get user last order
-        last_hosting_order = HostingOrder.objects.filter(customer__user=user).last()
+        last_hosting_order = HostingOrder.objects.filter(
+            customer__user=user).last()
 
-        # If user has already an hosting order, get the credit card data from it
+        # If user has already an hosting order, get the credit card data from
+        # it
         if last_hosting_order:
             credit_card_data = last_hosting_order.get_cc_data()
             context.update({
@@ -391,9 +421,6 @@ class PaymentVMView(LoginRequiredMixin, FormView):
         return context
 
     def get(self, request, *args, **kwargs):
-        if 'next' in request.session:
-            del request.session['next']
-
         try:
             UserHostingKey.objects.get(
                 user=self.request.user
@@ -405,11 +432,13 @@ class PaymentVMView(LoginRequiredMixin, FormView):
             )
             return HttpResponseRedirect(reverse('hosting:key_pair'))
 
+        if 'next' in request.session:
+            del request.session['next']
+
         return self.render_to_response(self.get_context_data())
 
     def post(self, request, *args, **kwargs):
         form = self.get_form()
-
         if form.is_valid():
 
             # Get billing address data
@@ -465,12 +494,11 @@ class PaymentVMView(LoginRequiredMixin, FormView):
 
             except UserHostingKey.DoesNotExist:
                 pass
-            
 
             # Create a vm using logged user
             vm_id = manager.create_vm(
                 template_id=vm_template_id,
-                #XXX: Confi
+                # XXX: Confi
                 specs=specs,
                 ssh_key=user_key.public_key,
             )
@@ -484,14 +512,16 @@ class PaymentVMView(LoginRequiredMixin, FormView):
             )
 
             # Create a Hosting Bill
-            bill = HostingBill.create(customer=customer, billing_address=billing_address)
+            bill = HostingBill.create(
+                customer=customer, billing_address=billing_address)
 
             # Create Billing Address for User if he does not have one
             if not customer.user.billing_addresses.count():
                 billing_address_data.update({
                     'user': customer.user.id
                 })
-                billing_address_user_form = UserBillingAddressForm(billing_address_data)
+                billing_address_user_form = UserBillingAddressForm(
+                    billing_address_data)
                 billing_address_user_form.is_valid()
                 billing_address_user_form.save()
 
@@ -543,9 +573,9 @@ class OrdersHostingDetailView(PermissionRequiredMixin, LoginRequiredMixin, Detai
             vm = manager.get_vm(obj.vm_id)
             context['vm'] = VirtualMachineSerializer(vm).data
         except ConnectionRefusedError:
-            messages.error( request,
-                'In order to create a VM, you need to create/upload your SSH KEY first.'
-                )
+            messages.error(request,
+                           'In order to create a VM, you need to create/upload your SSH KEY first.'
+                           )
         return context
 
 
@@ -585,20 +615,19 @@ class VirtualMachinesPlanListView(LoginRequiredMixin, ListView):
             serializer = VirtualMachineSerializer(queryset, many=True)
             return serializer.data
         except ConnectionRefusedError:
-            messages.error( self.request,
-                'We could not load your VMs due to a backend connection \
+            messages.error(self.request,
+                           'We could not load your VMs due to a backend connection \
                 error. Please try again in a few minutes'
-                )
+                           )
 
             self.kwargs['error'] = 'connection'
             return []
 
-    
     def get_context_data(self, **kwargs):
         error = self.kwargs.get('error')
         if error is not None:
             print(error)
-            context = { 'error' : 'connection' }
+            context = {'error': 'connection'}
         else:
             context = super(ListView, self).get_context_data(**kwargs)
         return context
@@ -628,16 +657,17 @@ class CreateVirtualMachinesView(LoginRequiredMixin, View):
 
             context = {
                 'templates': VirtualMachineTemplateSerializer(templates, many=True).data,
-                'configuration_options' : configuration_options,
+                'configuration_options': configuration_options,
             }
         except:
-            messages.error( request,
+            messages.error(
+                request,
                 'We could not load the VM templates due to a backend connection \
                 error. Please try again in a few minutes'
-                )
+            )
             context = {
-                'error' : 'connection'
-                    }
+                'error': 'connection'
+            }
 
         return render(request, self.template_name, context)
 
@@ -647,9 +677,10 @@ class CreateVirtualMachinesView(LoginRequiredMixin, View):
         template = manager.get_template(template_id)
         configuration_id = int(request.POST.get('configuration'))
         configuration = HostingPlan.objects.get(id=configuration_id)
-        request.session['template'] = VirtualMachineTemplateSerializer(template).data
+        request.session['template'] = VirtualMachineTemplateSerializer(
+            template).data
 
-        request.session['specs'] = configuration.serialize() 
+        request.session['specs'] = configuration.serialize()
         return redirect(reverse('hosting:payment'))
 
 
@@ -669,10 +700,10 @@ class VirtualMachineView(LoginRequiredMixin, View):
             vm = manager.get_vm(vm_id)
             return vm
         except ConnectionRefusedError:
-            messages.error( self.request,
-                'We could not load your VM due to a backend connection \
+            messages.error(self.request,
+                           'We could not load your VM due to a backend connection \
                 error. Please try again in a few minutes'
-                )
+                           )
             return None
         except Exception as error:
             print(error)
@@ -684,7 +715,7 @@ class VirtualMachineView(LoginRequiredMixin, View):
 
     def get(self, request, *args, **kwargs):
         vm = self.get_object()
-        try: 
+        try:
             serializer = VirtualMachineSerializer(vm)
             context = {
                 'virtual_machine': serializer.data,
diff --git a/membership/payment.py b/membership/payment.py
index d8aad6d5..08245d8e 100644
--- a/membership/payment.py
+++ b/membership/payment.py
@@ -9,6 +9,9 @@ class StripePayment(object):
     @classmethod
     def make_payment(cls,user,amount,token,time):
         try:
+            print(amount)
+            print(amount)
+            print(amount)
             # Use Stripe's library to make requests...
             charge = stripe.Charge.create(
                 amount=amount,
diff --git a/membership/static/font-awesome/HELP-US-OUT.txt.py b/membership/static/font-awesome/HELP-US-OUT.txt.py
deleted file mode 100644
index 10d08214..00000000
--- a/membership/static/font-awesome/HELP-US-OUT.txt.py
+++ /dev/null
@@ -1,7 +0,0 @@
-X XXXX XXX XXXX XXXX XXXXXXXX XX XXXXXX XXXXX XX XXXXXXX XXXXXX XX XX X XXXXX XXX XXXXX XXX XX XXXXXX XXXXXXXX
-XXXX XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXX XX XXXXX XX XXXX XX XXX XXX XXXXXXX XXXXX XX XXXX XXXXXXXX XXXXXX XXXX XXX XXXXXXXX
-XXXXXXXXXXXXX XXXX XXXX XX XXXX XXX XXXXX XXXX XXXX
-
-XXXXXXX XXXXX XX XXXX
-
-XXXXX XXXXX
diff --git a/membership/static/font-awesome/fonts/4.4.0/index.html.py b/membership/static/font-awesome/fonts/4.4.0/index.html.py
deleted file mode 100644
index 4c0d8d67..00000000
--- a/membership/static/font-awesome/fonts/4.4.0/index.html.py
+++ /dev/null
@@ -1,58 +0,0 @@
-XXXXXXXXX XXXXX
-XXXXXX
-  XXXXXX
-    XXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XX
-  XXXXXXX
-
-  XXXXXX
-    XXXXXXXXXXXXXX
-    XXXXXXX
-      XXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXX
-      XXXXX
-      XXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXX
-      XXXXX
-      XXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXX
-      XXXXX
-      XXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXX
-      XXXXX
-      XXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-        XXXXXX XXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXX
-      XXXXX
-    XXXXXXXX
-  XXXXXXX
-
-XXXXXXX
diff --git a/membership/templates/calendar/calendar.html.py b/membership/templates/calendar/calendar.html.py
deleted file mode 100644
index 5a9a2bba..00000000
--- a/membership/templates/calendar/calendar.html.py
+++ /dev/null
@@ -1,113 +0,0 @@
-XXXXXXX XXXXXXXXXXXXXXXXXXXXXXX
-    XXX XXXX X XXX XXXXXXX
-    XXX XXXXX X XXXXXXXXXXXXXXX X XX
-    XXX XXXX X XXXXXXXXXXXXXXXXXXX
-    XXX XXXXXXXXXXXXXX X XXX
-    XXX XXXXXXXXXXXXXXXXXXXXXX X XXX
-
-    XXXXXXXXXXXXXXXXXXXXXXXXXXXX XX X
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X XXXXX X XXX X XXXXX XXXXXXXX XXXXXX X
-            XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-            XXXXXXXXXXXXXXXXXXX
-            XXXXXXXXXX XXXXXX
-            XXXXXXXXXXXXXXXXXXXXXXXXXX XXXXX XXXXXXXX XX X
-                XX XXXXXXXXXXXXXXX XX XXXXXXXXXXXX XX XXXXXXXXXXXXXX XX XXXXXXXXXXXXX X
-                    XX XXXXXXXXXXXXXXXXXX XX XXXXXXXXXXX X
-                        XXXXXXXXX X XXXXXXXXXXXXXXXX X XXX XXXXXX
-                                XXXXXXXXXXXXXXXX X XXXXXXXXXXXXX X XXX X
-                                XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXX
-                    X
-                    XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                X
-                XXXXXXXXXXXXXXXXXXXXXX
-            XX
-        XXX
-    XX
-
-XXXXXXXXX
-
-XXXX XXXXXXXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXX
-    XXXXXX
-    XXXX XXX XXXXXXXX XXX
-XXXXXX XXXX XXX XXXXXXXXX XXX
-XXXXXXX XXXXXXXXXXXXXXXXXXXXXXX
-    XXXXXXXX XXXXXXXXXXXXXXXXXXXXX X
-        XXXXXXXXXXXXXXXXXXXXXX X XXX
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XX X
-            XXXXXXXXX X XXXXXXXXXXXXXXXX X XXX XXXXXX
-                    XXXXXXXXXXXXXXXX X XXXXXXXXXXXXX X XXX X
-                    XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-            XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XX XXX
-                XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-        XXX
-        XXXXXXXXXXXXXXXXXXXXXXXX
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-        XXXXXXXXXXXXXXXXXXX
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    X
-    XXXXXXXXXXXX X XXXXXXXXXXXXXXXXXXXXXX
-    XXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX X
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXX XXX X
-            XXXXXXXXX X XXXXXXXXXXXXXXXX X XXX XXXXXX
-                    XXXXXXXXXXXXXXXX X XXXXXXXXXXXXX X XXX X
-                    XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-            XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XX XXX X
-                XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-            X
-        XXX
-    X
-    XXXXXXXX XXXXXXXXXXXXXX X
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-        XXXXXX X XX
-        XXXXXXXXXXXXXXXXXXXXXX XXXXXXXX XXX XXX X
-            XX XXXXXXXXXXXXXX XXXXXXX XXX XXX XXXXXXXXXXXXXXXX
-        XXX
-        XXXXXXXXXXXXXX X XXXXXXX
-    X
-
-    XXXXXXXX XXXXXXXXXXXXXXXXXX X
-        XXXXXXXXXXXXX
-                XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXX XX X
-                    XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X
-                        XXXXXXXXXXXXXXXXXXXXXXXXXXXXX X XXX
-                    X XXXX X
-                        XXXXXXXXXXXXXXXXXXXXXXXXXXXXX X XX
-                    X
-                    XXXXXXXXXXXXXXX
-
-                    XXXXXXXXX X XXXXXXXXXXXX X XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X XXXXXXXXXXXXXXXX X XX X XXX X XXXXXXXXXXXXXXXXXXX
-                            XXXXXXXX XXXXXX X
-                                XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                                XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                            XXX
-                XX
-                XXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXX XX X
-
-                    XXXXXXXXXXXXXXX
-                    XX XXXXXXXXXXXXXXXXXXXXXXX X
-                        XXXXXXXXXXXXX
-                            XXXXXXXXXXX XXXXXXXX XXXXX XXXXXXXXX X
-                                XX XXXXXXXXXXXXXXXXXXX X
-                                    XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXX
-                                X
-                            X
-                        XXX
-                        XXXXXXXX X XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                        XXXXXXXXXXXXXXXXXXXXX
-                        XXXXXXXXXX X XXXXXXXXXXXX X XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXX XXXXXX X
-                            XX XXXXXXXXXXXX XX XXXXXXXXXX X
-                                XXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX
-                                XXXXXXXXXXXXXXXXXXX XX X
-                                    XXXXXXXXXXXXXXXXXXXX
-                                    XXXXXXXXXXXXXXXXXX
-                                XX XXXX
-                            X
-                        XX
-                    X XXXX X
-                        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXX XXXXXXXX
-                    X
-                XXX
-    X
-XXXXXXXXX
diff --git a/membership/templates/confirm.html.py b/membership/templates/confirm.html.py
deleted file mode 100644
index 9242f9d1..00000000
--- a/membership/templates/confirm.html.py
+++ /dev/null
@@ -1,65 +0,0 @@
-XXXXXX
-XXXXXX
-    XXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-
-    BBBB BBBBBB
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-            XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-            XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXX
-    XXXXX XXXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXBBBBBBBBBBBBBBBBBXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-XXXXXXX
-XXXXXX
-XXXX XXXXXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXXXX
-                XXXX XXXXXXXXXXXXXXXX
-                    XXXX XXXXXXXXXXXXXXXXXX
-                        XXXX XXXXXXXXXXXX
-                            XXXX XXXXXXXXXXXXXXXXXXXXXXX
-                            XXXX XXXXXXXXXXXXXXXXX
-                                XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXX
-                                    XXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXX XX XXXXXX XXXXXXXXXXX
-                                    XXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXX XXXX XX XXXXXXX XXXXXXXXXXXX XXXXX
-                                        XXXXXXXXXXXX
-                                    XXXX
-                                    XXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXX
-
-                                    BB BBBBB
-                                        XXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX XXXXX
-                                    BBBB
-                                        XXXXXXX XXXXXXXXXXXXXXXXXXXXXXX
-
-                                        XXXXXXXXX
-                                    BBBBB
-                                    XXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXX
-                                        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                                    XXXX
-                                XXXXXX
-                            XXXXXX
-                            XXXX XXXXXXXXXXXXXXXXXXXXXXX
-                        XXXXXX
-                        XXXX XXXXXXXXXXXX
-                            XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-                                XX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXX XXXXXXX
-                                    XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                                    XXXX
-                                XXXX
-                                XX XXXXXXXXXX XXXXXXXXXXXX
-                                   XXXXXXBBB BBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBXXXX XXXXXXXX
-                                XX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX
-                            XXXXXX
-                        XXXXXX
-                    XXXXXX
-                XXXXXX
-            XXXXXX
-        XXXXXX
-    XXXXXX
-XXXXXX
-
-
-XXXXXXX
-XXXXXXX
\ No newline at end of file
diff --git a/membership/templates/creditcard.html.py b/membership/templates/creditcard.html.py
deleted file mode 100644
index 0cdaada9..00000000
--- a/membership/templates/creditcard.html.py
+++ /dev/null
@@ -1,108 +0,0 @@
-XXXXXX
-XXXXXX
-    BBBB BBBBBB
-    XXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-            XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-            XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXX
-    XXXXX XXXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX
-          XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXXX
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-        XXX XXXXXXXXXXXXXXXXXXXXX X XXXXXXXX XXXXXXXX XXXXXXXXX X
-            XXX XXXXX X XXXXXXXXXXXXXXXXXXX
-            XX XXXXXXXXXXXXXXXX X
-                XXXXXXXXX
-                XX XXXX XXX XXXXXX XX XXX XXXX
-                XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXX
-            X XXXX X
-                XX XXXXX XXXXXXXX XXX XXXXXX XXX XXXX XXXX
-                XXX XXXXX X XXXXXXXXXXXX
-                XX XXXXXX XXX XXXXX XXXX XXX XXXX XX XX XXXX XXXXXXXXX XX XXX XXXXXX
-                XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-                XX XXX XXXXXXXXX
-                XXXXXXXXXXXXXXXXXXXXXX
-            X
-        XX
-        XXXXXXXXXXXXXXX XXX X
-            XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXX X
-                XXX XXXXX X XXXXXXXX
-                XXX X XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                XX XXXXXXX XXX XXXXXX XXXXXX XX XXXXXXX XXXXXXXX XXXXXX
-                XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXX
-                XXXXXXXXXXXXXXXXXXXXXXXXX
-                    XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXX
-                    XXXX XXXXXXXXXXXXXXXXXXX
-                    XXXXXXXXXX XXXXXXX
-                    XXXXXXXXX XXXXXX
-                XX XXXXXXXXXXXXXXXXXXXXXXX
-                XX XXXXXXX XXX XXXX XXXX XXXXXXXXXX XXXX XXX XXXXXXX XXXXXX
-                XXXXXX XXXXXX
-            XXX
-        XXX
-    XXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-          XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-    BBBB BBBBBB
-    XXXXX XXXXXXBBBBBBBBBBBBBBBBBXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-XXXXXXX
-XXXXXX
-XXXX XXXXXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXXX
-                XXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXX
-                XXXX
-                XXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX
-                    XXXX XXXXXXXXX XXXXXXXXXX XXXXXXX XXXXXXXXX
-                    XXXXXXXXXX X XXXX XXXXXXX XXXX XXXXXXXX XXXXXXXX XXXXXXXXX
-
-                    XXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXX
-                        XXXXXXXXX XXXXXXXXXX X XXXXXXXXXXXXXXXXXXXXX
-                        XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXX
-                    XXXXXX
-                XXXXXX
-                XXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXX
-                    XXX XXXXXXXXXXXXXXXXXXXXXXXX X  XXXXXXXX
-                XXXXXX
-                XXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXX
-                    XXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                    BBBBBBBBBB
-                    BBB BBBBB BB  BBBB
-                        XXXX XXXXXXXXXXXXXXXXXXX
-                            XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                            
-                            BBB BBBBB BB BBBBBBBBBBBB
-                                FFFFFFFFF
-                            BBBBBB
-                        XXXXXX
-                    BBBBBB
-                    XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                XXXXXXX
-                XX XXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXXXXXX
-            XXXXXX
-            XXXX XXXXXXXXXXXXXXXXXXXXXXX
-        XXXXXX
-        XXXX XXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXXXX
-                XXXX
-
-                XX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXX XXXXXXX
-                    XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                    XXXX
-                    XXXX
-                XXXX
-            XXXXXX
-        XXXXXX
-    XXXXXX
-XXXXXX
-
-
-XXXXXXX
-XXXXXXX
\ No newline at end of file
diff --git a/membership/templates/error.html.py b/membership/templates/error.html.py
deleted file mode 100644
index 078dc6d4..00000000
--- a/membership/templates/error.html.py
+++ /dev/null
@@ -1,55 +0,0 @@
-XXXXXX
-XXXXXX
-    BBBB BBBBBB
-    XXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-            XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-            XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXX
-    XXXXX XXXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX
-          XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXBBBBBBBBBBBBBBBBBXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-
-XXXXXXX
-XXXXXX
-XXXX XXXXXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXXXX
-                XXX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXX XXXXXXXXXXXX
-            XXXXXX
-        XXXXXX
-        XXXX XXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXXXX
-                XX XXXXXXXXXXXXXXXXXXXXXXXX XXXX XXXXXX XXX XXX XXXXXXXXX 
-                    XXXXXXXX XXXXXXXXX XXXXXXX XX XX
-                    XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                XXXX
-
-
-                XXXXXXX
-            XXXXXX
-            XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXX
-            XXXX
-        XXXXXX
-        XXXX XXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-                XX XXXXXXXXXX XXXXXXXXXXXX XXXXXXBBB BBBBBBBBBBBBBBXXXXXXXXXX
-            XXXXXX
-        XXXXXX
-        XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXX
-        XXXX
-    XXXXXX
-    XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXX
-    XXXX
-XXXXXX
-XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXX
-
-
-XXXX
-
-
-XXXXXXX
-XXXXXXX
\ No newline at end of file
diff --git a/membership/templates/login.html.py b/membership/templates/login.html.py
deleted file mode 100644
index 23ec0798..00000000
--- a/membership/templates/login.html.py
+++ /dev/null
@@ -1,53 +0,0 @@
-BBBBBBB BBBBBBBBBBBBBBBBBBBBBB
-BBBB BBBBBBBBBBB BBBBBBBB BBBBBBBBBB
-BBBBB BBBBBXXXXXXXXXXXXBBBBBBBB
-
-BBBBB BBBBBBB
-
-XXXXXXXX XXXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXXX
-                XXXXXXX XXXXXXX X XXXXXXXXXXXX
-                XXXXX XXXX XXX XXXX XX XX XXXXXX XXXXXXX
-                XXXXXXX XXXXXXX
-                XXXX
-                XXXXX XXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXX
-                BBBBBBBBBB
-                    BBB BBBBB BB BBBBBBBBBB
-                        XXXX XXXXXXXXXXXXXXXXXXX
-                            XXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXX
-                            BBBBBBBBBBBBBBB BBBBB BBBBBBBBBBBBB
-                        XXXXXX
-                    BBBBBB
-                    
-                    XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                XXXXXXX
-            XXXXXX
-            XXXX XXXXXXXXXXXXXXXXX
-                XXXXXXXXX
-
-                XXXXXXX XXX X XXXXXXXXXXXX
-
-                XXXXX XXXX XXXXX XXXX XXXXX XX XXXXXXXXX
-                    XXXXXX XXX X XXXX XXXX XX XXX XXXXXXXXXXXXXXXXX
-
-                XXXXXXXXXXXXXXXXX
-                XXXX
-                XXXXX XXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXX
-                    BBBBBBBBBB
-                     XXXX XXXXXXXXXXXXXXXXXXX
-                        BBB BBBBB BB BBBBBBBBBBBBB
-                            BBBBBBBBBBBBBBB BBBBB BBBBBBBBBBBBB
-                            XXXX XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXX
-                            XXXX  XXX
-                        BBBBBB
-                    XXXXXX
-                    XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                XXXXXXX
-            XXXXXX
-        XXXXXX
-    XXXXXX
-XXXXXXXXXX
-
-BBBBBBBB
\ No newline at end of file
diff --git a/membership/templates/membership.html.py b/membership/templates/membership.html.py
deleted file mode 100644
index a79db3ef..00000000
--- a/membership/templates/membership.html.py
+++ /dev/null
@@ -1,249 +0,0 @@
-BBBB BBBBBB BBBBBBBB
-XXXXXX
-XXXXXX
-    XXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXX
-    XXXXX XXXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXXXXXXXXX
-    XXXXX XXXXXXBBBBBBBBBBBBBBBBBXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXBBBBBBBBBBBBBBBBBXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-
-XXXXXXX
-XXXXX XXXXXXXX
-XXXX XXXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXXXXXXX XXX XXXXXX
-            BB BBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-                XXXX XXXXXXXXXXXXXXX XXXXXXXXX XXXXX XXXXXXXX
-                                     XXXXXXXXXXXXXXXXXXXXXXX XXX XXXXXXBBB BBBBBBBBBBBBBBBXXXXXXXXXXXXXXXXXXX
-            BBBB
-                XX XXXXXXBBB BBBBBBBBBBBBBBXX XXXXX XXXX
-            BBBBB
-        XXXXXX
-        XXXX XXXXXXXXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXXXXXXXX
-                XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-                        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                    XXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-                    XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-                    XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-                    XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-                XXXXXXXXX
-                XX XXXXXXXXXXXXXXXXXXXX XXXXXXBBBBBBBB BBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-            XXXXXX
-            XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-                XXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXXX
-                    XXX XXXXXXXXXXXXXXX
-                        XX XXXXXXBBBBBBBB BBBBBBBBBBBBBBBBBBBBBXXXXXXXXXX
-                    XXXXX
-                    XXX XXXXXXXXXXXXXXX
-                        XX XXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXXXXX
-                    XXXXX
-
-                    XXXX
-
-                    XXXXX
-                XXXXX
-            XXXXXX
-        XXXXXX
-    XXXXXX
-    BBBB BBBBBB
-
-    XXXX XXXXXXXXXXXXXXXXXXX
-         XXXXXXXXXXXXXXXXXXXXXXX X XXXXXBBBBBBBBBBBBBBBBBXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-                XXX XXXXXXXXXXXXXXXXXXXXXXXXX XX XXX XXXX XX XXXXXXXXXXXX
-
-                XX XXXXXXXXXXXXXXXXXXXXXXXXX X XXXXXXXXX
-                XXXXXXX XXXXXXXXXX XXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                XXXXXXXXX
-                XXXX XXXXX XXX
-                XXXX XXXXXXXXXXXX XXXXX XXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX
-                     XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                    XXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-                        XXXX XXXXXXXXXXXXXXXXXXXXXX
-                            XXXX XXXXXXXXXXXXXXXXXXXXX
-                                XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX
-                                    XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                                XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX
-                            XXXXXX
-                            XXXX XXXXXXXXXXXXXXXXXXX
-                                BBBBBBB BBBBBBBBBBBBBBBBBBBBBBBB
-                            XXXXXX
-                            XXXX XXXXXXXXXXXXXXXXXXXXX
-                                XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX
-                                        XXXXXXXXXXXXXXXXXXXXXXXXXX
-                                XXXXXXXXX
-                                XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXXXXXX XXXX
-                                XXXXXXXXX
-                            XXXXXX
-                        XXXXXX
-                    XXXXXX
-                XXXXXX
-            XXXXXX
-        XXXXXX
-    XXXXXX
-XXXXXX
-XXXX XXXXXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXXXX
-                XXX XXXXXXXXXXXXXXXXXXXXXXXXXX X XXXXXXXXXXXX
-            XXXXXX
-        XXXXXX
-        XXXX XXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXXXX
-                XX XXXXXXXXXXXXXXXXXXXXXXXXXX XXX XXXXXX XX XXXXXXX XXXXXXXXXXXXXXXXX
-            XXXXXX
-        XXXXXX
-    XXXXXX
-XXXXXX
-XXXX XXXXXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXXX
-                XXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                     XXXXXXXXXXXXXXXXXXXXXXX
-            XXXXXX
-            XXXX XXXXXXXXXXXXXXXXX
-                XXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-
-                XXXXXXXXXXXXXXX XX XXX XXXX XXXXXXXXXXXXXX
-
-                XXXXX XXX XXXXX XX XXXXXX X XXXXX XX XX XXXXXXXX XX XXX XXXXXX XX XXX XXXXX
-                    XXXX XXXX XXXXX X XXXXXX XXX XXX XXXXX XXX XXXX XXXXXXX XX X XXXXXXX XXXXXX
-                    XXXXXXXXX XXXXXXXXXXX XXX XXX XXXXX XXXX XXXXX XXXXXXX XXXXXXXXXX XXX XXXXXXXXXXX
-                    XXXXXXX XXXXX XXXXX XXX XXX XXXX XX XXXX XXXX XXXXX XXX XXXX XXXXXXX XXXXXXXXXX
-                    XX XXXXXXXX XXXXXXXXXX XXX XX XXXX XXXX XXXX XXX XXXXXXXXXX XX XXXXXX XXX
-                    XXX XXXXX XX XXX XXXXX XXX XXX XXX XXXXXX XXX XXXXX XXX XXXXXXXXXX X XXXXXXXX
-                    XXXXX XXXX XX XXXXXXXX XXXXXXX XX X XXXXXXX XXX XXXXXXXXXXX XXXXXXXX X
-                    XXX XXXX XXXXXXXXX XX XX XXXXXXX XXX XXX XX XXX XXX XXXXXXXX X XXXXXXX
-                    XXXXX XX X XXXXXXXXX XX XXX XXXXXXX XX XXXXXX XXX X XXXXXXX XXXXXX XX XXXXXXXXXXX
-                    XXX XXXXXXXXXX XX XX X XXXXXXX XXXXXXX XXXXXXXX
-                    XXXX
-                XXXX
-                XX XXXXXXXXXX XXXXXXXXXXXX XXXXXXBBB BBBBBBBBB BBBBBBBBBBBBXXXXX XXXXXXX
-            XXXXXX
-        XXXXXX
-    XXXXXX
-XXXXXX
-XXXX XXXXXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXXX
-                XXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXX
-
-                XXXXXXXXXXXXXXX XX XXXX XXX XXX XXXXX XXXXXXXXXXXXXX
-
-                XXXXX X XXXXXXX XXXXXXXX XX XXX XXXXXXX XXXXXX XXXXXXXXXX XXXX XXXX XXXXXXX
-                    XXX XXX XXXXX XXX XXXX XXXXXXXXX XXXXX XXX XXX XXXXX XXXXX XXXX XXXXXXXXXX
-                    X XXXX XXX XXXXXX XXX XXXX XXXXXX XX XX XX XXXXX XXXX XXX XXX XXXX XXX
-                    XXXXXX XXXXXXXXX XXX XXXXX XXXX XX XXXX XXXXXXXX XXXXXXXXX XXXXXXXXXX XXX
-                    XXXXXXXXXX XXXXX XXXXXX XXXXXXXXXXXX XXXXXXXXXX XXXXX XX XXXXXXX XXX XXXXXX
-                    XXXXXXXXXXX
-                    XXXX
-                XXXX
-                XX XXXXXXXXXX XXXXXXXXXXXX XXXXXXBBB BBBBBBBBB BBBBBBBBBBBXXXXX XXXXXXX
-            XXXXXX
-            XXXX XXXXXXXXXXXXXXXXX
-                XXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                     XXXXXXXXXXXXXXXXXXXXXXX
-            XXXXXX
-        XXXXXX
-    XXXXXX
-XXXXXX
-XXXX XXXXXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXXXX
-                XXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXX XXXXXXXXXXXXX
-
-                XX XXXXXXXXXXXXXXXXXXXXX XXXXX XXXXX XXX XXXXXXXXXX XXXXXXXXXXXXX
-            XXXXXX
-        XXXXXX
-        XXXX XXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXXXX
-                XXXXXX XXXXXXXXXXXXXX
-                    XXXXXXX
-                    XXXX
-                        XXXXXXXXX
-                        XXXXXXX XXXXXXXXXXXXXXXX
-                        XXXXXXX XXXXXXXXXXXXXX
-                    XXXXX
-                    XXXXXXXX
-                    XXXXXXX
-                    XXXX
-                        XXXXXXXXXXXXXXXXX
-                        XXXXX XXXX XXX XXXXXXXXXXXXX
-                        XXXXX XXXX XXXX XXXX XXX XXXXXXXXXX
-                    XXXXX
-                    XXXX
-                        XXXXXXXX XXXXXXXX
-                        XXXXXXXXX XXX XXXXXX XXX XXX XX XXXXXXXXX
-                        XXXXXXXXXXX XXX XXXXXXXXX XXXX XXXXX XXXXXXXXXX
-                    XXXXX
-                    XXXX
-                        XXXXXXXXXXXXXX
-                        XXXXXXXXXXX XXXXX XXXXXXXXXX
-                        XXXXXXX XXXX XXX XXXXXXXXX
-                    XXXXX
-                    XXXX
-                        XXXXXXXXXXXXXX XXXXXXXXXX
-                        XXXXXXXXXXXXXXXXXXXX
-                        XXXXXXXXXXXXXXXXXXXX
-                    XXXXX
-                    XXXX
-                        XXXXXXXXX XXX XXXXXXXXXX XXXXXXXX
-                        XXXXXX XXXXXXXX
-                        XXXXXX XXXXXXXX
-                    XXXXX
-                    XXXXXXXX
-                XXXXXXXX
-            XXXXXX
-        XXXXXX
-    XXXXXX
-XXXXXX
-XXXXXXX XXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXXX
-                XXXXXXXXXXX XXXXXXXXXXX
-
-                XXXXX XXX XX X XXXX XXXXXXXXX
-                    XXXXXXXXXXXXX X XXXXXXXX XXXX XXXXXXXX
-            XXXXXX
-            XXXX XXXXXXXXXXXXXXXXX
-                XX XXXXXXXXXXXXXXXX XXXXXXXXXXXX
-                    XXXX
-                    XXXX
-                XXXX
-
-                XXXX XXXXXXXXXXXX
-                    XXXX XXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXX XXXXXXXXX XXXXXXXXXXX
-                        XX XXXXXXXXXXX XXXXXXXXX XXXXX XXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-                        XX XXXXXXXXXXX XXXXXXXXX XXXXX XXXXX XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-                        XX XXXXXXXXXXX XXXXXXXXX XXXXX XXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-                        XX XXXXXXXXXXX XXXXXXXXX XXXXX XXXXX XXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-                    XXXXXX
-                XXXXXX
-                XXXX XXXXXXXXXXXX
-                    XXXX XXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXX
-                        XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXXXXXX
-                        XX XXXXXXXXX XXXXX XXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXX
-                        XX XXXXXXXXXXX XXXXXXXXX XXXXX XXXXX XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-                        XX XXXXXXXXXXX XXXXXXXXX XXXXX XXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-                        XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXXXXX
-                        XX XXXXXXXXX XXXXX XXXXX XXXXXXXXX XXXXXXXXXXXXXXXXXX
-                    XXXXXX
-                XXXXXX
-            XXXXXX
-        XXXXXX
-    XXXXXX
-XXXXXXXXX
-
-
-XXXXXXX
-XXXXXXX
\ No newline at end of file
diff --git a/membership/templates/success.html.py b/membership/templates/success.html.py
deleted file mode 100644
index 4c374b62..00000000
--- a/membership/templates/success.html.py
+++ /dev/null
@@ -1,32 +0,0 @@
-BBBB BBBBBB
-XXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXX
-    XXXXX XXXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-  XXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXX
-      XXXX XXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXX
-          XXXX XXXXXXXXXXXXXXXXXX
-            XXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXX
-          XXXXXX
-        XXXXXX
-        XXXX XXXXXXXXXXXX
-          XXXX XXXXXXXXXXXXXXXXXX
-            XX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXX
-              XXXXXXXXX XXXX XXXXX XX XXXXXXXX XXXX XXXXXXXXXXXX
-            XXXX XXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-                XX XXXXXXXXXX XXXXXXXXXXXX XXXXXXBBB BBBBBBBBBBBBBBXXXXXXXXXX
-            XXXXXX
-        XXXXXX
-          XXXXXX
-        XXXXXX
-      XXXXXX
-    XXXXXX
-
-
-XXXXXXXXXXXXXX
\ No newline at end of file
diff --git a/membership/templates/validated.html.py b/membership/templates/validated.html.py
deleted file mode 100644
index c2e19675..00000000
--- a/membership/templates/validated.html.py
+++ /dev/null
@@ -1,39 +0,0 @@
-BBBB BBBBBB
-XXXXXX
-XXXXXX
-    XXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXX
-    XXXXX XXXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXXXXXXXX
-          XXXXXXXXXXXXXXXX
-    BB BBBBBBBBBBBBBBBBBBBB BB BBBB
-    XXXXXXXX
-        XXXX X XXXXXXXXXXXXXXXXX X
-                XXXXXXXXXXXXXXXXXXX XX X
-                    XXXXXXXXXXXXXXXXXXXX X XBBB BBBBBBBBBBBBXX
-                XX XXXXXX
-    XXXXXXXXX
-    BBBBB
-XXXXXXX
-XXXXXX
-XXXX XXXXXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXXXX
-                XXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXX
-                    BB BBB BB BBBBBBBBBBB
-                        XXXXX XXX XXX XXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX
-                    BBBB
-                        XXXX XXXXXXX XXX XXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXX XX XX XXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXX
-                    BBBBB
-                XXXXX
-            XXXXXX
-        XXXXXX
-    XXXXXX
-XXXXXX
-
-
-XXXXXXX
-XXXXXXX
\ No newline at end of file
diff --git a/membership/templates/validated_email.html.py b/membership/templates/validated_email.html.py
deleted file mode 100644
index 75515bc8..00000000
--- a/membership/templates/validated_email.html.py
+++ /dev/null
@@ -1,38 +0,0 @@
-XXXXXX
-XXXXXX
-    XXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-    BBBB BBBBBB
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXX
-    XXXXX XXXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXXXXXXXXX
-    BB BBBBBBBBBBBBBBBBBBBB BB BBBB
-    XXXXXXXX
-        XXXX X XXXXXXXXXXXXXXXXX X
-                XXXXXXXXXXXXXXXXXXX XX X
-                    XXXXXXXXXXXXXXXXXXXX X XXXX
-                XX XXXXXX
-    XXXXXXXXX
-    BBBBB
-XXXXXXX
-XXXXXX
-XXXX XXXXXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXXXX
-                XXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXX
-                    BB BBB
-                        XXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX
-                    BBBB
-                        XXXXXXXX XXX XXXXXXXXXXXX
-                    BBBBB
-                XXXXX
-            XXXXXX
-        XXXXXX
-    XXXXXX
-XXXXXX
-
-
-XXXXXXX
-XXXXXXX
\ No newline at end of file
diff --git a/non_django_but_related/design_membership/confirm.html.py b/non_django_but_related/design_membership/confirm.html.py
deleted file mode 100644
index 8785f763..00000000
--- a/non_django_but_related/design_membership/confirm.html.py
+++ /dev/null
@@ -1,49 +0,0 @@
-XXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-  XXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXX
-      XXXX XXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXX
-          XXXX XXXXXXXXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXX
-              XXXX XXXXXXXXXXXXXXXXXX
-                XXXX XXXXXXXXXXXX
-                  XXXX XXXXXXXXXXXXXXXXXXXXXXX
-                  XXXX XXXXXXXXXXXXXXXXX
-                    XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXX
-                      XXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXX XX XXXXXX XXXXXXXXXXX
-                      XXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXX XXXX XX XXXXXXX XXXXXXXXXXXX XXXXX XXXXXXXXXXXX
-                      XXXX
-                      XXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXX XXXXXXXXXXXXXXXX
-                      XXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                      XXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXX
-                        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                      XXXX
-                    XXXXXX
-                  XXXXXX
-                  XXXX XXXXXXXXXXXXXXXXXXXXXXX
-                XXXXXX
-                XXXX XXXXXXXXXXXX
-                  XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-                    XX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXX XXXXXXX
-                      XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                      XXXX
-                    XXXX
-                    XX XXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXX
-                    XX XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-                  XXXXXX
-                XXXXXX
-              XXXXXX
-            XXXXXX
-          XXXXXX
-        XXXXXX
-      XXXXXX
-    XXXXXX
-  
-
-XXXXXXXXXXXXXX
\ No newline at end of file
diff --git a/non_django_but_related/design_membership/creditcard.html.py b/non_django_but_related/design_membership/creditcard.html.py
deleted file mode 100644
index 1224841a..00000000
--- a/non_django_but_related/design_membership/creditcard.html.py
+++ /dev/null
@@ -1,66 +0,0 @@
-XXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-  XXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXX
-      XXXX XXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXX
-          XXXX XXXXXXXXXXXXXXXXXXXXXXX
-          XXXX XXXXXXXXXXXXXXXXX
-            XXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXX
-            XXXX
-            XXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX
-              XXXXX XXXX XXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXX
-              XXXXXXXXXX XX XXXX XXXXXXX XXXX XXXXXXXX XXXXXXXX XXXXXXXXX
-              XXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXX
-                XXXXXXXXX XXXXXXXXXX X XXXXXXXXXXXXXXXXXXXXX
-                XXXXXXXXXXXX XXXXXXXXXXX XXXX XXXXXXXXXXXXXXXXXXXXXX
-              XXXXXX
-            XXXXXX
-            XXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXX
-              XXX XXXXXXXXXXXXXXXXXXXXXXXX X XXX XXXXXXXX
-            XXXXXX
-            XXXXX XXXXXXXXXXXX
-              XXXX XXXXXXXXXXXXXXXXXXX
-                XXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                XXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX XXXX XX XXXXX XXXXXXXXXXXXX
-              XXXXXX
-              XXXX XXXXXXXXXXXXXXXXXXX
-                XXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX
-                XXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXX XXXXXXXXXXXX
-              XXXXXX
-            XXXXXXX
-            XXXXX XXXXXXXXXXXX
-              XXXX XXXXXXXXXXXXXXXXXXX
-                XXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-                XXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-              XXXXXX
-              XXXX XXXXXXXXXXXXXXXXXXX
-                XXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                XXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-              XXXXXX
-              XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-            XXXXXXX
-            XX XXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXXXXXX
-          XXXXXX
-          XXXX XXXXXXXXXXXXXXXXXXXXXXX
-        XXXXXX
-        XXXX XXXXXXXXXXXX
-          XXXX XXXXXXXXXXXXXXXXXX
-            XXXX
-            XX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXX XXXXXXX
-              XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              XXXX
-              XXXX
-            XXXX
-          XXXXXX
-        XXXXXX
-      XXXXXX
-    XXXXXX
-  
-
-XXXXXXXXXXXXXX
\ No newline at end of file
diff --git a/non_django_but_related/design_membership/error.html.py b/non_django_but_related/design_membership/error.html.py
deleted file mode 100644
index 79e60810..00000000
--- a/non_django_but_related/design_membership/error.html.py
+++ /dev/null
@@ -1,44 +0,0 @@
-XXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-     XXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-  XXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXX
-      XXXX XXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXX
-          XXXX XXXXXXXXXXXXXXXXXX
-            XXX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXX XXXXXXXXXXXX
-          XXXXXX
-        XXXXXX
-        XXXX XXXXXXXXXXXX
-          XXXX XXXXXXXXXXXXXXXXXX
-            XX XXXXXXXXXXXXXXXXXXXXXXXX XXXX XXXXXX XXX XXX XXXXXXXXX
-              XXXXXXXX XXXXXXXXX XXXXXXX XX XX
-              XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-            XXXX
-            XXXXXXX
-          XXXXXX
-          XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXX
-        XXXX
-        XXXXXX
-        XXXX XXXXXXXXXXXX
-          XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-            XX XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX
-          XXXXXX
-        XXXXXX
-        XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXX
-      XXXX
-      XXXXXX
-      XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXX
-    XXXX
-    XXXXXX
-    XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXX
-  
-
-XXXX
-  
-
-XXXXXXXXXXXXXX
\ No newline at end of file
diff --git a/non_django_but_related/design_membership/login.html.py b/non_django_but_related/design_membership/login.html.py
deleted file mode 100644
index fab7252c..00000000
--- a/non_django_but_related/design_membership/login.html.py
+++ /dev/null
@@ -1,109 +0,0 @@
-XXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-  XXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXX XXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX
-      XXXX XXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXXXXXXXXXXXX
-          XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-            XXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-            XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-            XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-            XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-          XXXXXXXXX
-          XX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-        XXXXXX
-        XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-          XXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXXX
-            XXX XXXXXXXXXXXXXXX
-              XX XXXXXXBBB BBBBBBBBBBBBBBBBBBBBBXXXXXXXXXX
-            XXXXX
-            XXXX
-              XX XXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXXXXX
-            XXXXX
-          XXXXX
-        XXXXXX
-      XXXXXX
-    XXXXXX
-    XXXX XXXXXXXXXXXXXXXX
-      XXXX XXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXX
-          XXXX XXXXXXXXXXXXXXXXX
-            XXXXXXX XXXXXXX X XXXXXXXXXXXX
-            XXXXX XXXX XXX XXXX XX XX XXXXXX XXXXXXX
-            XXXXXXX XXXXXXX
-            XXXX
-            XXXXX XXXXXXXXXXXX
-              XXXX XXXXXXXXXXXXXXXXXXX
-                XXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX
-                XXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX XXXXXX XXXXXXXXXXXXX
-              XXXXXX
-              XXXX XXXXXXXXXXXXXXXXXXX
-                XXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                XXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-              XXXXXX
-              XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-            XXXXXXX
-          XXXXXX
-          XXXX XXXXXXXXXXXXXXXXX
-            XXXXXXXXX
-            XXXXXXX XXX X XXXXXXXXXXXX
-            XXXXX XXXX XXXXX XXXX XXXXX XX XXXXXXXXX
-             XXXXXX XXX X XXXX XXXX XX XXX XXXXXXXXXXXXXXXXX
-            XXXXXXXXXXXXXXXXX
-            XXXX
-            XXXXX XXXXXXXXXXXX
-              XXXX XXXXXXXXXXXXXXXXXXX
-                XXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                XXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX XXXXX XXXXXXXXXXXX
-              XXXXXX
-              XXXX XXXXXXXXXXXXXXXXXXX
-                XXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX
-                XXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX XXXXXX XXXXXXXXXXXXX
-              XXXXXX
-              XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-            XXXXXXX
-          XXXXXX
-        XXXXXX
-      XXXXXX
-    XXXXXX
-    XXXXXXX XXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-      XXXX XXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXX
-          XXXX XXXXXXXXXXXXXXXXX
-            XXXXXXXXXXX XXXXXXXXXXX
-            XXXXX XXX XX X XXXX XXXXXXXXX 
-              XXXXXXXXXXXXX X XXXXXXXX XXXX XXXXXXXX
-          XXXXXX
-          XXXX XXXXXXXXXXXXXXXXX
-            XX XXXXXXXXXXXXXXXX XXXXXXXXXXXX
-              XXXX
-              XXXX
-            XXXX
-            XXXX XXXXXXXXXXXX
-              XXXX XXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXX XXXXXXXXX XXXXXXXXXXX
-                XX XXXXXXXXXXX XXXXXXXXX XXXXX XXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-                XX XXXXXXXXXXX XXXXXXXXX XXXXX XXXXX XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-                XX XXXXXXXXXXX XXXXXXXXX XXXXX XXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-                XX XXXXXXXXXXX XXXXXXXXX XXXXX XXXXX XXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-              XXXXXX
-            XXXXXX
-            XXXX XXXXXXXXXXXX
-              XXXX XXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXX
-                XX XXXXXXXXXXX XXXXXXXXX XXXXX XXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-                XX XXXXXXXXXXX XXXXXXXXX XXXXX XXXXX XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-                XX XXXXXXXXXXX XXXXXXXXX XXXXX XXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-                XX XXXXXXXXXXX XXXXXXXXX XXXXX XXXXX XXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-              XXXXXX
-            XXXXXX
-          XXXXXX
-        XXXXXX
-      XXXXXX
-    XXXXXXXXX
-  
-
-XXXXXXXXXXXXXX
\ No newline at end of file
diff --git a/non_django_but_related/design_membership/membership.html.py b/non_django_but_related/design_membership/membership.html.py
deleted file mode 100644
index 323cbb5a..00000000
--- a/non_django_but_related/design_membership/membership.html.py
+++ /dev/null
@@ -1,193 +0,0 @@
-XXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-  XXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXX
-      XXXX XXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXXXXXXXX
-          XXXX XXXXXXXXXXXXXXXXXXXXXX
-            XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              XXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-              XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-              XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-              XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-            XXXXXXXXX
-            XX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-          XXXXXX
-          XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-            XXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXXX
-              XXX XXXXXXXXXXXXXXX
-                XX XXXXXXXXXXXXXXXXX
-              XXXXX
-              XXXX
-                XX XXXXXXXXXXXXXXXXXXXXX
-              XXXXX
-            XXXXX
-          XXXXXX
-        XXXXXX
-      XXXXXX
-      XXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX X XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX
-      XXXX XXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXX
-          XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-            XXX XXXXXXXXXXXXXXXXXXXXXXXXX XX XXX XXXX XX XXXXXXXXXXXX
-            XX XXXXXXXXXXXXXXXXXXXXXXXXX X XXXXXXXXX
-            XX XXXXXXXXXX XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXX
-          XXXXXX
-        XXXXXX
-      XXXXXX
-    XXXXXX
-    XXXX XXXXXXXXXXXXXXXX
-      XXXX XXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXX
-          XXXX XXXXXXXXXXXXXXXXXX
-            XXX XXXXXXXXXXXXXXXXXXXXXXXXXX X XXXXXXXXXXXX
-          XXXXXX
-        XXXXXX
-        XXXX XXXXXXXXXXXX
-          XXXX XXXXXXXXXXXXXXXXXX
-            XX XXXXXXXXXXXXXXXXXXXXXXXXXX XXX XXXXXX XX XXXXXXX XXXXXXXXXXXXXXXXX
-          XXXXXX
-        XXXXXX
-      XXXXXX
-    XXXXXX
-    XXXX XXXXXXXXXXXXXXXX
-      XXXX XXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXX
-          XXXX XXXXXXXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX
-          XXXXXX
-          XXXX XXXXXXXXXXXXXXXXX
-            XXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-            XXXXXXXXXXXXXXX XX XXX XXXX XXXXXXXXXXXXXX
-            XXXXX XXX XXXXX XX XXXXXX X XXXXX XX XX XXXXXXXX XX XXX XXXXXX XX XXX XXXXX
-              XXXX XXXX XXXXX X XXXXXX XXX XXX XXXXX XXX XXXX XXXXXXX XX X XXXXXXX XXXXXX
-              XXXXXXXXX XXXXXXXXXXX XXX XXX XXXXX XXXX XXXXX XXXXXXX XXXXXXXXXX XXX XXXXXXXXXXX
-              XXXXXXX XXXXX XXXXX XXX XXX XXXX XX XXXX XXXX XXXXX XXX XXXX XXXXXXX XXXXXXXXXX
-              XX XXXXXXXX XXXXXXXXXX XXX XX XXXX XXXX XXXX XXX XXXXXXXXXX XX XXXXXX XXX
-              XXX XXXXX XX XXX XXXXX XXX XXX XXX XXXXXX XXX XXXXX XXX XXXXXXXXXX X XXXXXXXX
-              XXXXX XXXX XX XXXXXXXX XXXXXXX XX X XXXXXXX XXX XXXXXXXXXXX XXXXXXXX X
-              XXX XXXX XXXXXXXXX XX XX XXXXXXX XXX XXX XX XXX XXX XXXXXXXX X XXXXXXX
-              XXXXX XX X XXXXXXXXX XX XXX XXXXXXX XX XXXXXX XXX X XXXXXXX XXXXXX XX XXXXXXXXXXX
-              XXX XXXXXXXXXX XX XX X XXXXXXX XXXXXXX XXXXXXXX
-              XXXX
-            XXXX
-            XX XXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXX
-          XXXXXX
-        XXXXXX
-      XXXXXX
-    XXXXXX
-    XXXX XXXXXXXXXXXXXXXX
-      XXXX XXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXX
-          XXXX XXXXXXXXXXXXXXXXX
-            XXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXX
-            XXXXXXXXXXXXXXX XX XXXX XXX XXX XXXXX XXXXXXXXXXXXXX
-            XXXXX X XXXXXXX XXXXXXXX XX XXX XXXXXXX XXXXXX XXXXXXXXXX XXXX XXXX XXXXXXX
-              XXX XXX XXXXX XXX XXXX XXXXXXXXX XXXXX XXX XXX XXXXX XXXXX XXXX XXXXXXXXXX
-              X XXXX XXX XXXXXX XXX XXXX XXXXXX XX XX XX XXXXX XXXX XXX XXX XXXX XXX
-              XXXXXX XXXXXXXXX XXX XXXXX XXXX XX XXXX XXXXXXXX XXXXXXXXX XXXXXXXXXX XXX
-              XXXXXXXXXX XXXXX XXXXXX XXXXXXXXXXXX XXXXXXXXXX XXXXX XX XXXXXXX XXX XXXXXX
-              XXXXXXXXXXX
-              XXXX
-            XXXX
-            XX XXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXX
-          XXXXXX
-          XXXX XXXXXXXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX
-          XXXXXX
-        XXXXXX
-      XXXXXX
-    XXXXXX
-    XXXX XXXXXXXXXXXXXXXX
-      XXXX XXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXX
-          XXXX XXXXXXXXXXXXXXXXXX
-            XXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXX XXXXXXXXXXXXX
-            XX XXXXXXXXXXXXXXXXXXXXX XXXXX XXXXX XXX XXXXXXXXXX XXXXXXXXXXXXX
-          XXXXXX
-        XXXXXX
-        XXXX XXXXXXXXXXXX
-          XXXX XXXXXXXXXXXXXXXXXX
-            XXXXXX XXXXXXXXXXXXXX
-              XXXXXXX
-                XXXX
-                  XXXXXXXXX
-                  XXXXXXX XXXXXXXXXXXXXXXX
-                  XXXXXXX XXXXXXXXXXXXXX
-                XXXXX
-              XXXXXXXX
-              XXXXXXX
-                XXXX
-                  XXXXXXXXXXXXXXXXX
-                  XXXXX XXXX XXX XXXXXXXXXXXXX
-                  XXXXX XXXX XXXX XXXX XXX XXXXXXXXXX
-                XXXXX
-                XXXX
-                  XXXXXXXX XXXXXXXX
-                  XXXXXXXXX XXX XXXXXX XXX XXX XX XXXXXXXXX
-                  XXXXXXXXXXX XXX XXXXXXXXX XXXX XXXXX XXXXXXXXXX
-                XXXXX
-                XXXX
-                  XXXXXXXXXXXXXX
-                  XXXXXXXXXXX XXXXX XXXXXXXXXX
-                  XXXXXXX XXXX XXX XXXXXXXXX
-                XXXXX
-                XXXX
-                  XXXXXXXXXXXXXX XXXXXXXXXX
-                  XXXXXXXXXXXXXXXXXXXX
-                  XXXXXXXXXXXXXXXXXXXX
-                XXXXX
-                XXXX
-                  XXXXXXXXX XXX XXXXXXXXXX XXXXXXXX
-                  XXXXXX XXXXXXXX
-                  XXXXXX XXXXXXXX
-                XXXXX
-              XXXXXXXX
-            XXXXXXXX
-          XXXXXX
-        XXXXXX
-      XXXXXX
-    XXXXXX
-    XXXXXXX XXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-      XXXX XXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXX
-          XXXX XXXXXXXXXXXXXXXXX
-            XXXXXXXXXXX XXXXXXXXXXX
-            XXXXX XXX XX X XXXX XXXXXXXXX
-              XXXXXXXXXXXXX X XXXXXXXX XXXX XXXXXXXX
-          XXXXXX
-          XXXX XXXXXXXXXXXXXXXXX
-            XX XXXXXXXXXXXXXXXX XXXXXXXXXXXX
-              XXXX
-              XXXX
-            XXXX
-            XXXX XXXXXXXXXXXX
-              XXXX XXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXX XXXXXXXXX XXXXXXXXXXX
-                XX XXXXXXXXXXX XXXXXXXXX XXXXX XXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-                XX XXXXXXXXXXX XXXXXXXXX XXXXX XXXXX XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-                XX XXXXXXXXXXX XXXXXXXXX XXXXX XXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-                XX XXXXXXXXXXX XXXXXXXXX XXXXX XXXXX XXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-              XXXXXX
-            XXXXXX
-            XXXX XXXXXXXXXXXX
-              XXXX XXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXX
-                XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXXXXXX
-                XX XXXXXXXXX XXXXX XXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXX
-                XX XXXXXXXXXXX XXXXXXXXX XXXXX XXXXX XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-                XX XXXXXXXXXXX XXXXXXXXX XXXXX XXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-                XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXXXXX
-                XX XXXXXXXXX XXXXX XXXXX XXXXXXXXX XXXXXXXXXXXXXXXXXX
-              XXXXXX
-            XXXXXX
-          XXXXXX
-        XXXXXX
-      XXXXXX
-    XXXXXXXXX
-  
-
-XXXXXXXXXXXXXX
\ No newline at end of file
diff --git a/non_django_but_related/design_membership/success.html.py b/non_django_but_related/design_membership/success.html.py
deleted file mode 100644
index ef91237a..00000000
--- a/non_django_but_related/design_membership/success.html.py
+++ /dev/null
@@ -1,26 +0,0 @@
-XXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-  XXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXX
-      XXXX XXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXX
-          XXXX XXXXXXXXXXXXXXXXXX
-            XXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXX
-          XXXXXX
-        XXXXXX
-        XXXX XXXXXXXXXXXX
-          XXXX XXXXXXXXXXXXXXXXXX
-            XX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXX XX XXXX XX XXXX XXXXXX
-              XXXXXXXXX XXXX XXXXX XX XXXXXXXX XXXX XXXXXXXXXXXX
-          XXXXXX
-        XXXXXX
-      XXXXXX
-    XXXXXX
-  
-
-XXXXXXXXXXXXXX
\ No newline at end of file
diff --git a/nosystemd/templates/nosystemd/base.html.py b/nosystemd/templates/nosystemd/base.html.py
deleted file mode 100644
index 28291a32..00000000
--- a/nosystemd/templates/nosystemd/base.html.py
+++ /dev/null
@@ -1,116 +0,0 @@
-BBBB BBBBBB BBBBBBBBBB BBBB
-XXXXXXXXX XXXXX
-XXXXX XXXXXXXXXX
-
-XXXXXX
-
-    XXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXX XXXXXXXXXXX
-
-    XXXXXXXXXXXXXXXXXXXXXXXX
-
-
-
-    XXXX XXXXXXXXX XXXX XXX XXX
-    XXXXX XXXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXXXXXXXXX
-
-    XXXX XXXXXX XXXXX XXX
-    XXXXX XXXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-
-    XXXX XXXXXX XXX XXX
-    XXXXX XXXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXXXXXXXXX
-
-    XXXX XXXXX XXX XXX
-    XXXXX XXXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXXXXXXXXX
-
-    XXXXX XXXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXXXXXXXXX
-
-
-    XXXX XXXXX XXXX XXX XXXXXXXXXX XXX XXXXXXX XX XXXXX XXXXXXXX XXX XXXXX XXXXXXX XXX
-    XXXX XXXXXXXX XXXXXXXXXX XXXXXXX XXXX XX XXX XXXX XXX XXXX XXX XXXXXXX XXX
-    XXXXXXX XX XX XXX
-        XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-        XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    XXXXXXXXXXXX
-
-XXXXXXX
-
-XXXXX XXXXXXXXXXXXXX    
-
-    XXXX XXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXXXXXXXXXXXXXX
-            XXXX XXXXX XXX XXXXXX XXX XXXXXXX XXX XXXXXX XXXXXX XXXXXXX XXX
-            XXXX XXXXXXXXXXXXXXXXXXXXXX
-                XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                    XXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXX XX XXXXXXXXX XXXXXXXXXXXXX
-                XXXXXXXXX
-                
-                 XX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXBBB BBBBBBBBBBBBBBBBBBBXXXX XXXX XXXXXXXXXXX
-            XXXXXX
-
-            XXXX XXXXXXX XXX XXX XXXXXX XXXXXX XXX XXXXX XXXXXXX XXX XXXXXXXX XXX
-            XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                XXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXXX
-XXXX                     XXXX
-                        XX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX
-                    XXXXX
-                    XXXX
-                        XX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                    XXXXX
-                    XXXX
-                        XX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXX
-                    XXXXX XXX
-                    BB BBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-                    XXXX
-                        XX XXXXXXBBB BBBBBBBBBBBBBBBBBBBBBXXXX XXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX  gettext('My Donations')  XXXX
-                    XXXXX
-                        XXX XXXXXXXXXXXXXXXXX
-                          XX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX
-                            XX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX  XXXXX XXXXXXXXXXXXXXXXXXXXXXXXX
-                          XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXX
-                            XXXXXX XXXXXXBBB BBBBBBBBBBBBBBBBBBXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX  gettext('Logout')  XXXXXXXXX
-                          XXXXX
-                        XXXXX              
-                    BBBB
-                        XXXX
-                            XX XXXXXXXXXXXXXXXXXXX XXXXXXBBB BBBBBBBBBBBBBBBBBXXXXXXXXXXX
-                        XXXXX 
-                    BBBBB
-                XXXXX
-            XXXXXX
-            XXXX XXXXXXXXXXXXXXXXX XXX
-        XXXXXX
-        XXXX XXXXXXXXXXXXXXXXX XXX
-    XXXXXX
-
-    BBBBB BBBBBBB
-    BBBBBBBB
-
-    XXXX XXXXXX XXX
-    XXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXX
-
-    XXXX XXXXXXXXX XXXX XXXXXXXXXX XXX
-    XXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXX
-
-    XXXX XXXXXX XXXXXXXXXX XXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    XXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXX
-    XXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXX
-
-    XXXX XXXXX XXXXXXXXXX XXX
-    XXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXX
-
-    XXXX XXXXXX XXX XXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-
-    XXXX XXXXXXXX XXXXXXX XXX XXX
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXX
-
-XXXXXXX
-
-XXXXXXX
\ No newline at end of file
diff --git a/nosystemd/templates/nosystemd/confirm_reset_password.html.py b/nosystemd/templates/nosystemd/confirm_reset_password.html.py
deleted file mode 100644
index be1617e8..00000000
--- a/nosystemd/templates/nosystemd/confirm_reset_password.html.py
+++ /dev/null
@@ -1,50 +0,0 @@
-BBBBBBB BBBBBBBBBBBBBBBBBBBBB
-BBBB BBBBBBBBBBB BBBBBBBBBB
-BBBB BBBB
-
-BBBBB BBBBBBB
-
-    XXXXXXXX
-        XXXX XXXXXXXXXXXXXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-
-                    XXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-                        XXXX XXXXXXXXXXXXXXXXXX
-                            XXXX XXXXXXXXXXXXXXXXX
-                                XXXX XXXXXXXXXXXXXXXXXXXXXX
-                                    BB BBBBBBBB
-                                        XXX XXXXXXXXXXXXXXXXXXXXXX
-                                        BBB BBBBBBB BB BBBBBBBB
-                                            XXXXXXXXX
-                                        BBBBBB
-                                        XXXXX
-                                    BBBBB
-
-                                    XXX  XXXXXXXXXXXXXXXXXXXXXXXX gettext('Set your new password') XXXXX
-
-                                    XXXXX XXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX
-                                        BBBBBBBBBB
-                                        BBB BBBBB BB BBBB
-                                            BBBBBBBBBBBBBBB BBBBB BBBBBBBBBBBBBBBB
-                                        BBBBBB
-                                        BBBBBBB
-                                            XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXX
-                                             gettext('Reset') 
-                                            XXXXXXXXX
-                                        BBBBBBBBBB
-                                    XXXXXXX
-                                    XXXXXX gettext('Already have an account ?') XX XXXXXXXXXXXXXX XXXXXXBBB BBBBBBBBBBBBBBBXX gettext('Log in') XXXXXXXXXXX
-                                    XXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-                                    XXXXX
-                              XXXXXX
-                            XXXXXX
-                        XXXXXX
-                    XXXXXX
-
-                XXXXXX
-            XXXXXX
-        XXXXXX
-    XXXXXXXXX
-
-BBBBBBBB
\ No newline at end of file
diff --git a/nosystemd/templates/nosystemd/donation.html.py b/nosystemd/templates/nosystemd/donation.html.py
deleted file mode 100644
index f43227a5..00000000
--- a/nosystemd/templates/nosystemd/donation.html.py
+++ /dev/null
@@ -1,131 +0,0 @@
-BBBBBBB BBBBBBBBBBBBBBBBBBBBB
-BBBB BBBBBBBBBBB BBBBBBBBBB
-BBBBB BBBBBBB 
-XXXX XXXXXX XXXX XXXX XXX
-
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXXXXXXXXXXX XX
-        	XXXX XXXXXXXXXXXXXXXXXXXXXXXXXXX XX
-
-				XXXX XXXXXXXXXXXXXXXXXX
-					XXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXXX
-						XXXX XXXXXXXXXXXX
-							XXXX XXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXX X
-								XXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-								XXXX
-								XXXX XXXXX XXXXXXXXXXX XXXXXXXXXXX XXX
-			                        XXXX XXXXXXXXXXXX
-			                            XXXX XXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXX
-											XXXX XXXXXXXXXXXXXXXXXXX
-													BBBBBBBBBBBBBBB BBBBBBBBBBBBBBBBBBBB BBBBBBBBBBBBBBBB BBBBBBBBBBBBB
-													XXXX XXXXXX  XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XX XXXXXXX  XXXXXXXXXXXXXXX XX XXX
-											XXXXXX
-										XXXXXX
-									XXXXXX
-								XXXX XXXXXXX XXX
-							XXXXXX
-						XXXXXX
-						XXXX XXXXXXXXXXXX
-							XXXX XXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXX
-								XXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-								XXXX
-				                BBB BBBBB BB BBBB
-			                        BBBBBBBBBB
-
-			                        BB BBB BBBBBBBBBB BB BBBBBBBBBBBBBBBBB
-				                    	BBBBBBBBBBBBBBB BBBBB BBBBBBBBBBBBBBBB BBBBBBBBBBBBB
-				                    BBBBB
-				                BBBBBB
-				                BBBBBBBBBBBBBBBBBBBBB BBBB BBBBBBBBBBBBBBBBB
-				                
-							XXXXXX
-						XXXXXX
-					XXXXXXX
-				    XXXX XXXXXXXXXXXX
-				        XXXX XXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-							XXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-							XXXX
-				            XXXXX
-				                XXXXX
-				                    XXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXX
-				                        XXXX XXXXXXXXXXXX
-				                            XXXX XXXXXXXXXXXXXXX XXXXXXXXXXX
-				                                XXXX XXXXXXXXXXXXXXXXXXX
-				                                    XXXX XXXXXXXXXXXXXXXXXXXX
-				                                        XXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX XX XXXXX XXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXXXX XX
-				                                        XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-				                                    XXXXXX
-				                                XXXXXX                            
-				                            XXXXXX
-				                        XXXXXX
-				                        XXXX XXXXXXXXXXXX
-				                            XXXX XXXXXXXXXXXXXXX XXXXXXXXXXX
-				                                XXXX XXXXXXXXXXXXXXXXXXX
-				                                    XXXX XXXXXXXXXXXXXXXXXXXX
-				                                        XXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX XXXX XXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXXXX XX
-				                                        XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXX
-				                                    XXXXXX
-				                                XXXXXX                            
-				                            XXXXXX
-				                        XXXXXX
-				                        XXXX XXXXXXXXXXXX
-				                            XXXX XXXXXXXXXXXXXXX XXXXXXXXXX
-				                                XXXX XXXXXXXXXXXXXXXXXXX
-				                                    XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-				                                    XXXX XXXXXXXXXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXXX
-				                                        XXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XX
-				                                    XXXXXX
-				                                    XXXX XXXXXXXXXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXXX
-				                                        XXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XX
-				                                    XXXXXX
-				                                XXXXXX
-				                            XXXXXX
-				                            XXXX XXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXX
-				                                XXXX XXXXXXXXXXXXXXXXXXX
-				                                    XXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXX
-				                                    XXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXX XX
-				                                XXXXXX
-				                            XXXXXX
-				                        XXXXXX
-				                        XXXX XXXXXXXXXXXX
-				                            XXXX XXXXXXXXXXXXXXXXXX
-				                                XXXXXXX XXXXXXXXXX XXXXXXXXXXX XXXXXX XXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-				                            XXXXXX
-				                        XXXXXX
-				                        XXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-				                            XXXX XXXXXXXXXXXXXXXXXX
-				                                XX XXXXXXXXXXXXXXXXXXXXXXXXXXX
-				                            XXXXXX
-				                        XXXXXX
-				                        BB BBBBBBBBBBBB
-				                        XXXX XXXXXXXXXXXX
-				                            XXXX XXXXXXXXXXXXXXXXXX
-				                            	XXX
-				                             	BBBBBBBBBBBBBBB BBBBBBBBBBBB BBBBBBBBBBBBBBBBBBB
-				                             	XXXX
-				                            XXXXXX
-				                        XXXXXX
-				                        BBBBB
-
-				                    XXXXXXX
-				                XXXXXX
-				            XXXXXX
-				        XXXXXX
-				    XXXXXX
-				XXXXXX
-	    	XXXXXX
-    	XXXXXX
-    XXXXXXXXX
-
-XXXX XXXXXX XXX XXXX XXX
-BB BBBBBBBBBB
-XXXXXXX XXXXXXXXXXXXXXXXXXXXXXX 
-     XXXXXXXXX XX XXXXXXXXXXXXXXXXX X XXXXXXXX
-XXXXXXXXX
-BBBBB
-
-BBBBBBBB
-
-
-
-
diff --git a/nosystemd/templates/nosystemd/donation_detail.html.py b/nosystemd/templates/nosystemd/donation_detail.html.py
deleted file mode 100644
index 31b34b54..00000000
--- a/nosystemd/templates/nosystemd/donation_detail.html.py
+++ /dev/null
@@ -1,84 +0,0 @@
-BBBBBBB BBBBBBBBBBBBBBBBBBBBB
-BBBB BBBBBBBBBBB BBBBBBBBBB
-BBBB BBBB
-BBBBB BBBBBBB 
-
-    XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-
-
-                XXXX XXXXXXXXXXXXXXXX XX
-                    XXXX XXXXXXXXXXXX
-                        XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-                    		XXXX XXXXXXXXXXXXXXXXXXXXXX
-                    			XXXX gettext('Invoice') XXXXXXXX XXXXXXXXXXXXXXXXXXX gettext('Donation #')  XXXXX
-                    		XXXXXX
-                    		XXXX XXXXXXXXXXXX
-                    			XXXX XXXXXXXXXXXXXXXXX
-                    				XXXXXXXXX
-                                    XXXXXXX gettext('Billing Address:') XXXXXXXXX
-                    					XXXX
-                                        XXXXX
-                                        X X
-                    				XXXXXXXXXX
-                    			XXXXXX
-                                XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXX
-                                    XXXXXXXXX
-                                        XXXXXXXX gettext('Date:') XXXXXXXXXXXXX
-                                        XXXXXXXX
-                                        XXXXXXXX
-                                    XXXXXXXXXX
-
-                                XXXXXX
-                    		XXXXXX
-                    		XXXX XXXXXXXXXXXX
-                    			XXXX XXXXXXXXXXXXXXXXX
-                    				XXXXXXXXX
-                    					XXXXXXXX gettext('Payment Method:') XXXXXXXXXXXXX
-                    					 XXXXXX XXXX XXXX
-                    					
-                    				XXXXXXXXXX
-                    			XXXXXX
-                    		XXXXXX
-                    	XXXXXX
-                    XXXXXX
-                    
-                    XXXX XXXXXXXXXXXX
-                        XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-                            XXXXXXX gettext('Donation summary') XXXXXXXXX
-                            XXXX
-                            XXXX XXXXXXXXXXXXXXXX
-                                XXX gettext('Donation') XFFFFFFF FFXXXX XXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXX
-                                XXXX
-                                XXXX gettext('Total') XX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXX
-                            XXXXXX
-                            XXXXX
-                            BBB BBBBBBBBBBBBBBBBB BB BBBBBBBBBBB
-                            BB BBBBBBBBBBB BB BBBBBBBBBBBBBBBBBBBBBBBBB
-                            XXXX XXXXXXX XXXXXXX XXXXXXXXXXXX
-                                XX XXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBBBBBBBBX XXXXXXXX XXXXXXXXXX XXXXXXXXXX gettext('Finish Configuration') XXXXXXXXXXXXX
-                            XXXXXX
-                            BBBBB
-                        XXXXXX
-                    XXXXXX
-                    XXXX XXXXXXXXXXXX
-                        XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-                            XXXX
-                             gettext('Thanks for you donation, you can cancel your monthly donation at any time going to profile > subscription ') 
-                        XXXXXX
-                    XXXXXX
-                    XXXX XXXXXXXXXXXX
-                        XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-                            XXXX XXXXXXX XXXXXXX XXXXXXXXXXXX
-                                XX XXXXXXBBB BBBBBBBBBBBBBBBBBBBBBX XXXXXXXX XXXXXXXXXX XXXXXXXXXX gettext('View Donations') XXXXXXXXXXXXX
-                            XXXXXX
-                        XXXXXX
-                    XXXXXX
-                XXXXXX
-
-
-        XXXXXX
-    XXXXXX
-XXXXXXXXX
-BBBBBBBB
diff --git a/nosystemd/templates/nosystemd/donations.html.py b/nosystemd/templates/nosystemd/donations.html.py
deleted file mode 100644
index 1793fa52..00000000
--- a/nosystemd/templates/nosystemd/donations.html.py
+++ /dev/null
@@ -1,91 +0,0 @@
-BBBBBBB BBBBBBBBBBBBBBBBBBBBB
-BBBB BBBBBBBBBBB BBBBBBBBBB BBBB
-
-BBBBB BBBBBBB
-    XXXXXXXX
-        XXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-                    XXXX XXXXXXXXXXXXXXXXXXXXXXX
-                        
-                        BB BBBBBBBB
-                            XXX XXXXXXXXXXXXXXXXXXXXXX
-                            BBB BBBBBBB BB BBBBBBBB
-                                XXXXXXXXX
-                            BBBBBB
-                            XXXXX
-                        BBBBB
-
-                    XXXXXX
-
-                    BB BBBBBBBBBBBBBB
-                        BB BBBBBBBBBBBBBBBBBBBBB BB BBBBBBBB
-                            XXXXX XXXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBBBBBBBBBX XXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX
-                                BBBBBBBBBB
-                                XXXXX
-                                    XXXXXXXX XXXXXXX XXXXXXXX XXXXXX XX 
-                                        XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXX
-                                             gettext('Cancel Donation') 
-                                        XXXXXXXXX
-                                    XXXXX
-                                XXXXXX
-                            XXXXXXX
-                        BBBB
-                            XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXX
-                                XX XXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBXX gettext('Donate') XXXX
-                            XXXXXXXXX
-                        BBBBB
-
-                    BBBBB
-                XXXXXX
-
-                XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-                    XXXXXX XXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXX
-                        XXXXXX XXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX  gettext('Donations Made') XXXXX
-                        XXXXX
-                        XXXXXXX
-                        XXXX
-                            XXXXXXXXXX
-                            XXXX gettext('Donation') XXXXX
-                            XXXX gettext('Date') XXXXX
-                            XXXXXXXXX
-                        XXXXX
-                        XXXXXXXX
-                        XXXXXXX
-                        BBB BBBBBBBB BB BBBBBBBBB
-                            XXXX
-                                XXX XXXXXXXXXXXXXXXXX
-                                XXXX XXXXXXXX
-                                XXXXFFFFFFF FFXXXXX
-                                XXXX
-                                    XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXXXX
-                                            XXXXXXBBB BBBBBBBBBBBBBBBBBBBBB BBBBBBBBBBBXX gettext('View Detail') XXXX
-                                    XXXXXXXXX
-                                XXXXX
-                            XXXXX
-                        BBBBBB
-                        XXXXXXXX
-                    XXXXXXXX
-
-                    BB BBBBBBBBBBBB
-                        XXXX XXXXXXXXXXXXXXXXXXX
-                        XXXXX XXXXXXXXXXXXXXXXXXX
-                            BB BBBBBBBBBBBBBBBBBBBBB
-                                XX XXXXXXXXXXXXXX gettext('previous') XXXX
-                            BBBBB
-                            XXXXX XXXXXXXXXXXXXXXXXXXXX
-                                XXXX  XX X
-                            XXXXXXX
-                            BB BBBBBBBBBBBBBBBBB
-                                XX XXXXXXXXXXXXXX gettext('next') XXXX
-                            BBBBB
-                        XXXXXXX
-                        XXXXXX
-                    BBBBB
-
-                XXXXXX
-            XXXXXX
-        XXXXXX
-    XXXXXXXXX
-
-BBBBBBBB
\ No newline at end of file
diff --git a/nosystemd/templates/nosystemd/donator_status.html.py b/nosystemd/templates/nosystemd/donator_status.html.py
deleted file mode 100644
index 406cac70..00000000
--- a/nosystemd/templates/nosystemd/donator_status.html.py
+++ /dev/null
@@ -1,40 +0,0 @@
-BBBBBBB BBBBBBBBBBBBBBBBBBBBB
-BBBB BBBBBBBBBBB BBBBBBBBBB BBBB
-BBBBB BBBBBBB
-
-    XXXXXXXX
-        XXXX XXXXXXXXXXXXXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-
-
-                    BB BBBBBBBB
-                        XXX XXXXXXXXXXXXXXXXXXXXXX
-                        BBB BBBBBBB BB BBBBBBBB
-                            XXXXXXXXX
-                        BBBBBB
-                        XXXXX
-                    BBBBB
-
-                    XXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXX
-                    XXXX
-                    XXXXXXX XXXXXXX XXXXXXXX XXXXXX XX XXXX
-                    XXXXX XXXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBBBBBBBBBX XXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX
-                        BBBBBBBBBB
-                        XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXX XXXXXX XXXXXXXXXXXXX
-                            BB BBBBBBBBBBBBBBBBBBBBB BB BBBBBBBB
-                                 gettext('Cancel Donation') 
-                            BBBB
-                                 gettext('Reanude Donation') 
-                            BBBBB
-                            
-                        XXXXXXXXX
-                    XXXXXXX
-                    XXXXX
-
-                XXXXXX
-            XXXXXX
-        XXXXXX
-    XXXXXXXXX
-
-BBBBBBBB
\ No newline at end of file
diff --git a/nosystemd/templates/nosystemd/emails/donation_charge.html.py b/nosystemd/templates/nosystemd/emails/donation_charge.html.py
deleted file mode 100644
index 8845f4fe..00000000
--- a/nosystemd/templates/nosystemd/emails/donation_charge.html.py
+++ /dev/null
@@ -1,136 +0,0 @@
-BBBB BBBBBB BBBB BBBBBBBBBBB
-XXXX XXXXXXX XXXXX XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXX
-XXXXXXXXX XXXX XXXXXX XXXXXXXXXXXX XXXX XXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-XXXXXX
-XXXXX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX
-XXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXX XXXXXXXXXXXXXXX
-XXXXXXX
-XXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXX XXXXXX XXXX XXXXXXXXXXX XXXXXXX XXXXX XXXXXX XXXXXX XXXXXXX XXXX
-XXXXXX XXXXXXXXXXXXXXXX
-XXXXXX XXXX XXXXXX XXX XXXXXXXXXXX XXXXXX X
-  XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X
-    XXXXXXXXXX XXXXX XXXXXXXXXXX XXXXXX XXXX XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X
-    XXXXXXXX XXXX XXXXXXXXXXX XXXXXX X XXXXXXXXXXX XXXXXXX X XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXXX X
-    XXXXXX XXXXX XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X
-    XXXXXX XXXXX XXXXXXXXXXX XXXXXXXXXXXXX X XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X
-    XXXXXX XXXXX XXXXXXXXXXX XXXXXXXXXXXXXX X XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXXXXX X
-    XXXXXXXXXX XXXX XXXXXXXXXXX XXXXXXXXXXXXXXX XXX XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXXXXXXXXXXX X
-    XXXXXXXX XXX X XXX XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXX X
-    XXXXXXXX XXX XXX XXXX XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXXXXXX X
-    XXXXXXXX XXXX XXXX XXXX XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXXXXXXXXXXXX X
-    XXXXXXXX XXXX XXXXXXXXXXX XXXXXXX X XXXXXXXXXXX XXXXXX X XXXXXXXXXXX XXXXXXXXXXXX X XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXX X
-    XXXXXX XXXXX XXXXXXXXXXX XXXXXXXXXXXXXXX XXX XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXXXXX X
-    XXXXXX XXXX XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXX X
-    XXXXXX XXXX XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXXXXXX X
-    XXXXXXXX XXXX XXXX XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X
-    XXXXXXXX X XXXX XXXX XXXXXXXXXXX XXXXXXXX XXXXX XXXXXXXXXXX XXXXXX XXXXX XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X
-    XXXXXXXX X XXXX XXXX XXXXXXXXXXX XXXXXXXX XXXXX XXXXXXXXXXX XXXXXX XXXXX XXXXXXXXXXX
-  X
-X
-XXXXXXXX
-XXXXXX XXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-XXX XXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXX XXXXX XXXXXX XXXXXXXX XXXXXXXXXXX XXXXXXX XXXXXXXXXXXX XXXXX XXXXXXXXXXX XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXXXXXXX
-      XXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-      XXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-XXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXX XXXXXXX XXXXXXXXXXXXXXX XXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXX XXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXX XXXXXXXXXXXXXXX
-            XXXXXXX XXX XXX XXX
-            XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX
-              XXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XX
-              XXXXXXXXXX XXXXXXXXXXXXXXXX
-            XXXXXXXXXXXX
-              XXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-                XXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-XXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXX XXXXX XXXXXX XXXXXXXX XXXXXXXXXXX XXXXX XXXXXXXXXXXX XXXXX XXXXXX XXXXXX XXXXXXXXXXXXX XXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXX
-                      XX XXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXXXXXX XXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXX XXXXXXXX XXXXX XXXXXXXXXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXX XXXXXXXXXXX
-                    XXXXX
-                    XXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXX XXXXX XXXXXXXXXXX XXXXXX XXXXXXXXXXXX XXXXX XXXXXX XXXXXX XXXXXXXXXXXXX XXXXXX XXXXXXXXXXXXXX
-                    XXXXX
-                  XXXXXXXXXXXXX
-XXXXXXXXX
-              XXXXXXX XXX XXX XXX
-              XXXXXXXXXXXX
-            XXXXXXXXX
-            XXXXXXXXXXXX
-            XXXXX
-          XXXXXXXXXXXXX
-XXXXXXXXX
-    XXXXX
-  XXXXX
-XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-XXX XXXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXX XXXXX XXXXXX XXXXXXXX XXXXXXXXXXX XXXXXXX XXXXXXXXXXXX XXXXX XXXXXXXXXXX XXXXXXXX XXXXXXXX XXXX X XXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX
-      XXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-        XXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-XXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXX XXXXX XXXXXX XXXXXXXX XXXXXXXXXXX XXXXXXX XXXXXXXXXXXX XXXXXXX XXXXXXXXXXXX XXXX XXXXXXXX XXXX X XXX XXXXXXXXXXXXXXX
-              XXXXX XXX XXX XXXX XXXXXXXX
-            XXXXX
-          XXXXX
-XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-XXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXX XXXXX XXXXXX XXXXXXXX XXXXXXXXXXX XXXXXXX XXXXXXXXXXXX XXXXX XXXXXX XXXX XXXXXXXXXXX XXXXXXXX XXXX XXXX XXXXX XXXXXXXXXXXXXXX
-             XXXX XXXXXXX XXXXXXXX XXX  XXX XXX XXXX XXXXXXXX XXXXX XXX XXX XXXX XXXX XXXXXXX XXXXXXXX XX XXX XXXXXX XXXXXX 
-            XXXXX
-          XXXXX
-XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-XXX XXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXX XXXXX XXXXXX XXXXXXXX XXXXXXXXXXX XXXXXXX XXXXXXXXXXXX XXXXX XXXXXXXX XXXX XXX XXXXXXXXXXXXXXX
-              XXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-XXXXXXX XXXXX
-                XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX
-                  XXXXXXXXXXXXXXX
-                  XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-                XXXXXXXXXXXXXX
-              XXXXXXXXXXXXXX XXXXXXBBB BBBBBBBBBBBBBBBBBBBBB BBBBBBBBBBBX XXXXXXXXXXXXXXXXXXXXX XXXX XXXXXX XXXXXXXX XXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXX XXXXX XXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXX XXXXX XXXXXXXXXXX XXXXXXX XXXXXXXXXXXXXXXX XXXX XXXXXXXXXXX XXXXXX XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXX XXXXXXXXX XXXX XXXXXXXXXXX XXXXXXXXXXXXXX XXXXXXXXXXX
-XXXXXX
-            XXXXX
-          XXXXX
-XXXXXXXX
-XXXXXXXXX
-    XXXXX
-  XXXXX
-XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-XXX XXXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXX XXXXXX XXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXX XXXXX XXXXXX XXXXXXXX XXXXXXXXXXX XXXXXXX XXXXXXXXXXXX XXXXX XXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXXXX
-      XXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-        XXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-XXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXX XXXXX XXXXXX XXXXXXXX XXXXXXXXXXX XXXXXXX XXXXXXXXXXXX XXXXX XXXXXXXX XXXX XXX XXXXXXXXXXXXXXX
-              XXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-XXXXX
-          XXXXXXXXXXXXX
-XXXXXXXXX
-    XXXXX
-  XXXXX
-XXXXXXXX
-XXXXXXX
-XXXXXXX
-
diff --git a/nosystemd/templates/nosystemd/emails/donation_charge.txt.py b/nosystemd/templates/nosystemd/emails/donation_charge.txt.py
deleted file mode 100644
index 5a8925f7..00000000
--- a/nosystemd/templates/nosystemd/emails/donation_charge.txt.py
+++ /dev/null
@@ -1,136 +0,0 @@
-BBBB BBBBBB BBBB BBBBBBBBBBB
-XXXX XXXXXXX XXXXX XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXX
-XXXXXXXXX XXXX XXXXXX XXXXXXXXXXXX XXXX XXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-XXXXXX
-XXXXX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX
-XXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXX XXXXXXXXXXXXXXX
-XXXXXXX
-XXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXX XXXXXX XXXX XXXXXXXXXXX XXXXXXX XXXXX XXXXXX XXXXXX XXXXXXX XXXX
-XXXXXX XXXXXXXXXXXXXXXX
-XXXXXX XXXX XXXXXX XXX XXXXXXXXXXX XXXXXX X
-  XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X
-    XXXXXXXXXX XXXXX XXXXXXXXXXX XXXXXX XXXX XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X
-    XXXXXXXX XXXX XXXXXXXXXXX XXXXXX X XXXXXXXXXXX XXXXXXX X XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXXX X
-    XXXXXX XXXXX XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X
-    XXXXXX XXXXX XXXXXXXXXXX XXXXXXXXXXXXX X XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X
-    XXXXXX XXXXX XXXXXXXXXXX XXXXXXXXXXXXXX X XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXXXXX X
-    XXXXXXXXXX XXXX XXXXXXXXXXX XXXXXXXXXXXXXXX XXX XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXXXXXXXXXXX X
-    XXXXXXXX XXX X XXX XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXX X
-    XXXXXXXX XXX XXX XXXX XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXXXXXX X
-    XXXXXXXX XXXX XXXX XXXX XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXXXXXXXXXXXX X
-    XXXXXXXX XXXX XXXXXXXXXXX XXXXXXX X XXXXXXXXXXX XXXXXX X XXXXXXXXXXX XXXXXXXXXXXX X XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXX X
-    XXXXXX XXXXX XXXXXXXXXXX XXXXXXXXXXXXXXX XXX XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXXXXX X
-    XXXXXX XXXX XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXX X
-    XXXXXX XXXX XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXXXXXX X
-    XXXXXXXX XXXX XXXX XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X
-    XXXXXXXX X XXXX XXXX XXXXXXXXXXX XXXXXXXX XXXXX XXXXXXXXXXX XXXXXX XXXXX XXXXXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X
-    XXXXXXXX X XXXX XXXX XXXXXXXXXXX XXXXXXXX XXXXX XXXXXXXXXXX XXXXXX XXXXX XXXXXXXXXXX
-  X
-X
-XXXXXXXX
-XXXXXX XXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-XXX XXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXX XXXXX XXXXXX XXXXXXXX XXXXXXXXXXX XXXXXXX XXXXXXXXXXXX XXXXX XXXXXXXXXXX XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXXXXXXX
-      XXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-      XXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-XXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXX XXXXXXX XXXXXXXXXXXXXXX XXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXX XXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXX XXXXXXXXXXXXXXX
-            XXXXXXX XXX XXX XXX
-            XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX
-              XXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XX
-              XXXXXXXXXX XXXXXXXXXXXXXXXX
-            XXXXXXXXXXXX
-              XXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-                XXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-XXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXX XXXXX XXXXXX XXXXXXXX XXXXXXXXXXX XXXXX XXXXXXXXXXXX XXXXX XXXXXX XXXXXX XXXXXXXXXXXXX XXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXX
-                      XX XXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXXXXXX XXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXX XXXXXXXX XXXXX XXXXXXXXXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXX XXXXXXXXXXX
-                    XXXXX
-                    XXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXX XXXXX XXXXXXXXXXX XXXXXX XXXXXXXXXXXX XXXXX XXXXXX XXXXXX XXXXXXXXXXXXX XXXXXX XXXXXXXXXXXXXX
-                    XXXXX
-                  XXXXXXXXXXXXX
-XXXXXXXXX
-              XXXXXXX XXX XXX XXX
-              XXXXXXXXXXXX
-            XXXXXXXXX
-            XXXXXXXXXXXX
-            XXXXX
-          XXXXXXXXXXXXX
-XXXXXXXXX
-    XXXXX
-  XXXXX
-XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-XXX XXXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXX XXXXX XXXXXX XXXXXXXX XXXXXXXXXXX XXXXXXX XXXXXXXXXXXX XXXXX XXXXXXXXXXX XXXXXXXX XXXXXXXX XXXX X XXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX
-      XXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-        XXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-XXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXX XXXXX XXXXXX XXXXXXXX XXXXXXXXXXX XXXXXXX XXXXXXXXXXXX XXXXXXX XXXXXXXXXXXX XXXX XXXXXXXX XXXX X XXX XXXXXXXXXXXXXXX
-              XXXXX XXX XXX XXX XXXXXXXX
-            XXXXX
-          XXXXX
-XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-XXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXX XXXXX XXXXXX XXXXXXXX XXXXXXXXXXX XXXXXXX XXXXXXXXXXXX XXXXX XXXXXX XXXX XXXXXXXXXXX XXXXXXXX XXXX XXXX XXXXX XXXXXXXXXXXXXXX
-             XXXX XXXXXXX XXXXXXXX XXX  XXX XXXX XXXXXXXX XXXXX XXX XXX XXXX XXXXXXXX XXXXX XXX XXX XXXX XXXX XXXXXXX XXXXXXXX XX XXX XXXXXX XXXXXX 
-            XXXXX
-          XXXXX
-XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-XXX XXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXX XXXXX XXXXXX XXXXXXXX XXXXXXXXXXX XXXXXXX XXXXXXXXXXXX XXXXX XXXXXXXX XXXX XXX XXXXXXXXXXXXXXX
-              XXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-XXXXXXX XXXXX
-                XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX
-                  XXXXXXXXXXXXXXX
-                  XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-                XXXXXXXXXXXXXX
-              XXXXXXXXXXXXXX XXXXXXBBB BBBBBBBBBBBBBBBBBBBBB BBBBBBBBBBBX XXXXXXXXXXXXXXXXXXXXX XXXX XXXXXX XXXXXXXX XXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXX XXXXX XXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXX XXXXX XXXXXXXXXXX XXXXXXX XXXXXXXXXXXXXXXX XXXX XXXXXXXXXXX XXXXXX XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXX XXXXXXXXX XXXX XXXXXXXXXXX XXXXXXXXXXXXXX XXXXXXXXXXX
-XXXXXX
-            XXXXX
-          XXXXX
-XXXXXXXX
-XXXXXXXXX
-    XXXXX
-  XXXXX
-XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-XXX XXXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXX XXXXXX XXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXX XXXXX XXXXXX XXXXXXXX XXXXXXXXXXX XXXXXXX XXXXXXXXXXXX XXXXX XXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXXXX
-      XXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-        XXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-XXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXX XXXXX XXXXXX XXXXXXXX XXXXXXXXXXX XXXXXXX XXXXXXXXXXXX XXXXX XXXXXXXX XXXX XXX XXXXXXXXXXXXXXX
-              XXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXX XXXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXX
-XXXXX
-          XXXXXXXXXXXXX
-XXXXXXXXX
-    XXXXX
-  XXXXX
-XXXXXXXX
-XXXXXXX
-XXXXXXX
-
diff --git a/nosystemd/templates/nosystemd/emails/password_reset_email.html.py b/nosystemd/templates/nosystemd/emails/password_reset_email.html.py
deleted file mode 100644
index db60b516..00000000
--- a/nosystemd/templates/nosystemd/emails/password_reset_email.html.py
+++ /dev/null
@@ -1,13 +0,0 @@
-BBBB BBBBBBBBBBBBBB BBB
- gettext("You're receiving this email because you requested a password reset for your user account at %(site_name)s.") SSSSSS SSSSSSSSS SSSS SSSSS SSSSSSS SSS SSSSSSSSS S SSSSSSSS SSSSS SSS SSSS SSSS SSSSSSS SS SSSSSSSSSSSSSS
-
- gettext('Please go to the following page and choose a new password:') 
-    BBBBB BBBBBBBBBB
-        BBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBB BBBBBBBBBBB 
-    BBBBBBBB
-
- gettext('Thanks for using our site!') 
-
- gettext('The %(site_name)s team') SSS SSSSSSSSSSSSS SSSS
-
-BBBBBBBBBBBBB
\ No newline at end of file
diff --git a/nosystemd/templates/nosystemd/emails/password_reset_email.txt.py b/nosystemd/templates/nosystemd/emails/password_reset_email.txt.py
deleted file mode 100644
index db60b516..00000000
--- a/nosystemd/templates/nosystemd/emails/password_reset_email.txt.py
+++ /dev/null
@@ -1,13 +0,0 @@
-BBBB BBBBBBBBBBBBBB BBB
- gettext("You're receiving this email because you requested a password reset for your user account at %(site_name)s.") SSSSSS SSSSSSSSS SSSS SSSSS SSSSSSS SSS SSSSSSSSS S SSSSSSSS SSSSS SSS SSSS SSSS SSSSSSS SS SSSSSSSSSSSSSS
-
- gettext('Please go to the following page and choose a new password:') 
-    BBBBB BBBBBBBBBB
-        BBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBB BBBBBBBBBBB 
-    BBBBBBBB
-
- gettext('Thanks for using our site!') 
-
- gettext('The %(site_name)s team') SSS SSSSSSSSSSSSS SSSS
-
-BBBBBBBBBBBBB
\ No newline at end of file
diff --git a/nosystemd/templates/nosystemd/landing.html.py b/nosystemd/templates/nosystemd/landing.html.py
deleted file mode 100644
index ed78a981..00000000
--- a/nosystemd/templates/nosystemd/landing.html.py
+++ /dev/null
@@ -1,105 +0,0 @@
-BBBBBBB BBBBBBBBBBBBBBBBBBBBB
-BBBB BBBBBBBBBBB BBBBBBBBBB BBBB
-BBBBB BBBBBBB
-
-    XXXXXXXX
-        XXXX XXXXXXXXXXXXXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                XXX XXXXXXXXXXXXXXXXXXX XXXX XXXXXXXXXXXX
-                XXXX
-                XXXXX XXXX XX XXXXXX XXXXXXX XXXX XXX XXXXXX XXXXX XXXXXXX XXX XXXXXX X XXXX XXXXXXXXXXXXXXX
-                BB BBBBBBBBBBBBBB
-                XX XXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXX XXXXXXXXXXX XXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXX
-                BBBBB
-                XXXXXX XXXX XXXXXXXXX XXXXXXX XXXXXXXXXXXXXXXXXXXX X XXXXXXXXXXXX  XX XXXXX XXXXXX XXX XXXXXXXXX
-                XXXXXXX
-            XXXXXX
-        XXXXXX
-    XXXXXXXXX
-
-XXXX     XXXXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXX
-        XXXX XXXXXXXXXXXXXXXXXX
-            XXXX XXXXXXXXXXXX
-                XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXX
-                    XXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXX
-                    XXX XXXXXXXXXXXXXX
-                    XX XXXXXXXXXXXXXXXXXXXXXXXX XXXXX XX XXXXXX XXXXX XXXX XX XXX XXXXXXXX XXX XXXXXXXXXXX XXXXXXXXX XXXXX XXXXX XXX XXXX XXX XXXXXXXXXX XXXXXXXX XXXXX XXXX XXXX XXXXX XXX XXXXXX XXXX XX XXXXXXX XXXXXXX XXXX X XXXXXX XX XXXX XXX XXXXXXXXX XX XX XXXX X XXXX XXXXXXXX XXXXXXXXX
-                    XX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX XXX XXXXXXXXXXX XXXXXX XXXXXXXXXXXXXX XXXXXXXXXXXX
-                XXXXXX
-            XXXXXX
-        XXXXXX
-    XXXXXXXXXX
-
-    XXXXXXXX XXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXXXXXXXX
-            XXXX XXXXXXXXXXXX
-                XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-                    XXX XXXXXXXXXXXXXXXXXXXXXXXXXX XXXX XXXXXXXXXXXX
-                    XXX XXXXXXXXXXXXXXXX
-                XXXXXX
-            XXXXXX
-        XXXXXX
-        XXXX XXXXXXXXXXXXXXXXXX
-            XXXX XXXXXXXXXXXX
-                XXXX XXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXX
-                    XXXX XXXXXXXXXXXXXXXXXXXX
-                        XX XXXXXXXXX XXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXX
-                        XXXXXXXXX XXXXXXXXXX
-                        XX XXXXXXXXXXXXXXXXXXXXXXXX XXXXX XX XXXXXX XXXXX XXXX XX XXX XXXXXXXX XXX XXXXXXXXXXX XXXXXXXXXXXXX
-                    XXXXXX
-                XXXXXX
-                XXXX XXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXX
-                    XXXX XXXXXXXXXXXXXXXXXXXX
-                        XX XXXXXXXXX XXXXX XXXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXX
-                        XXXXXXXXX XXXXXXXXXX
-                        XX XXXXXXXXXXXXXXXXXXXXXXXX XXXXX XX XXXXXX XXXXX XXXX XX XXX XXXXXXXX XXX XXXXXXXXXXX XXXXXXXXXXXXX
-                    XXXXXX
-                XXXXXX
-                XXXX XXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXX
-                    XXXX XXXXXXXXXXXXXXXXXXXX
-                        XX XXXXXXXXX XXXXX XXXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXX
-                        XXXXXXXXX XXXXXXXXXX
-                        XX XXXXXXXXXXXXXXXXXXXXXXXX XXXXX XX XXXXXX XXXXX XXXX XX XXX XXXXXXXX XXX XXXXXXXXXXX XXXXXXXXXXXXX
-                    XXXXXX
-                XXXXXX
-                XXXX XXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXX
-                    XXXX XXXXXXXXXXXXXXXXXXXX
-                        XX XXXXXXXXX XXXXX XXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXX
-                        XXXXXXXXX XXXXXXXXXX
-                        XX XXXXXXXXXXXXXXXXXXXXXXXX XXXXX XX XXXXXX XXXXX XXXX XX XXX XXXXXXXX XXX XXXXXXXXXXX XXXXXXXXXXXXX
-                    XXXXXX
-                XXXXXX
-            XXXXXX
-        XXXXXX
-    XXXXXXXXXX
-
-    XXXXXX XXXXXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXXXXXXXXX
-                XXXXXXXX XXXXXXXX XX XXXXX XXXXXXXXXXXXXXX
-                XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXX XXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXX
-            XXXXXX
-        XXXXXX
-    XXXXXXXX
-
-    XXXXXXXX XXXXXXXXXXXXX
-        XXXX XXXXXXXXXXXXXXXXXX
-            XXXX XXXXXXXXXXXX
-                XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXX
-                    XXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXX XX XXXXXXXXXXX
-                    XXX XXXXXXXXXXXXXXXX
-                    XXXXXXXX XXXXX XX XXXXXX XXXXX XXXX XX XXX XXXXXXXX XXX XXXXXXXXXXX XXXXXXXXX XXXXX XXXXX XXX XXXX XXX XXXXXXXXXX XXXXXXXX XXXXX XXXX XXXX XXXXX XXX XXXXXX XXXX XX XXXXXXX XXXXXXX XXXX X XXXXXX XX XXXX XXX XXXXXXXXX XX XX XXXX X XXXX XXXXXXXX XXXXXXXXX
-                XXXXXX
-                XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXX
-                    XX XXXXXXXXX XXXXXXXX XXXXX XXXXXXXXXXXXXXXX
-                    XXXXXXXXXXXXXXXXXXX
-                XXXXXX
-                XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXX
-                    XX XXXXXXXXX XXXXXXXXXXXXX XXXXX XXXXXXXXXXXXXXXX
-                    XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                XXXXXX
-            XXXXXX
-        XXXXXX
-    XXXXXXXXXX XXX
-BBBBBBBB
-
diff --git a/nosystemd/templates/nosystemd/login.html.py b/nosystemd/templates/nosystemd/login.html.py
deleted file mode 100644
index 17e4c04a..00000000
--- a/nosystemd/templates/nosystemd/login.html.py
+++ /dev/null
@@ -1,54 +0,0 @@
-BBBBBBB BBBBBBBBBBBBBBBBBBBBB
-BBBB BBBBBBBBBBB BBBBBBBBBB BBBB
-BBBBB BBBBBBB
-
-    XXXXXXXX
-        XXXX XXXXXXXXXXXXXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-
-
-                    BB BBBBBBBB
-                        XXX XXXXXXXXXXXXXXXXXXXXXX
-                        BBB BBBBBBB BB BBBBBBBB
-                            XXXXXXXXX
-                        BBBBBB
-                        XXXXX
-                    BBBBB
-
-                    BBBBB BBBBBBBB
-                        BB BBBBBBBBBBBBBBBBBBBBBB
-                                XXXX XXXXXXXXXXXXXX  XXXX XXXXXXXX XXX
-                                    XX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXX
-                                     gettext('You haven been logged out') 
-                                XXXXXX
-                        BBBBB
-                    BBBBBBBB
-
-
-
-                    XXX  XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXX gettext('Log in ') XXXXX
-                    XXXXX XXXXXXXXBBB BBBBBBBBBBBBBBBBBX XXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX
-                        BBBBBBBBBB
-                        XXXXXX XXXXXXXXXXXXX XXXXXXX XXXXXXXXX
-                        BBB BBBBB BB BBBB
-                            BBBBBBBBBBBBBBB BBBBB BBBBBBBBBBBBBBBB BBBBBBBBBBBBB
-                        BBBBBB
-                        XXXFFFFFFFFFXXXX
-                        BBBBBBB
-                            XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXX
-                                 gettext('Login') 
-                            XXXXXXXXX
-                        BBBBBBBBBB
-                    XXXXXXX
-                    XXXXX XXXXXXXXXXXXXXXXXXXX gettext("Don't have an account yet ? ") XX XXXXXXXXXXXXXX XXXXXXBBB BBBBBBBBBBBBBBBBBBXX gettext('Sign up') XXXXXXXXXXX
-                    XXXXX
-                    XXXXXX XX XXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBBXX gettext('Forgot your password ? ') XXXXXXXXXXX
-
-
-                XXXXXX
-            XXXXXX
-        XXXXXX
-    XXXXXXXXX
-
-BBBBBBBB
diff --git a/nosystemd/templates/nosystemd/reset_password.html.py b/nosystemd/templates/nosystemd/reset_password.html.py
deleted file mode 100644
index 64e3f404..00000000
--- a/nosystemd/templates/nosystemd/reset_password.html.py
+++ /dev/null
@@ -1,42 +0,0 @@
-BBBBBBB BBBBBBBBBBBBBBBBBBBBB
-BBBB BBBBBBBBBBB BBBBBBBBBB
-BBBB BBBB
-
-BBBBB BBBBBBB
-
-    XXXXXXXX
-        XXXX XXXXXXXXXXXXXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-
-                    XXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-                        XXXX XXXXXXXXXXXXXXXXXX
-                            XXXX XXXXXXXXXXXXXXXXX
-                                XXXX XXXXXXXXXXXXXXXXXXXXXX
-                                    XXX  XXXXXXXXXXXXXXXXXXXXXXXX gettext('Reset your password') XXXXX
-
-                                    XXXXX XXXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX
-                                        BBBBBBBBBB
-                                        BBB BBBBB BB BBBB
-                                            BBBBBBBBBBBBBBB BBBBB BBBBBBBBBBBBBBBB
-                                        BBBBBB
-                                        BBBBBBB
-                                            XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXX
-                                                 gettext('Reset') 
-                                            XXXXXXXXX
-                                        BBBBBBBBBB
-                                    XXXXXXX
-                                    XXXXX XXXXXXXXXXXXXXXXXXXX gettext('Already have an account ?')  XX XXXXXXXXXXXXXX XXXXXXBBB BBBBBBBBBBBBBBBBBXX gettext('Login')  XXXXXXXXXXX
-                                    XXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-                                    XXXXX
-                              XXXXXX
-                            XXXXXX
-                        XXXXXX
-                    XXXXXX
-
-                XXXXXX
-            XXXXXX
-        XXXXXX
-    XXXXXXXXX
-
-BBBBBBBB
\ No newline at end of file
diff --git a/nosystemd/templates/nosystemd/signup.html.py b/nosystemd/templates/nosystemd/signup.html.py
deleted file mode 100644
index e4c8cc52..00000000
--- a/nosystemd/templates/nosystemd/signup.html.py
+++ /dev/null
@@ -1,47 +0,0 @@
-BBBBBBB BBBBBBBBBBBBBBBBBBBBB
-BBBB BBBBBBBBBBB BBBBBBBBBB
-BBBB BBBB
-
-BBBBB BBBBBBB
-
-
-
-    XXXXXXXX
-        XXXX XXXXXXXXXXXXXXXXXXXXXXX
-            XXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-                XXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXX
-                    XXXX XXXXXXXXXXXXXXXXXX
-                        XXXX XXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-                        XXXX XXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXX
-                            XXXX XXXXXXXXXXXXXXXXXXXXXX
-                                XXX  XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXX gettext('Sign up') XXXXX
-
-                                XXXXX XXXXXXXXBBB BBBBBBBBBBBBBBBBBBX XXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXX
-                                    BB BBBBBBBBBBBBBBBB
-                                        XXXXXX XXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXX
-                                    BBBBB
-                                    BBBBBBBBBB
-                                    BBB BBBBB BB BBBB
-                                        BBBBBBBBBBBBBBB BBBBB BBBBBBBBBBBBBBBB
-                                    BBBBBB
-                                    BBBBBBB
-                                        XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXX
-                                             gettext('Sign up') 
-                                        XXXXXXXXX
-                                    BBBBBBBBBB
-                                XXXXXXX
-                                XXXXX XXXXXXXXXXXXXXXXXXXX gettext('Already have an account ?')  XX XXXXXXXXXXXXXX XXXXXXBBB BBBBBBBBBBBBBBBBBXX gettext('Login') XXXXXXXXXXX
-                                XXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX
-                                XXXXX
-                          XXXXXX
-                        XXXXXX
-                    XXXXXX
-                XXXXXX
-            XXXXXX
-        XXXXXX
-    XXXXXXXXX
-
-
-
-
-BBBBBBBB
\ No newline at end of file
diff --git a/opennebula_api/models.py b/opennebula_api/models.py
index 1745fb49..3eac0b6e 100644
--- a/opennebula_api/models.py
+++ b/opennebula_api/models.py
@@ -10,17 +10,18 @@ from oca.pool import WrongNameError
 from oca.exceptions import OpenNebulaException
 logger = logging.getLogger(__name__)
 
+
 class OpenNebulaManager():
     """This class represents an opennebula manager."""
 
     def __init__(self, email=None, password=None):
-        
+
         # Get oneadmin client
         self.oneadmin_client = self._get_opennebula_client(
             settings.OPENNEBULA_USERNAME,
             settings.OPENNEBULA_PASSWORD
         )
-        
+
         # Get or create oppenebula user using given credentials
         try:
             self.opennebula_user = self._get_or_create_user(
@@ -55,26 +56,27 @@ class OpenNebulaManager():
             opennebula_user = self.oneadmin_client.call(oca.User.METHODS['allocate'], email,
                                                         password, 'core')
             logger.debug(
-                 "User {0} does not exist. Created the user. User id = {1}",
-                 email,
-                 opennebula_user
-             )
+                "User {0} does not exist. Created the user. User id = {1}",
+                email,
+                opennebula_user
+            )
             return opennebula_user
         except ConnectionRefusedError:
             logger.info('Could not connect to host: {host} via protocol {protocol}'.format(
-                    host=settings.OPENNEBULA_DOMAIN,
-                    protocol=settings.OPENNEBULA_PROTOCOL)
-                )
+                host=settings.OPENNEBULA_DOMAIN,
+                protocol=settings.OPENNEBULA_PROTOCOL)
+            )
             raise ConnectionRefusedError
+
     def _get_user_pool(self):
         try:
             user_pool = oca.UserPool(self.oneadmin_client)
             user_pool.info()
         except ConnectionRefusedError:
             logger.info('Could not connect to host: {host} via protocol {protocol}'.format(
-                    host=settings.OPENNEBULA_DOMAIN,
-                    protocol=settings.OPENNEBULA_PROTOCOL)
-                )
+                host=settings.OPENNEBULA_DOMAIN,
+                protocol=settings.OPENNEBULA_PROTOCOL)
+            )
             raise ConnectionRefusedError
         return user_pool
 
@@ -84,7 +86,7 @@ class OpenNebulaManager():
             vm_pool.info()
             return vm_pool
         except AttributeError:
-            logger.info('Could not connect via client, using oneadmin instead') 
+            logger.info('Could not connect via client, using oneadmin instead')
             try:
                 vm_pool = oca.VirtualMachinePool(self.oneadmin_client)
                 vm_pool.info(filter=-2)
@@ -94,9 +96,9 @@ class OpenNebulaManager():
 
         except ConnectionRefusedError:
             logger.info('Could not connect to host: {host} via protocol {protocol}'.format(
-                    host=settings.OPENNEBULA_DOMAIN,
-                    protocol=settings.OPENNEBULA_PROTOCOL)
-                )
+                host=settings.OPENNEBULA_DOMAIN,
+                protocol=settings.OPENNEBULA_PROTOCOL)
+            )
             raise ConnectionRefusedError
         # For now we'll just handle all other errors as connection errors
         except:
@@ -107,8 +109,7 @@ class OpenNebulaManager():
             return self._get_vm_pool()
         except ConnectionRefusedError:
             raise ConnectionRefusedError
-            
-   
+
     def get_vm(self, vm_id):
         vm_id = int(vm_id)
         try:
@@ -118,7 +119,7 @@ class OpenNebulaManager():
             raise ConnectionRefusedError
 
     def create_template(self, name, cores, memory, disk_size, core_price, memory_price,
-                        disk_size_price, ssh='' ):
+                        disk_size_price, ssh=''):
         """Create and add a new template to opennebula.
         :param name:      A string representation describing the template.
                           Used as label in view.
@@ -130,17 +131,17 @@ class OpenNebulaManager():
         :param disk_size_price:    Price of disk space for VM per GB
         :param ssh: User public ssh key
         """
-        
+
         template_id = oca.VmTemplate.allocate(
             self.oneadmin_client,
             template_string_formatter.format(
                 name=name,
                 vcpu=cores,
-                cpu=0.1*cores,
+                cpu=0.1 * cores,
                 size=1024 * disk_size,
                 memory=1024 * memory,
                 # * 10 because we set cpu to *0.1
-                cpu_cost=10*core_price,
+                cpu_cost=10 * core_price,
                 memory_cost=memory_price,
                 disk_cost=disk_size_price,
                 ssh=ssh
@@ -154,20 +155,16 @@ class OpenNebulaManager():
                                  <MEMORY>{memory}</MEMORY>
                                  <VCPU>{vcpu}</VCPU>
                                  <CPU>{cpu}</CPU>
-                                 <CONTEXT>
-                                  <SSH_PUBLIC_KEY>{ssh}</SSH_PUBLIC_KEY>
-                                 </CONTEXT>
-                           """
+                             """
         try:
             disk = template.template.disks[0]
             image_id = disk.image_id
             vm_specs = vm_specs_formatter.format(
-                                        vcpu=int(specs['cpu']),
-                                        cpu=0.1* int(specs['cpu']),
-                                        memory=1024 * int(specs['memory']),
-                                        ssh=ssh_key
-                    
-                    )
+                vcpu=int(specs['cpu']),
+                cpu=0.1 * int(specs['cpu']),
+                memory=1024 * int(specs['memory']),
+
+            )
             vm_specs += """<DISK>
                                   <TYPE>fs</TYPE>
                                   <SIZE>{size}</SIZE>
@@ -184,12 +181,11 @@ class OpenNebulaManager():
             image_uname = disk.image_uname
 
             vm_specs = vm_specs_formatter.format(
-                                        vcpu=int(specs['cpu']),
-                                        cpu=0.1* int(specs['cpu']),
-                                        memory=1024 * int(specs['memory']),
-                                        ssh=ssh_key
-                    
-                    )
+                vcpu=int(specs['cpu']),
+                cpu=0.1 * int(specs['cpu']),
+                memory=1024 * int(specs['memory']),
+
+            )
             vm_specs += """<DISK>
                                   <TYPE>fs</TYPE>
                                   <SIZE>{size}</SIZE>
@@ -201,10 +197,21 @@ class OpenNebulaManager():
                         """.format(size=1024 * int(specs['disk_size']),
                                    image=image,
                                    image_uname=image_uname)
-        vm_id = template.instantiate(name ='',
-                                    pending=False,
-                                    extra_template=vm_specs,                                    )
+        vm_id = self.client.call(oca.VmTemplate.METHODS['instantiate'],
+                                 template.id,
+                                 '',
+                                 True,
+                                 vm_specs,
+                                 False)
 
+        self.oneadmin_client.call(
+            'vm.update',
+            vm_id,
+            """<CONTEXT>
+                <SSH_PUBLIC_KEY>{ssh}</SSH_PUBLIC_KEY>
+               </CONTEXT>
+            """.format(ssh=ssh_key)
+        )
         try:
             self.oneadmin_client.call(
                 oca.VirtualMachine.METHODS['chown'],
@@ -213,7 +220,14 @@ class OpenNebulaManager():
                 self.opennebula_user.group_ids[0]
             )
         except AttributeError:
-            logger.info('Could not change owner for vm with id: {}.'.format(vm_id))
+            logger.info(
+                'Could not change owner for vm with id: {}.'.format(vm_id))
+
+        self.oneadmin_client.call(
+            oca.VirtualMachine.METHODS['action'],
+            'release',
+            vm_id
+        )
         return vm_id
 
     def delete_vm(self, vm_id):
@@ -229,7 +243,8 @@ class OpenNebulaManager():
         except socket.timeout as socket_err:
             logger.info("Socket timeout error: {0}".format(socket_err))
         except OpenNebulaException as opennebula_err:
-            logger.info("OpenNebulaException error: {0}".format(opennebula_err))
+            logger.info(
+                "OpenNebulaException error: {0}".format(opennebula_err))
         except OSError as os_err:
             logger.info("OSError : {0}".format(os_err))
         except ValueError as value_err:
@@ -239,27 +254,26 @@ class OpenNebulaManager():
 
     def _get_template_pool(self):
         try:
-           template_pool = oca.VmTemplatePool(self.oneadmin_client)
-           template_pool.info()
-           return template_pool
+            template_pool = oca.VmTemplatePool(self.oneadmin_client)
+            template_pool.info()
+            return template_pool
         except ConnectionRefusedError:
             logger.info('Could not connect to host: {host} via protocol {protocol}'.format(
-                    host=settings.OPENNEBULA_DOMAIN,
-                    protocol=settings.OPENNEBULA_PROTOCOL)
-                )
+                host=settings.OPENNEBULA_DOMAIN,
+                protocol=settings.OPENNEBULA_PROTOCOL)
+            )
             raise ConnectionRefusedError
         except:
             raise ConnectionRefusedError
-        
 
     def get_templates(self):
         try:
             public_templates = [
-                    template 
-                    for template in self._get_template_pool()
-                    if 'public-' in template.name 
-                    ]
-            return public_templates 
+                template
+                for template in self._get_template_pool()
+                if 'public-' in template.name
+            ]
+            return public_templates
         except ConnectionRefusedError:
             raise ConnectionRefusedError
         except:
@@ -279,10 +293,8 @@ class OpenNebulaManager():
         except:
             raise ConnectionRefusedError
 
-    
-    
     def create_template(self, name, cores, memory, disk_size, core_price, memory_price,
-                        disk_size_price, ssh='' ):
+                        disk_size_price, ssh=''):
         """Create and add a new template to opennebula.
         :param name:      A string representation describing the template.
                           Used as label in view.
@@ -315,11 +327,11 @@ class OpenNebulaManager():
             template_string_formatter.format(
                 name=name,
                 vcpu=cores,
-                cpu=0.1*cores,
+                cpu=0.1 * cores,
                 size=1024 * disk_size,
                 memory=1024 * memory,
                 # * 10 because we set cpu to *0.1
-                cpu_cost=10*core_price,
+                cpu_cost=10 * core_price,
                 memory_cost=memory_price,
                 disk_cost=disk_size_price,
                 ssh=ssh
@@ -329,11 +341,12 @@ class OpenNebulaManager():
         return template_id
 
     def delete_template(self, template_id):
-        self.oneadmin_client.call(oca.VmTemplate.METHODS['delete'], template_id, False)
+        self.oneadmin_client.call(oca.VmTemplate.METHODS[
+                                  'delete'], template_id, False)
 
     def change_user_password(self, new_password):
         self.oneadmin_client.call(
             oca.User.METHODS['passwd'],
             self.opennebula_user.id,
             new_password
-        ) 
+        )
diff --git a/requirements.debian.txt.py b/requirements.debian.txt.py
deleted file mode 100644
index 549c77cf..00000000
--- a/requirements.debian.txt.py
+++ /dev/null
@@ -1,44 +0,0 @@
-XXXXXXXXXXXXX
-XXXXXXXXXXXXXXX
-XXXXXXXX
-XXXXXXXXXXXXXXX
-XXX
-XXXXXXXXXXX
-XXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXX
-XXXXXXXXXX
-XXXXXXXXXXXX
-XXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXX
-XXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXX
-XXXXXXXXXXX
-XXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXX
-XXXXXXXXXXXX
-XXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXX
-XXXXXXXXX
-XXXXXXXXXXXXXXX
-XXXXXXXXXX
-XXXXXXXXXXXX
-XXXXXXXXXXX
-XXXXXXXXXXX
-XXXXXXXXXXX
-XXXXXXXXXXXX
-XXXXXXXXXXX
-XXXXXXXXXX
-XXXXXXXXX
-XXXXX
-XXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXX
-XXXXXXXXXXX
-XXXXXXXXXXXX
-XXXXXXXXXX
-XXXXXXXXX
-XXXXXXXXXXXXXXXXX
-XXXXXXXXXX
diff --git a/requirements.txt.py b/requirements.txt.py
deleted file mode 100644
index 15110f7f..00000000
--- a/requirements.txt.py
+++ /dev/null
@@ -1,88 +0,0 @@
-XXXXXXXXXXXX
-XXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXX
-XXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXX
-XXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXX
-XXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXX
-XXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXX
-XXXXXXXXXXX
-XXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXX
-XXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXX
-
-
diff --git a/requirements_old.txt.py b/requirements_old.txt.py
deleted file mode 100644
index dee3fecf..00000000
--- a/requirements_old.txt.py
+++ /dev/null
@@ -1,102 +0,0 @@
-XXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXX
-XXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXX
-XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXX
-XXXXXXXXXXX
-XXXXXXXXXXXXXX
-XXXXXXXXXXXXXXX
-XXXXXXXXXXX
-XXXXXXXXXXX
-XXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXX
-XXXXXXXXXXX
-XXXXXXXXXX
-XXXXXXXXXXXXX
-XXXXXXXX
-XXXXXXXXXXXXX
-XXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXX
-XXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXXXXXXX
-XXXXXXXXXXXX
-XXXXXXXXXXXXX
-XXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXX
-XXXXXXXXXXX
-XXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXX
-XXXXXXXXXXXXX
-XXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXXX
-XXXXXXXXXXXXXXXX
-XXXXXXXXXX
diff --git a/templates/404.html.py b/templates/404.html.py
deleted file mode 100644
index 9e2a53f7..00000000
--- a/templates/404.html.py
+++ /dev/null
@@ -1,13 +0,0 @@
-XXXXXXXXX XXXX XXXXXX XXXXXXXXXXXX XXXX XXXXXXXXX
-    XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXX XXXXXXXXXX
-XXXXXX
-    XXXXXXXXXXX XXX XXXXXXXXXXXXX
-XXXXXXX
-XXXXXX
-    XXXXXXXX XXX XXXXXXXXXX
-
-    XXXXXXXXX XXX XXX XXXXXXXXX XXXX XXXXX XXX XX XXXXXXXXXX
-
-XXXXXXX
-XXXXXXX
diff --git a/templates/505.html.py b/templates/505.html.py
deleted file mode 100644
index 7c8c4765..00000000
--- a/templates/505.html.py
+++ /dev/null
@@ -1,15 +0,0 @@
-XXXXXXXXX XXXX XXXXXX XXXXXXXXXXXX XXXX XXXXXXXXX
-    XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXXXX XXXXXXXXXX
-XXXXXX
-    XXXXXXXXXXX XXXXXXXXXXXXXXXXXXX
-XXXXXXX
-XXXXXX
-    XXXXXXXX XXXXXXXXXXXXXXXX
-
-    XXXXXXXXX XXX XXX XXXXXXXXX XXXX XX XXXXXXXXXXX XXX XX X
-    XXXXXX XXXXXXXXXXX
-
-    XXXXXX XXXXXXXXX XXXX XXXX XXXXXXXXX XX XXXXX XXXX XXXXXXXXXX
-XXXXXXX
-XXXXXXX
diff --git a/templates/cms/digitalglarus/about.html.py b/templates/cms/digitalglarus/about.html.py
deleted file mode 100644
index ab08c941..00000000
--- a/templates/cms/digitalglarus/about.html.py
+++ /dev/null
@@ -1,57 +0,0 @@
-BBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-BBBB BBBBBBBBBBB BBBBBBBB
-BBBBB BBBBBXXXXXBBBBBBBB
-
-BBBBB BBBBBBB
-XXXX XXXXXXXXXXXX
-  XXXX XXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXXX
-      XXXX
-      XXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXBBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBXXXXX
-      XXXX
-    XXXXXX
-    XXXX XXXXXXXXXXXXXXXXX
-      XXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXX
-    XXXXXX
-    XXXX XXXXXXXXXXXXXXXXX
-      XXX
-	BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-      XXXX
-    XXXXXX
-    XXXX XXXXXXXXXXXXXXXXXXXXXXX
-  XXXXXX
-XXXXXX
-
-XXXX XXXXXXXXXXXX
-  XXXX XXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXXX
-      XXXX
-      XXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-	BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBB
-      XXXXX
-      XXXX
-    XXXXXX
-    XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXX
-      XXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXX
-      XXXX
-	BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-      XXXXX
-    XXXXXX
-    XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXX
-      XXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXX
-	BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-      XXXXX
-    XXXXXX
-    XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXX
-      XXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXX
-      BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-      XXXXX
-    XXXXXX
-    XXXX XXXXXXXXXXXXXXXXXXXXXXX
-  XXXXXX
-XXXXXX
-
-XXXXXX
-XXXX XXXXXXXXXXX XXX
-
-BBBBBBBB
diff --git a/templates/cms/digitalglarus/base.html.py b/templates/cms/digitalglarus/base.html.py
deleted file mode 100644
index 1271f6f1..00000000
--- a/templates/cms/digitalglarus/base.html.py
+++ /dev/null
@@ -1,128 +0,0 @@
-BBBB BBBBBBBBBBB BBBBBBBB BBBBBBBBB BBBBBBBBBBBB
-
-XXXXXXXXX XXXXX
-XXXXX XXXXXXXXXX
-
-XXXXXX
-
-    XXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXX XXXXXXXXXXX
-
-    XXXXXXX
-      BBBBBBBBBBBBBB BBBBBBBBBBBB
-    XXXXXXXX
-
-
-    XXXX XXXXXXX XXX
-    XXXXX XXXXXXXXXXXXX XXXXX XXXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXXX
-
-    XXXX XXXXXXXXX XXXX XXX XXX
-    XXXXX XXXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXXXXXXXXX
-
-    XXXX XXXXXX XXX XXX
-    XXXXX XXXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXXXXXXXXX
-    XXXX XXXXX XXX
-    XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-
-    XXXX XXXXX XXXX XXX XXXXXXXXXX XXX XXXXXXX XX XXXXX XXXXXXXX XXX XXXXX XXXXXXX XXX
-    XXXX XXXXXXXX XXXXXXXXXX XXXXXXX XXXX XX XXX XXXX XXX XXXX XXX XXXXXXX XXX
-    XXXXXXX XX XX XXX
-	XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-	XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-	XXXXXXXXXXXX
-    BBBBBBBBBBBB BBBBB BBBBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-    BBBBBBBBBBBB BBBB BBBBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-XXXXXXXX
-  XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-  XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-  XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-  XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-
-  XXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXX
-  XXXXXXXXXX XXXXXXXXXXXX
-
-XXXXXXXXX
-XXXXXXX
-
-XXXXXX
-    BBBBBBBBBBB
-    XXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXXXXX
-      BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBB
-    XXXXXX
-
-    XXXX XXXXXXXXXX XXX
-    XXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX
-	XXXX XXXXXXXXXXXXXXXXXX
-	    XXXX XXXXX XXX XXXXXX XXX XXXXXXX XXX XXXXXX XXXXXX XXXXXXX XXX
-	    XXXX XXXXXXXXXXXXXXXXXXXXXX
-		XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-		    XXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-		    XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-		    XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-		    XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-		XXXXXXXXX
-		XXXX XXXXXXXXXXXX XX XXXXXX XX XXXXXX XXXXXXXX XXX XXXXXXX XXXX XXX XXXX XX XXXXXXXXX XXX
-		XX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX
-	    XXXXXX
-	    XXXX XXXXXXX XXX XXX XXXXXX XXXXXX XXX XXXXX XXXXXXX XXX XXXXXXXX XXX
-	    XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-		XXX XXXXXXXXXX XXXXXXXXXXXX
-		    XXXX
-		      XX XXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXXXXXXXXX
-		    XXXXX
-		    XXXX
-			XX XXXXXXBBB BBBBBBBBBBBBBBBBBBBBXXXXXXXXXX
-		    XXXXX
-		    XXXX
-		      XX XXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXXXX
-		    XXXXX
-		    XXXX
-			XX XXXXXXBBB BBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXX
-		    XXXXX
-		    XXXX
-			XX XXXXXXBBB BBBBBBBBBBBBBBBBBBBBXXXXXXXXXX
-		    XXXXX
-		XXXXX
-	    XXXXXX
-	    XXXX XXXXXXXXXXXXXXXXX XXX
-	XXXXXX
-	XXXX XXXXXXXXXXX XXX
-    XXXXXX
-
-    XXXX XXXXXXXXXXXXXXXXXX
-    BBBBB BBBBBBB BBBBBBBB
-    XXXXXX
-    XXXX XXXXXXXXXXX XXX
-
-    XXXXXXXX
-	XXXX XXXXXXXXXXXXXXXXXX
-	    XXXX XXXXXXXXXXXX
-		XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-		  XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXX XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXX BBB BBBXXXXXXXX
-		XXXXXX
-	    XXXXXX
-	XXXXXX
-    XXXXXXXXX
-
-    XXXX XXXXXX XXX
-    XXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXX
-
-    XXXX XXXXXXXXX XXXX XXXXXXXXXX XXX
-    XXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXX
-    XXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXXXXXXXXXXX
-
-    XXXX XXXXXX XX XXXXXXXX XXX XXXXXXXX XXX
-    XXXXXXXX
-    XXXXXXXXXXXXXXXXXXXXXXXXX
-	XXXXXXXXX XXXX XXXXXXXXX XXX XXXXX
-    XX
-    XXXXXXXXX
-
-XXXXXXX
-
-XXXXXXX
diff --git a/templates/cms/digitalglarus/contact.html.py b/templates/cms/digitalglarus/contact.html.py
deleted file mode 100644
index 5495c7de..00000000
--- a/templates/cms/digitalglarus/contact.html.py
+++ /dev/null
@@ -1,65 +0,0 @@
-BBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBB
-BBBB BBBBBBBB
-BBBBB BBBBBXXXXXXXBBBBBBBB
-
-BBBBB BBBBBBB
-XXXX XXXXXXXXXXXX
-  XXXX XXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXXX
-      XXXX
-      XXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-	BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBB
-      XXXXX
-      XXXX
-    XXXXXX
-    XXXX XXXXXXXXXXXXXXXXX
-      BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-    XXXXXX
-    XXXX XXXXXXXXXXXXXXXXX
-      BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-    XXXXXX
-    XXXX XXXXXXXXXXXXXXXXXXXXXXX
-  XXXXXX
-XXXXXX
-
-XXXX XXXXXXXXXXXX
-  XXXX XXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXXX
-      XXXX
-      XXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX
-	XXXXXXXXXXXXXXXXXXXXX
-      XXXXX
-      XXXX
-      XXXXX XXX XXXX XXXXXXX XXXXXXXXXXX XX XXXXXXX XXXXXXX XXXXXX XXXX XX X XXXXXXX XXXXX XXX XXXX XXXXXXXXXX
-      XXXXX XXXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXXXXX XXXXXXXXXXXX
-	BBBBBBBBBB
-	XXXX XXXXXXXXXXXX
-	  XXXX XXXXXXXXXXXXXXXXX XXXXXXXXXX
-	    XXXXXXXXXXXXXXXXXXX
-	    XXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXX
-	  XXXXXX
-	  XXXX XXXXXXXXXXXXXXXXX XXXXXXXXXX
-	    XXXXXXXXXXXX XXXXXXXXXXXXXXX
-	    XXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-	  XXXXXX
-	  XXXX XXXXXXXXXXXXXXXXX XXXXXXXXXX
-	    XXXXXXXXXXXX XXXXXXXXXXXXXX
-	    XXXXXX XXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX
-	  XXXXXX
-	  XXXX XXXXXXXXXXXXXXXXXXXXXXX
-	  XXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXX
-	    XXXXXXXXXXXXXXXXXXXXXX
-	    XXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXX
-	  XXXXXX
-	  XXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXX
-	    XXXXXX XXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXX
-	    XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-	  XXXXXX
-	XXXXXX
-      XXXXXXX
-    XXXXXX
-  XXXXXX
-XXXXXX
-XXXXXX
-XXXX XXXXXXXXXXX XXX
-BBBBBBBB
diff --git a/templates/cms/digitalglarus/detail.html.py b/templates/cms/digitalglarus/detail.html.py
deleted file mode 100644
index 88556da7..00000000
--- a/templates/cms/digitalglarus/detail.html.py
+++ /dev/null
@@ -1,11 +0,0 @@
-XXXXXXXXX
-
-XXXX
-    XXXX
-    XXXX
-    XXXX
-    XXXX
-    XXXX
-XXXXX
-
-XXXXX XXXXXXBBB BBBBBBBBBBBBBBBBBBBBBXXXXXX XX XXXXXXXX
diff --git a/templates/cms/digitalglarus/index.html.py b/templates/cms/digitalglarus/index.html.py
deleted file mode 100644
index fb5a0bbc..00000000
--- a/templates/cms/digitalglarus/index.html.py
+++ /dev/null
@@ -1,99 +0,0 @@
-BBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBB
-BBBB BBBBBBBBBBB
-
-BBBBB BBBBBBB
-XXXX XXXXXXXXXXXX
-  XXXX XXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-      XXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXX
-	XXXX XXXXXXXXXX XXXXXXX XXXXXXX XXX XXXXXX XXX
-	XXXX XXXXXXXXXXXXXXXXXXXXXXX
-	  XXXX XXXXXXXXXXX XXXXXXXX
-	    XXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXX
-	  XXXXXX
-	  XXXX XXXXXXXXXXXXX
-	    XXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXX
-	  XXXXXX
-	  XXXX XXXXXXXXXXXXX
-	    XXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXX
-	  XXXXXX
-	XXXXXX
-
-	XXXX XXXXXXXX XXX
-	XX XXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX
-	  XXXXX XXXXXXXXXXXXXXXXXXXXXXXXX
-	XXXX
-	XX XXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX
-	  XXXXX XXXXXXXXXXXXXXXXXXXXXXXXX
-	XXXX
-      XXXXXX
-      XXX XXXXXXXXXXXXXXXXXXXXX
-	XXXXXXXXXXXXXX XXXXXXXXXX
-      XXXXX
-      XXX XXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXX
-      XXX XXXXXXXXXXXXXXXXXXXXXXXX
-      XXXX
-	XXXXXXXXX
-	  XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-	XXXXXXXX
-      XXXXX
-    XXXXXX
-  XXXXXX
-XXXXXX
-
-XXXX XXXXXXXXXXXX
-  XXXX XXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXXX
-      XXXX
-      XXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-	BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-      XXXXX
-      XXXX
-      XXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXX
-      XXX XXXXXXXXXXXXXXXXXXX
-      BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-      XXXXXXXXXXXXX
-    XXXXXX
-  XXXXXX
-XXXXXX
-
-XXXX XXXXXXXXXXXX
-  XXXX XXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXXX
-      XXXX
-      XXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-	BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBB
-      XXXXX
-      XXXX
-      BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-    XXXXXX
-  XXXXXX
-XXXXXX
-
-XXXX XXXXXXXXXXXX
-  XXXX XXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXXX
-      XXXX
-      XXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-	BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-      XXXXX
-      XXXX
-      BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-    XXXXXX
-  XXXXXX
-XXXXXX
-XXXX XXXXXXXXXXXX
-  XXXX XXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXXX
-      XXXX
-      XXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-	BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-      XXXXX
-      XXXX
-      BBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-      XXXXXXXXXXXXX
-    XXXXXX
-  XXXXXX
-XXXXXX
-
-BBBBBBBB
diff --git a/templates/cms/digitalglarus/letscowork.html.py b/templates/cms/digitalglarus/letscowork.html.py
deleted file mode 100644
index 254cfcfd..00000000
--- a/templates/cms/digitalglarus/letscowork.html.py
+++ /dev/null
@@ -1,51 +0,0 @@
-BBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBB
-BBBB BBBBBBBBBBB
-BBBBB BBBBBXXXXXXXXXXXXBBBBBBBB
-
-BBBBB BBBBBBB
-XXXX XXXXXXXXXXXX
-  XXXX XXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-      XXXX XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXX XX XXX XXXXX
-    XXXXXX
-  XXXXXX
-  XXXX XXXXXXXXXXXXXXXXXXXXXXX
-XXXXXX
-XXXX XXXXXXXXXXXX
-  XXXX XXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXXX
-      XXXXXXX XXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    XXXXXX
-  XXXXXX
-XXXXXX
-XXXX XXXXXXXXXXXX
-  XXXX XXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXXX
-      XXXX
-      XXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-	XXXXXXXXXXXXXXXXXXXXXXXX
-      XXXXX
-      XXXX
-    XXXXXX
-    XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXX
-      XXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXX
-      XXXXXXXXXXXXX
-	XXXXXXX XXXXXXXXXXXXXXXXX
-      XXXXX
-    XXXXXX
-    XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXX
-      XXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXX
-      XXXXXXXXXXXXXX
-	XXXXXXXXXXXXXXXXXXXXXXXXX
-    XXXXXX
-    XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXX
-      XXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXX
-      XXXXXXXXXX
-	XXXXXXX XXXXXXXXXX XX XXXXXXXXXXXXXX
-      XXXXX
-    XXXXXX
-    XXXX XXXXXXXXXXXXXXXXXXXXXXX
-  XXXXXX
-XXXXXX
-XXXX XXXXXXXXXXX XXX
-BBBBBBBB
diff --git a/templates/cms/ungleichch/_footer.html.py b/templates/cms/ungleichch/_footer.html.py
deleted file mode 100644
index 4845b187..00000000
--- a/templates/cms/ungleichch/_footer.html.py
+++ /dev/null
@@ -1,40 +0,0 @@
-BBBB BBBBBBBB
-XXX XX
-XXXX XXXXXX XXX
-XXXXXXXX
-  XXXX XXXXXXXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXX
-      XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXXX
-	XXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-	  XXXX
-	    XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-	      XXXXX XXXXXXXXXXXXXXX XXXXXXX
-		XX XXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXXX
-		XX XXXXXXXXX XXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXX
-	      XXXXXXX
-	    XXXX
-	  XXXXX
-	  XXXX
-	    XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-	      XXXXX XXXXXXXXXXXXXXX XXXXXXX
-		XX XXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXXX
-		XX XXXXXXXXX XXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXX
-	      XXXXXXX
-	    XXXX
-	  XXXXX
-	  XXXX
-	    XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-	      XXXXX XXXXXXXXXXXXXXX XXXXXXX
-		XX XXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXXX
-		XX XXXXXXXXX XXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXX
-	      XXXXXXX
-	    XXXX
-	  XXXXX
-	XXXXX
-	XX XXXXXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXXXX
-	  BBBBBBBBBBBBBBBBBB BBBBBBBBBBBBBBBBBB
-	XXXX
-      XXXXXX
-    XXXXXX
-  XXXXXX
-XXXXXXXXX
diff --git a/templates/cms/ungleichch/_header_base.html.py b/templates/cms/ungleichch/_header_base.html.py
deleted file mode 100644
index 8bec459c..00000000
--- a/templates/cms/ungleichch/_header_base.html.py
+++ /dev/null
@@ -1,23 +0,0 @@
-BBBB BBBBBBBB BBBBBBBBBBB
-XXXX XXXX XXXXXX XXX
-XXXX XXX XXXX XXXXXXXXXX XXXXX XXX XXXX XXXXXX XX XXX XXXX XXXXXX XXX
-XXXXXXX XXXXXXXXXXXXXXXXXXXX
-	BB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-	XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX
-	BBBB
-	XXXXXXXXXXXXXXXXXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXXXX
-	BBBBB
-	X
-
-  XXXX XXXXXXXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXX
-      XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXXX
-	XXXX XXXXXXXXXXXXXXXXXXXXX
-	  XXXX BBBBBBBBBBBBBB BBBBBBBBBBBB  XXXXX
-	  XXX XXXXXXXXXXXXXX
-	  XXXXX XXXXXXXXXXXXXXXXXXX BBBBBBBBBBBBBB BBBBBBBBBBBBBBBBBBXXXXXXX
-	XXXXXX
-      XXXXXX
-    XXXXXX
-  XXXXXX
-XXXXXXXXX
diff --git a/templates/cms/ungleichch/_menu.html.py b/templates/cms/ungleichch/_menu.html.py
deleted file mode 100644
index a216d410..00000000
--- a/templates/cms/ungleichch/_menu.html.py
+++ /dev/null
@@ -1,36 +0,0 @@
-BBBB BBBBBBBBB BBBBBBBBBBB BBBBBBBB
-XXXX XXXXXXXXXX XXX
-XXXX XXXXXXXXXXXXX XXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX
-  XXXX XXXXXXXXXXXXXXXXXXXXXXXX
-    XXXX XXXXX XXX XXXXXX XXX XXXXXXX XXX XXXXXX XXXXXX XXXXXXX XXX
-    XXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-      XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-	XXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-	XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-	XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-	XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-      XXXXXXXXX
-      XX XXXXXXXXXXXXXXXXXXXX XXXXXXXXX
-	XXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XX
-      XXXX
-    XXXXXX
-
-    XXXX XXXXXXX XXX XXX XXXXXX XXXXXX XXX XXXXX XXXXXXX XXX XXXXXXXX XXX
-    XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      XXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXXX
-	BBB BBBBB BB BBBBBBBB
-	XXX XXXXXXXXXXXXBB BBBBBBBBBBBBBB XXXXXXXXBBBBBBB BBBBBBBBBBBBBB XXXXXXXXBBBBBBB BBBBBBBBBBBBB XXXXXXXBBBBBBB BBBBBBBBBBBBBBBB XXXXXXXXXXBBBBBXX
-	  XX XXXXXXFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFXXXXXX
-	  BB BBBBBBBBBBBBBB
-	  XXXX
-	    BBBBBBBBB BBBBBBBBBB BBBBBBBB BBBBBBBBBBBBBB BBBBBBBBBBBB BBBBBBBB BB BB BBBBB
-	  XXXXX
-	  BBBBB
-	XXXXX
-	BBBBBB
-      XXXXX
-    XXXXXX
-    XXXX XXXXXXXXXXXXXXXXX XXX
-  XXXXXX
-  XXXX XXXXXXXXXXX XXX
-XXXXXX
diff --git a/templates/cms/ungleichch/base.html.py b/templates/cms/ungleichch/base.html.py
deleted file mode 100644
index 17974683..00000000
--- a/templates/cms/ungleichch/base.html.py
+++ /dev/null
@@ -1,78 +0,0 @@
-BBBB BBBBBBBB BBBBBBBBB BBBBBBBBBBBB BBBBBBBBBBB BBBBBBBBBB
-XXXXXXXXX XXXXX
-XXXXXX
-  XXXXXX
-    XXXXXXX
-      BBBBB BBBBB
-      BBBBBBBBBBBBBB BBBBBBBBBBBB
-      BBBBBBBB
-    XXXXXXXX
-    BBBBBBBBBB BBBBBBBBBBBBBB
-    BBBBBBBBBBBBB
-
-    XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-	  XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-
-    XXXX XXXXX XXXX XXX XXXXXXXXXX XXX XXXXXXX XX XXXXX XXXXXXXX XXX XXXXX XXXXXXX XXX
-    XXXX XXXXXXXX XXXXXXXXXX XXXXXXX XXXX XX XXX XXXX XXX XXXX XXX XXXXXXX XXX
-    XXXXXXX XX XX XXX
-	XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-	XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-	XXXXXXXXXXXX
-    BBBBBBBBBBBBB
-
-    BBBBBBBBBB BBBBB
-    XXXXX XXXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXXXXXXX
-	  XXXXXXXXXXXXXXXX XXXXXXXXXXXX XX
-    BBBBBBBBBBBBB
-    BBBBB BBBB
-    XXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXBBBBBBBBBBBBBB BBBBBBBBBBBBBBBBBBXX
-    BBBBBBB BBBBBBBBBBB
-    BBBBBBBB
-    BBBBBBBBBBBB BBBBBBBBBBBBBB
-    BBBBBBBBBBBB BBBBB BBBBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-  XXXXXXX
-  XXXXXX
-    BBBBBBBBBBB
-    BBBBBBBBB B B BBB BBB BBBBBBBBBBBBBBBBBBBBBBBBBBB
-    XXXX XXXX XXX
-    XXXX XXXX XXXXXXX XXX
-    BBBBB BBBBBBBBBBB
-    BBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-    BBBBBBBB
-    XXXX XXXXXXXXXXXXXXXXXX
-      XXXX XXXXXXXXXXXX
-	XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXXX
-	  BBBBB BBBBBBBBBBBB
-	  BBBBBBBBBBB BBBBBBBBB
-	  BBBBBBBB
-	XXXXXX
-      XXXXXX
-    XXXXXX
-    XXXX XXX XXXX XXX
-    BBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-    BBBBBBBBBB BBBBBBBBBBBBB
-    BBBBBBBBBBBBBBBBBBBB
-    BBBBBBBBBBBBB
-    BBBBBBBBBB BBBB
-    XXXXXXXX
-      XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-
-      XXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXX
-      XXXXXXXXXX XXXXXXXXXXXX
-
-    XXXXXXXXX
-
-    XXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXXXXXXXXXXXXXX XX
-    XXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXXXXXXXXXXXXXX XX
-    BBBBBBBBBBBBB
-    BBBBBBBBBBBB BBBB BBBBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-    BBBBBBBBBBBB BBBBBBBBBBBBB
-  XXXXXXX
-XXXXXXX
diff --git a/templates/cms/ungleichch/blog.html.py b/templates/cms/ungleichch/blog.html.py
deleted file mode 100644
index 0447c42f..00000000
--- a/templates/cms/ungleichch/blog.html.py
+++ /dev/null
@@ -1,5 +0,0 @@
-BBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBB
-BBBBB BBBBBBBBBBBB
-BBBBB BBBBBBB
-BBBBBBBB
-BBBBBBBB
diff --git a/templates/cms/ungleichch/index.html.py b/templates/cms/ungleichch/index.html.py
deleted file mode 100644
index 44bb4580..00000000
--- a/templates/cms/ungleichch/index.html.py
+++ /dev/null
@@ -1,3 +0,0 @@
-BBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBB
-BBBBB BBBBBBBBBBBB
-BBBBBBBB
diff --git a/templates/cms/ungleichch/page.html.py b/templates/cms/ungleichch/page.html.py
deleted file mode 100644
index a3b87684..00000000
--- a/templates/cms/ungleichch/page.html.py
+++ /dev/null
@@ -1,5 +0,0 @@
-BBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBB
-BBBB BBBBBBBB
-BBBBB BBBBBBBBBBBB
-BBBBBBBBBBB BBBBBBBBBBBBBB
-BBBBBBBB
diff --git a/ungleich/templates/cms/ungleichch/_footer.html.py b/ungleich/templates/cms/ungleichch/_footer.html.py
deleted file mode 100644
index 7503809e..00000000
--- a/ungleich/templates/cms/ungleichch/_footer.html.py
+++ /dev/null
@@ -1,40 +0,0 @@
-BBBB BBBBBBBB
-XXX XX
-XXXX XXXXXX XXX
-XXXXXXXX
-  XXXX XXXXXXXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXX
-      XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXXX
-	XXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-	  XXXX
-	    XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-	      XXXXX XXXXXXXXXXXXXXX XXXXXXX
-		XX XXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXXX
-		XX XXXXXXXXX XXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXX
-	      XXXXXXX
-	    XXXX
-	  XXXXX
-	  XXXX
-	    XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-	      XXXXX XXXXXXXXXXXXXXX XXXXXXX
-		XX XXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXXX
-		XX XXXXXXXXX XXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXX
-	      XXXXXXX
-	    XXXX
-	  XXXXX
-	  XXXX
-	    XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-	      XXXXX XXXXXXXXXXXXXXX XXXXXXX
-		XX XXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXXX
-		XX XXXXXXXXX XXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXX
-	      XXXXXXX
-	    XXXX
-	  XXXXX
-	XXXXX
-	XX XXXXXXXXXXXXXXXXXX
-	  XXXXXXXXX X XXXXXXXX XXXX  BBB BBB
-	XXXX
-      XXXXXX
-    XXXXXX
-  XXXXXX
-XXXXXXXXX
diff --git a/ungleich/templates/cms/ungleichch/_header_base.html.py b/ungleich/templates/cms/ungleichch/_header_base.html.py
deleted file mode 100644
index 93b65d8a..00000000
--- a/ungleich/templates/cms/ungleichch/_header_base.html.py
+++ /dev/null
@@ -1,38 +0,0 @@
-BBBB BBBB BBBBBBBB BBBBBBBBBBB BBBBBBBBB BBBBBBBBBBBB
-XXXX XXXX XXXXXX XXX
-XXXX XXX XXXX XXXXXXXXXX XXXXX XXX XXXX XXXXXX XX XXX XXXX XXXXXX XXX
-XXXXXXX XXXXXXXXXXXXXXXXXXXX
-	BB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-	XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX
-	BBBB
-	XXXXXXXXXXXXXXXXXXXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXXXX
-	BBBBB
-	X
-
-  XXXX XXXXXXXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXX
-      XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXXX
-		XXXX XXXXXXXXXXXXXXXXXXXXX
-
-			BB BBBBBBBBBBBBBBBB B B
-			    XXXX XXXXXXXXXXXXXXXXXXXXX
-			    XXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX
-			        BBB BBBBBBBB BB BBBBBBBBB
-			            XXX XXXXXXXXXXXBB BBBBBBBBBBBBBBBB BB BBBBBBBBBB XXXXXXBBBBBXX
-			                XX XXXXXXBBBBBBBBBBBBBBBBB BBBBBBBBBBX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX 
-			                   XXXXXXX gettext('Change to language:')  XXXXXX
-			            XXXXX
-			        BBBBBB
-			    XXXXX
-			    XXXXXX
-			BBBBB
-
-
-		  XXXX BBBBBBBBBBBBBB BBBBBBBBBBBB  XXXXX
-		  XXX XXXXXXXXXXXXXX
-		  XXXXX XXXXXXXXXXXXXXXXXXX BBBBBBBBBBBBBB BBBBBBBBBBBBBBBBBBXXXXXXX
-		XXXXXX
-      XXXXXX
-    XXXXXX
-  XXXXXX
-XXXXXXXXX
diff --git a/ungleich/templates/cms/ungleichch/_menu.html.py b/ungleich/templates/cms/ungleichch/_menu.html.py
deleted file mode 100644
index a216d410..00000000
--- a/ungleich/templates/cms/ungleichch/_menu.html.py
+++ /dev/null
@@ -1,36 +0,0 @@
-BBBB BBBBBBBBB BBBBBBBBBBB BBBBBBBB
-XXXX XXXXXXXXXX XXX
-XXXX XXXXXXXXXXXXX XXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX
-  XXXX XXXXXXXXXXXXXXXXXXXXXXXX
-    XXXX XXXXX XXX XXXXXX XXX XXXXXXX XXX XXXXXX XXXXXX XXXXXXX XXX
-    XXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX
-      XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-	XXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-	XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-	XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-	XXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-      XXXXXXXXX
-      XX XXXXXXXXXXXXXXXXXXXX XXXXXXXXX
-	XXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XX
-      XXXX
-    XXXXXX
-
-    XXXX XXXXXXX XXX XXX XXXXXX XXXXXX XXX XXXXX XXXXXXX XXX XXXXXXXX XXX
-    XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      XXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXXX
-	BBB BBBBB BB BBBBBBBB
-	XXX XXXXXXXXXXXXBB BBBBBBBBBBBBBB XXXXXXXXBBBBBBB BBBBBBBBBBBBBB XXXXXXXXBBBBBBB BBBBBBBBBBBBB XXXXXXXBBBBBBB BBBBBBBBBBBBBBBB XXXXXXXXXXBBBBBXX
-	  XX XXXXXXFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFXXXXXX
-	  BB BBBBBBBBBBBBBB
-	  XXXX
-	    BBBBBBBBB BBBBBBBBBB BBBBBBBB BBBBBBBBBBBBBB BBBBBBBBBBBB BBBBBBBB BB BB BBBBB
-	  XXXXX
-	  BBBBB
-	XXXXX
-	BBBBBB
-      XXXXX
-    XXXXXX
-    XXXX XXXXXXXXXXXXXXXXX XXX
-  XXXXXX
-  XXXX XXXXXXXXXXX XXX
-XXXXXX
diff --git a/ungleich/templates/cms/ungleichch/base_ungleich.html.py b/ungleich/templates/cms/ungleichch/base_ungleich.html.py
deleted file mode 100644
index 1f210854..00000000
--- a/ungleich/templates/cms/ungleichch/base_ungleich.html.py
+++ /dev/null
@@ -1,80 +0,0 @@
-BBBB  BBBB BBBBBBBB BBBBBBBBB BBBBBBBBBBBB BBBBBBBBBBB BBBBBBBBBB
-XXXXXXXXX XXXXX
-XXXXXX
-  XXXXXX
-    XXXXXXX
-      BBBBB BBBBB
-      BBBBBBBBBBBBBB BBBBBBBBBBBB
-      BBBBBBBB
-    XXXXXXXX
-    BBBBBBBBBB BBBBBBBBBBBBBB
-    BBBBBBBBBBBBB
-
-    XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-	  XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
-
-    XXXX XXXXX XXXX XXX XXXXXXXXXX XXX XXXXXXX XX XXXXX XXXXXXXX XXX XXXXX XXXXXXX XXX
-    XXXX XXXXXXXX XXXXXXXXXX XXXXXXX XXXX XX XXX XXXX XXX XXXX XXX XXXXXXX XXX
-    XXXXXXX XX XX XXX
-	XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-	XXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-	XXXXXXXXXXXX
-    BBBBBBBBBBBBB
-
-    BBBBBBBBBB BBBBB
-    XXXXX XXXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXXXXXXX
-	  XXXXXXXXXXXXXXXX XXXXXXXXXXXX XX
-    BBBBBBBBBBBBB
-    BBBBB BBBB
-    XXXXX XXXXXXXXXXXXXXXX
-    XXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXBBBBBBBBBBBBBB BBBBBBBBBBBBBBBBBBXX
-    BBBBBBB BBBBBBBBBBB
-    BBBBBBBB
-    BBBBBBBBBBBB BBBBBBBBBBBBBB
-    BBBBBBBBBBBB BBBBB BBBBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-  XXXXXXX
-  XXXXXX
-
-    BBBBBBBBBBB
-    BBBBBBBBB B B B B BBBBBBBBBBBBBBBBBBBBBBBBBBB
-    XXXX XXXX XXX
-    XXXX XXXX XXXXXXX XXX
-
-    BBBBB BBBBBBBBBBB
-    BBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-    BBBBBBBB
-    XXXX XXXXXXXXXXXXXXXXXX
-      XXXX XXXXXXXXXXXX
-	XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXXX
-	  BBBBB BBBBBBBBBBBB
-	  BBBBBBBBBBB BBBBBBBBB
-	  BBBBBBBB
-	XXXXXX
-      XXXXXX
-    XXXXXX
-    XXXX XXX XXXX XXX
-    BBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-    BBBBBBBBBB BBBBBBBBBBBBB
-    BBBBBBBBBBBBBBBBBBBB
-    BBBBBBBBBBBBB
-    BBBBBBBBBB BBBB
-    XXXXXXXX
-      XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-
-      XXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXX
-      XXXXXXXXXX XXXXXXXXXXXX
-
-    XXXXXXXXX
-
-    XXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXXXXXXXXXXXXXX XX
-    XXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBX XXXXXXXXXXXXXXXXXXXXXX XX
-    BBBBBBBBBBBBB
-    BBBBBBBBBBBB BBBB BBBBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-    BBBBBBBBBBBB BBBBBBBBBBBBB
-  XXXXXXX
-XXXXXXX
diff --git a/ungleich/templates/cms/ungleichch/blog_ungleich.html.py b/ungleich/templates/cms/ungleichch/blog_ungleich.html.py
deleted file mode 100644
index 07c87843..00000000
--- a/ungleich/templates/cms/ungleichch/blog_ungleich.html.py
+++ /dev/null
@@ -1,5 +0,0 @@
-BBBBBBB BBBBBBBBBBBBBBBBBBBB
-BBBBB BBBBBBBBBBBB
-BBBBB BBBBBBB
-BBBBBBBB
-BBBBBBBB
diff --git a/ungleich/templates/cms/ungleichch/index.html.py b/ungleich/templates/cms/ungleichch/index.html.py
deleted file mode 100644
index c04babae..00000000
--- a/ungleich/templates/cms/ungleichch/index.html.py
+++ /dev/null
@@ -1,3 +0,0 @@
-BBBBBBB BBBBBBBBBBBBBBBBBB
-BBBBB BBBBBBBBBBBB
-BBBBBBBB
diff --git a/ungleich/templates/cms/ungleichch/page.html.py b/ungleich/templates/cms/ungleichch/page.html.py
deleted file mode 100644
index a3fb8e89..00000000
--- a/ungleich/templates/cms/ungleichch/page.html.py
+++ /dev/null
@@ -1,5 +0,0 @@
-BBBBBBB BBBBBBBBBBBBBBBBBBBB
-BBBB BBBBBBBB
-BBBBB BBBBBBBBBBBB
-BBBBBBBBBBB BBBBBBBBBBBBBB
-BBBBBBBB
diff --git a/ungleich/templates/ungleich/djangocms_blog/base.html.py b/ungleich/templates/ungleich/djangocms_blog/base.html.py
deleted file mode 100644
index 1fb660b5..00000000
--- a/ungleich/templates/ungleich/djangocms_blog/base.html.py
+++ /dev/null
@@ -1,12 +0,0 @@
-BBBBBBB  BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-
-BBBBB BBBB
-    BB BBBB
-	BBBBBBB BBBBBBBBBBBBBBBBBBBBBB
-    BBBBB
-BBBBBBBB BBBB
-BBBBB BBBBBBB
-XXXX XXXXXXXXXX XXXXXXXX XXXXXXX
-  BBBBB BBBBBBBBBBBBBBBBBBBB
-XXXXXX
-BBBBBBBB BBBBBBB
\ No newline at end of file
diff --git a/ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html.py b/ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html.py
deleted file mode 100644
index 42f2d91e..00000000
--- a/ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html.py
+++ /dev/null
@@ -1,37 +0,0 @@
-BBBB BBBB BBBBBBBBB BBBBBBBB
-
-XXXX XXXXXXXXXXXXXXXXXXXXX
-
-
-  XXXX XXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXX
-      XX XXXXXXXX
-        XXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXBBBBBBBBB BBBBBBBBBBBBBBB BBBBBBB BBBB BBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXXX
-      XXXX
-    XXXXXX    
-    XXXX XXXXXXXXXXXXXXXXX
-      XX XXXXXXXX
-        XXX XXXXXXXXXXXXXXXXXXX
-          
-        XXXXX
-      XXXX
-      XX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXX
-        XXXXXX XX FFFFFFFFFFFFFFFFFF
-      XXXX
-
-      XX XXXXXXXXXXXXXXXXXXXXXX
-        BB BBB BBBBBBBBBBBBBBBB       
-        BBBBBBBBBBBB BBBB BBBBBBBBBB
-        BBBB
-        BBBBBBBBBBBB BBBB BBBBBBBBBB BB BB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-        BBBBB
-      XXXX
-
-
-
-    XXXXXX
-  XXXXXX
-
-
-XXXXXX
-XXXX
diff --git a/ungleich/templates/ungleich/djangocms_blog/post_detail.html.py b/ungleich/templates/ungleich/djangocms_blog/post_detail.html.py
deleted file mode 100644
index f594b441..00000000
--- a/ungleich/templates/ungleich/djangocms_blog/post_detail.html.py
+++ /dev/null
@@ -1,48 +0,0 @@
-BBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-BBBB BBBB BBBBBBBBB BBBBBBBB
-BBBBB BBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBBBBBBBB
-BBBBB BBBBBBBBBBBBBBBBBBBBB BBBBBBBBBBBBB
-BBBBB BBBBBBBBBBBBBXXXXX XXXXXXXXXXXXXXX XXXXXXXXXBBBBBBBB BBBBBBBBBBBBB
-BBBBB BBBBBBBBBBBBBBBBBBB BBBBBBBBBBBB X BBBBBBBB
-XXXX XXXX XXXXXX XXX
-BBBBB BBBBBBBBBBB
-BBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBB
-BBBBBBBB
-XXXX XXXX XXXXXX  XXX
-BBBBB BBBBBBBBBBBB
-XXXXXXXXX
-  BB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-  XXXX XXXXXXXXXXXXXXXXXXXXXBBBBBBBBBBBBBBBBBB BBBBBBBBBBBBXXXXXX
-  BBBB
-  XXXX XXXXXXXXXXXXXXXXXXXXXBBBBBBBBBBBB BBBB BBBBBBBBBBB BBBBBBBBBBBXXXXXX
-  BBBBB
-XXXXXXXXXX
-BBBBBBBB BBBBBBBBBBBB
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ungleich/templates/ungleich/djangocms_blog/post_list_ungleich.html.py b/ungleich/templates/ungleich/djangocms_blog/post_list_ungleich.html.py
deleted file mode 100644
index 77b9daaf..00000000
--- a/ungleich/templates/ungleich/djangocms_blog/post_list_ungleich.html.py
+++ /dev/null
@@ -1,89 +0,0 @@
-BBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-BBBB BBBB BBBBBBBBBBBBBBBBBB
-
-BBBBB BBBBBBBBBBBBBXXXXX XXXXXXXXXXXXXXX XXXXXXXXXBBBBBBBB BBBBBBBBBBBBB
-
-BBBBB BBBBBBBBBBBB
-XXXXXXXX XXXXXXXXXXXXXXXXXX
-  BBBBB BBBBBBBBBB
-  XXXXXXXX
-    XXXX
-      BB BBBBBB gettext('Articles by')  
-      BBBB BBBBBBBBBBBB gettext('Archive')  XXXXXXX BB BBBBBFFFFFFFF BBBBB
-      BBBB BBBBBBBBBBBBBB gettext('Tag')  XXXXXXX FFFFFFFF
-      BBBB BBBBBBBB gettext('Category')  XXXXXXX BBBBB
-    XXXXX
-  XXXXXXXXX
-
-  BBBBBBBB
-  BBB BBBB BB BBBBBBBBB
-  BBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBB BBBBBBBBB BBBBBBBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-  BBBBB
-  XX XXXXXXXXXXXXXXXXXXX gettext('No article found.') XXXX
-  BBBBBB
-  BB BBBBBB BB BBBBBBBBBBBB BB BBBBBBBBBBBBBB
-  XX XXXXXXXXXXXXXXXXXXXX XXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBXX gettext('Back') XXXXXXXX
-  BBBBB
-  BB BBBBBBBBBBBB
-  XXXX XXXXX XXX
-  XXX XXXXXXXXXXXXXX
-    BB BBBBBBBBBBBBBBBBBBBBB
-    XXX XXXXXXXXXXXXXXXXX
-      XX XXXXXXXXXX
-	XXXXXXX  gettext('Newer Posts') 
-      XXXX
-    XXXXX
-    BBBBB
-    BB BBBBBBBBBBBBBBBBB
-    XXX XXXXXXXXXXXXX
-      XX XXXXXXXXXX
-	 gettext('Older Posts')  XXXXXX
-      XXXX
-    XXXXX
-    BBBBB
-  XXXXX
-  BBBBB
-XXXXXXXXXX
-BBBBBBBB
-BBBBBBBBBBBB
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/utils/stripe_utils.py b/utils/stripe_utils.py
index 679a8b58..8f017fbd 100644
--- a/utils/stripe_utils.py
+++ b/utils/stripe_utils.py
@@ -107,7 +107,8 @@ class StripeUtils(object):
 
     @handleStripeError
     def make_charge(self, amount=None, customer=None):
-        amount = int(amount * 100)  # stripe amount unit, in cents
+        _amount = float(amount)
+        amount = int(_amount * 100)  # stripe amount unit, in cents
         charge = self.stripe.Charge.create(
             amount=amount,  # in cents
             currency=self.CURRENCY,