diff --git a/drama/routes/front.py b/drama/routes/front.py
index 58203cc27..78e1c2ec9 100644
--- a/drama/routes/front.py
+++ b/drama/routes/front.py
@@ -41,6 +41,7 @@ def notifications(v):
 		c._is_blocked = False
 		c._is_blocking = False
 		if c.parent_submission and c.parent_comment and c.parent_comment.author_id == v.id:
+			pass
 			while c.parent_comment:
 				parent = c.parent_comment
 				if c not in parent.replies2:
@@ -53,6 +54,7 @@ def notifications(v):
 		elif c.parent_submission and c not in listing:
 			listing.append(c)
 		else:
+			pass
 			if c.parent_comment:
 				while c.level > 1:
 					c = c.parent_comment
diff --git a/drama/routes/login.py b/drama/routes/login.py
index 641a19bb2..5fff1b2bf 100644
--- a/drama/routes/login.py
+++ b/drama/routes/login.py
@@ -224,12 +224,6 @@ def sign_up_post(v):
 	if not agent:
 		abort(403)
 
-	# check tor
-	# if request.headers.get("CF-IPCountry")=="T1":
-	#	return render_template("sign_up_tor.html",
-	#		i=random_image()
-	#	)
-
 	form_timestamp = request.form.get("now", '0')
 	form_formkey = request.form.get("formkey", "none")
 
diff --git a/drama/templates/admin/cache.html b/drama/templates/admin/cache.html
deleted file mode 100644
index 5d9822632..000000000
--- a/drama/templates/admin/cache.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{% extends "default.html" %}
-
-{% block title %}
-<title>Drama</title>
-<meta name="description" content="Drama Help">
-{% endblock %}
-
-{% block content %}
-<pre></pre>
-<pre></pre>
-<h5>Cache Dump</h5>
-<a href="javascript:void(0)" class="btn btn-primary mt-3" onclick="post_toast('/admin/dump_cache')">Clear internal cache</a>
-
-<div class="toast" id="toast-post-success" style="position: fixed; bottom: 1.5rem; margin: 0 auto; left: 0; right: 0; width: 275px; z-index: 1000" role="alert" aria-live="assertive" aria-atomic="true" data-animation="true" data-autohide="true" data-delay="5000">
-	<div class="toast-body bg-success text-center text-white">
-		<i class="fas fa-comment-alt-smile mr-2"></i><span id="toast-post-success-text"></span>
-	</div>
-</div>
-<div class="toast" id="toast-post-error" style="position: fixed; bottom: 1.5rem; margin: 0 auto; left: 0; right: 0; width: 275px; z-index: 1000" role="alert" aria-live="assertive" aria-atomic="true" data-animation="true" data-autohide="true" data-delay="5000">
-	<div class="toast-body bg-danger text-center text-white">
-		<i class="fas fa-exclamation-circle mr-2"></i><span id="toast-post-error-text"></span>
-	</div>
-</div>
-{% endblock %}
\ No newline at end of file
diff --git a/drama/templates/admin/new_users.html b/drama/templates/admin/new_users.html
index 429c0704b..10942590e 100644
--- a/drama/templates/admin/new_users.html
+++ b/drama/templates/admin/new_users.html
@@ -1,4 +1,4 @@
-{% extends "mine/mine.html" %}
+{% extends "mine.html" %}
 
 {% block maincontent %}
 		<img src="{{single_plot}}">
