diff --git a/app/settings.py b/app/settings.py
index 2c97de3..d7e89d4 100644
--- a/app/settings.py
+++ b/app/settings.py
@@ -151,7 +151,7 @@ TEMPLATE_LOADERS = (
 MIDDLEWARE_CLASSES = (
     'django.middleware.cache.UpdateCacheMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
-    'country_segment.middleware.ResolveCountryCodeMiddleware',
+    # 'country_segment.middleware.resolve_country_code_middleware.ResolveCountryCodeMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
@@ -164,6 +164,7 @@ MIDDLEWARE_CLASSES = (
     'cms.middleware.toolbar.ToolbarMiddleware',
     'cms.middleware.language.LanguageCookieMiddleware',
     'django.middleware.cache.FetchFromCacheMiddleware',
+    'country_segment.middleware.ResolveCountryCodeMiddleware',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
@@ -269,7 +270,7 @@ INSTALLED_APPS = (
     'blog',
 
     'aldryn_bootstrap3',
-# 'debug_toolbar',
+#'debug_toolbar',
     'djangocms_forms',
     'smartsnippets',
     'easy_select2',
diff --git a/zsite/templates/base.html b/zsite/templates/base.html
index b33fce4..c8066dd 100644
--- a/zsite/templates/base.html
+++ b/zsite/templates/base.html
@@ -38,7 +38,6 @@
                         <li>{% language_chooser 'language_chooser.html' %}</li>
                         <li><a href="{% page_url "about" %}"><strong>{% page_attribute "page_title" "about" %}</strong></a></li>
                     </ul>
-                    <p class="city">{% trans 'Worldwide' %}</p>
                     <div class="consultation">
                         {% static_placeholder 'consultation' %}
                     </div>