diff --git a/i2p2www/__init__.py b/i2p2www/__init__.py
index 57975769..1eb2a93e 100644
--- a/i2p2www/__init__.py
+++ b/i2p2www/__init__.py
@@ -18,8 +18,6 @@ CURRENT_I2P_VERSION = '0.9.7.1'
 
 CANONICAL_DOMAIN = 'i2hq.srv.i2p2.de'
 
-THIS_DOMAIN = settings.THIS_DOMAIN if settings and hasattr(settings, 'THIS_DOMAIN') else CANONICAL_DOMAIN
-
 CACHE_CONFIG = settings.CACHE_CONFIG if settings and hasattr(settings, 'CACHE_CONFIG') else {
     'CACHE_DEFAULT_TIMEOUT': 600,
     }
diff --git a/i2p2www/pages/site/about/team.html b/i2p2www/pages/site/about/team.html
index 95e1cd31..f8a3da43 100644
--- a/i2p2www/pages/site/about/team.html
+++ b/i2p2www/pages/site/about/team.html
@@ -82,12 +82,12 @@ network.
 	<td valign="top"><i>{{ _('manage the public project website content design') }}</i></td>
 </tr>
 <tr>
-	<td valign="top"><b>{% trans website=i2pconv('www.i2p2.i2p') %}<a href="http://{{ website }}/">Webserver</a> admin{% endtrans %}</b></td>
+	<td valign="top"><b>{% trans website=site_url() %}<a href="{{ website }}">Webserver</a> admin{% endtrans %}</b></td>
 	<td valign="top">welterde</td>
 	<td valign="top"><i>{{ _('manage the public project webservers') }}</i></td>
 </tr>
 <tr>
-	<td valign="top"><b>{% trans website=i2pconv('www.i2p2.i2p') %}<a href="http://{{ website }}/">Website</a> admin{% endtrans %}</b></td>
+	<td valign="top"><b>{% trans website=site_url() %}<a href="{{ website }}">Website</a> admin{% endtrans %}</b></td>
 	<td valign="top">str4d</td>
 	<td valign="top"><i>{{ _('manage the public project website content') }}</i></td>
 </tr>
diff --git a/i2p2www/settings.py.sample b/i2p2www/settings.py.sample
index 8284d6fc..3027ca11 100644
--- a/i2p2www/settings.py.sample
+++ b/i2p2www/settings.py.sample
@@ -1,6 +1,3 @@
-# The domain hosting this site
-THIS_DOMAIN = 'i2p.mirror.example.org'
-
 # Flask-Cache settings
 CACHE_CONFIG = {
     'CACHE_DEFAULT_TIMEOUT': 600,
diff --git a/i2p2www/templatevars.py b/i2p2www/templatevars.py
index 45b8da06..e682dd2d 100644
--- a/i2p2www/templatevars.py
+++ b/i2p2www/templatevars.py
@@ -1,12 +1,11 @@
 from flask import g, request, safe_join, url_for
 import os.path
 
-from i2p2www import CANONICAL_DOMAIN, CURRENT_I2P_VERSION, STATIC_DIR, THIS_DOMAIN, app
+from i2p2www import CANONICAL_DOMAIN, CURRENT_I2P_VERSION, STATIC_DIR, app
 
 INPROXY = '.us'
 
 I2P_TO_CLEAR = {
-    'www.i2p2.i2p': THIS_DOMAIN,
     'forum.i2p': 'forum.i2p', # Don't convert forum.i2p, it is not accessible outside I2P
     'trac.i2p2.i2p': 'trac.i2p2.de',
     'mail.i2p': 'i2pmail.org',