diff --git a/drama/templates/control_panel_logged_in.html b/drama/templates/control_panel_logged_in.html
deleted file mode 100644
index 1dbd3b861..000000000
--- a/drama/templates/control_panel_logged_in.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<p><a href="{{v.url}}">My Profile</a></p>
-<p><a href="/settings">Settings</a></p>
-<p><a href="/submit">Submit</a></p>
-<form action="/logout" method="post">
-	<input type="hidden" name="formkey" value="{{v.formkey}}">
-	<input type="submit" value="Sign Out">
-</form>
diff --git a/drama/templates/control_panel_logged_out.html b/drama/templates/control_panel_logged_out.html
deleted file mode 100644
index 3125dc6ab..000000000
--- a/drama/templates/control_panel_logged_out.html
+++ /dev/null
@@ -1 +0,0 @@
-<p><a href="/login">Sign In</a> | <a href="/signup">Sign Up</a></p>
diff --git a/drama/templates/developers.html b/drama/templates/developers.html
deleted file mode 100644
index 1c50a3a82..000000000
--- a/drama/templates/developers.html
+++ /dev/null
@@ -1,43 +0,0 @@
-{% extends "default.html" %}
-
-{% block title %}
-<title>Drama - FAQ</title>
-<meta name="description" content="Drama FAQ">
-{% endblock %}
-
-{% block content %}
-{% filter markdown %}
-
-# Developer Help
-
-Tips to help ensure your website works nicely with Drama
-
-## SSL Required
-
-To help protect user privacy and safety, Drama forces HTTPS on all assets uploaded and submitted to Drama. This includes automatic conversion of all "https://" schemas into "https://".
-
-Make sure your website has a valid SSL certificate in order to ensure that Drama users can navigate to it from Drama. 
-
-We will not grant exemptions to https conversion.
-
-## Share to Drama
-
-To create a "share to Drama" button, create an element which has `onclick="window.location.href='https://rdrama.net/submit?url='+window.location.href"`
-
-Use [Drama branding and assets](/press) to style your "share to Drama" button.
-
-
-## Thumbnails
-
-Thumbnail images for posts are determined by using the first successful condition below:
-
-1. If the submitted link has a `Content-Type: image/*` header, the link itself is used as the thumbnail asset.
-2. If the submitted link has a `Content-Type: text/html` header, and there is a `<meta name="thumbnail">` element, the `content` attribute of that element will be scraped and used as the thumbnail. (Use this option to explicitly set a thumbnail)
-3. If the submitted link has a `Content-Type: text/html` header, and no thumbnail meta element is found, the `src` attribute of the first `img` element will be scraped and used as the thumbnail.
-
-## Applications
-
-To request drama API keys, visit [this page](/apps)
-
-{% endfilter %}
-{% endblock %}
diff --git a/drama/templates/gm_exile_modal.html b/drama/templates/gm_exile_modal.html
deleted file mode 100644
index 6f3cfeee6..000000000
--- a/drama/templates/gm_exile_modal.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- Badmin Ban user Modal -->
-<div class="modal fade" id="guildmasterBanModal" tabindex="-1" role="dialog" aria-labelledby="guildmasterBanModalTitle" aria-hidden="true">
-	<div class="modal-dialog modal-dialog-centered" role="document">
-	 <form action="/admin/exile/{{b.base36id}}" method="post">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h5 class="modal-title">Ban user from +{{b.name}}</h5>
-				<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-					<span aria-hidden="true"><i class="far fa-times"></i></span>
-				</button>
-			</div>
-			<div class="modal-body">
-				<p>Users exiled from a guild will receive a notification shortly after you exile them.</p>
-			 <input type="hidden" name="formkey" value="{{v.formkey}}">
-			 <input type="text" name="username" placeholder="enter username" class="form-control" oninput="check_exile('{{b.base36id}}')" required>
-			 <span class="form-text text-danger" id="exile-error"></span>
-		 </div>
-		 <div class="modal-footer">
-			<button type="button" class="btn btn-link text-muted" data-dismiss="modal">Cancel</button>
-			<button type="submit" class="btn btn-primary" id="exileUserButton" disabled>Ban user</button>
-		</div>
-	</div>
-</form>
-</div>
-</div>
\ No newline at end of file
diff --git a/drama/templates/mine/mine.html b/drama/templates/mine.html
similarity index 100%
rename from drama/templates/mine/mine.html
rename to drama/templates/mine.html
diff --git a/drama/templates/mine/users.html b/drama/templates/mine/users.html
deleted file mode 100644
index 6cba8a7dc..000000000
--- a/drama/templates/mine/users.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "mine/mine.html" %}
-
-{% block maincontent %}
-{% include "user_listing.html" %}
-{% endblock %}
\ No newline at end of file
diff --git a/drama/templates/sign_up_tor.html b/drama/templates/sign_up_tor.html
deleted file mode 100644
index 2e3e65ce8..000000000
--- a/drama/templates/sign_up_tor.html
+++ /dev/null
@@ -1,118 +0,0 @@
-
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-
-		<meta charset="utf-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-		<meta name="description" content="Sign up in under 27 seconds.">
-		<meta name="author" content="">
-		<meta property="og:type" content="article" />
-		<meta property="og:title" content="Drama" />
-		<meta property="og:site_name" content="rdrama.net" />
-		<meta property="og:image" content="{{'/assets/images/preview.png' | full_link}}" />
-		<meta property="og:url" content="https://rdrama.net">
-		<meta property="og:description" name="description" content="Sign up now! Dude bussy lmao">
-		<meta property="og:author" name="author" content="@drama" />
-		<meta property="og:site_name" content="rdrama.net" />
-
-		<meta name="twitter:card" content="summary_large_image"/>
-		<meta name="twitter:site" content="@drama">
-		<meta name="twitter:title" content="Drama" />
-		<meta name="twitter:creator" content="@drama">
-		<meta name="twitter:description" content="Sign up now! Dude bussy lmao" />
-		<meta name="twitter:image" content="{{'/assets/images/preview.png' | full_link}}" />
-		<meta name="twitter:url" content="https://rdrama.net" />
-
-		<title>{% if ref_user %}{{ref_user.username}} invites you to Drama{% else %}Sign up - Drama{% endif %}</title>
-
-		<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600&display=swap" rel="stylesheet">
-
-		<!-- Bootstrap core CSS -->
-		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"
-		integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
-
-		<!-- Font Awesome -->
-		<link href="/assets/fontawesome/css/all.css" rel="stylesheet"> <!--load all styles -->
-
-		<script data-search-pseudo-elements defer src="https://use.fontawesome.com/releases/latest/js/all.js"
-		integrity="sha384-L469/ELG4Bg9sDQbl0hvjMq8pOcqFgkSpwhwnslzvVVGpDjYJ6wJJyYjvG3u8XW7"
-		crossorigin="anonymous"></script>
-
-		<!-- Drama CSS -->
-		<link rel="stylesheet" href="/assets/style/dark_ff66ac.css">
-
-</head>
-
-<body id="login">
-
-		<!-- Navigation -->
-		<nav class="navbar navbar-expand-lg navbar-dark bg-transparent fixed-top border-0">
-				<div class="container-fluid">
-						<button class="navbar-toggler d-none" type="button" data-toggle="collapse" data-target="#navbarResponsive"
-						aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
-						<span class="navbar-toggler-icon"></span>
-				</button>
-		</div>
-</nav>
-
-<!-- Page Content -->
-
-<div class="container-fluid position-absolute h-100 p-0">
-		<div class="row no-gutters h-100">
-
-				<div class="col-12 col-md-6 my-auto p-3">
-
-						<div class="row justify-content-center">
-
-								<div class="col-10 col-md-7">
-
-										<div class="mb-5">
-												<a href="/" class="text-decoration-none"><span class="h3 text-primary">drama</span></a>
-										</div>
-
-										<div id="register-form" class="">
-
-											 {% if ref_user %}
-											 <h1 class="h2">@{{ref_user.username}} has invited you!</h1>
-											 <p class="text-muted mb-md-5">Open this link in a non-Tor browser to accept this invitation.</p>
-											 <p class="text-muted mb-md-5">You can resume using Tor right away after you sign up.</p>
-											 {% else %}
-											 <h1 class="h2">Create your account.</h1>
-											 <p class="text-muted mb-md-5">Open this link in a non-Tor browser.</p>
-											 <p class="text-muted mb-md-5">You can resume using Tor right away after you sign up.</p>
-											 {% endif %}
-
-
-										</div>
-
-								</div>
-
-						</div>
-
-				</div>
-
-				<div class="col-12 col-md-6 d-none d-md-block">
-
-						<div class="splash-wrapper">
-
-								<div class="splash-overlay"></div>
-
-								<img class="splash-img" src="{{i.path}}"></img>
-						</div>
-
-				</div>
-
-		</div>
-</div>
-
-{% include "bootstrap.html" %}
-
-<!-- Drama JS -->
-
-<script src="/assets/js/all_js.js"></script>
-
-</body>
-
-</html>
diff --git a/drama/templates/userpage_deleted.html b/drama/templates/userpage_deleted.html
deleted file mode 100644
index cb9fa3b29..000000000
--- a/drama/templates/userpage_deleted.html
+++ /dev/null
@@ -1,51 +0,0 @@
-{% extends "default.html" %}
-
-{% block pagetype %}userpage{% endblock %}
-
-{% block fixedMobileBarJS %}
-<script>
-	var prevScrollpos = window.pageYOffset;
-	window.onscroll = function () {
-		var currentScrollPos = window.pageYOffset;
-		if (prevScrollpos > currentScrollPos) {
-			document.getElementById("fixed-bar-mobile").style.top = "48px";
-			document.getElementById("navbar").classList.remove("shadow");
-		} 
-		else if (currentScrollPos <= 125) {
-			document.getElementById("fixed-bar-mobile").style.top = "48px";
-			document.getElementById("navbar").classList.remove("shadow");
-		}
-		else {
-			document.getElementById("fixed-bar-mobile").style.top = "-48px";
-			document.getElementById("dropdownMenuSortBy").classList.remove('show');
-			document.getElementById("dropdownMenuFrom").classList.remove('show');
-			document.getElementById("navbar").classList.add("shadow");
-		}
-		prevScrollpos = currentScrollPos;
-	}
-</script>
-{% endblock %}
-
-{% block title %}
-<title>{{u.username}}</title>
-<meta name="description" content="[deleted]">
-{% endblock %}
-
-{% block content %}
-
-<div class="row no-gutters">
-	<div class="col-12">
-		<div class="text-center py-7 py-md-8">
-			<span class="fa-stack fa-2x text-muted mb-4">
-				<i class="fas fa-square text-danger opacity-25 fa-stack-2x"></i>
-				<i class="fas text-danger fa-user-minus fa-stack-1x text-lg"></i>
-			</span>
-			<h2 class="h5">Deactivated Account</h2>
-			<p class="text-muted">@{{u.username}} left Drama.</p>
-		</div>
-	</div>
-</div>
-{% endblock %}
-
-{% block pagenav %}
-{% endblock %}