diff --git a/ckan/config/environment.py b/ckan/config/environment.py
index 0a1269c64df..73c5ae0b9b5 100644
--- a/ckan/config/environment.py
+++ b/ckan/config/environment.py
@@ -290,6 +290,10 @@ def update_config():
     if asbool(config.get('ckan.legacy_templates', 'no')):
         # We want the new template path for extra snippets like the
         # dataviewer and also for some testing stuff
+        msg = 'Support for Genshi templates is deprecated and will be removed'\
+            ' in a future release'
+        log.warn(msg)
+
         template_paths = [legacy_templates_path, jinja2_templates_path]
     else:
         template_paths = [jinja2_templates_path, legacy_templates_path]
diff --git a/ckan/config/who.ini b/ckan/config/who.ini
index 01fc7c07bc8..293569878dd 100644
--- a/ckan/config/who.ini
+++ b/ckan/config/who.ini
@@ -49,7 +49,8 @@ plugins =
     auth_tkt
 
 [authenticators]
-plugins = 
+plugins =
+    auth_tkt
     ckan.lib.authenticator:OpenIDAuthenticator
     ckan.lib.authenticator:UsernamePasswordAuthenticator
 
diff --git a/ckan/lib/cli.py b/ckan/lib/cli.py
index 83424b71e16..70709acf3dd 100644
--- a/ckan/lib/cli.py
+++ b/ckan/lib/cli.py
@@ -106,7 +106,7 @@ class CkanCommand(paste.script.command.Command):
     '''
     parser = paste.script.command.Command.standard_parser(verbose=True)
     parser.add_option('-c', '--config', dest='config',
-            default='development.ini', help='Config file to use.')
+        help='Config file to use.')
     parser.add_option('-f', '--file',
         action='store',
         dest='file_path',
@@ -116,12 +116,22 @@ class CkanCommand(paste.script.command.Command):
 
     def _get_config(self):
         from paste.deploy import appconfig
-        if not self.options.config:
-            msg = 'No config file supplied'
-            raise self.BadCommand(msg)
-        self.filename = os.path.abspath(self.options.config)
+
+        if self.options.config:
+            self.filename = os.path.abspath(self.options.config)
+            config_source = '-c parameter'
+        elif os.environ.get('CKAN_INI'):
+            self.filename = os.environ.get('CKAN_INI')
+            config_source = '$CKAN_INI'
+        else:
+            self.filename = 'development.ini'
+            config_source = 'default value'
+
         if not os.path.exists(self.filename):
-            raise AssertionError('Config filename %r does not exist.' % self.filename)
+            msg = 'Config file not found: %s' % self.filename
+            msg += '\n(Given by: %s)' % config_source
+            raise self.BadCommand(msg)
+
         fileConfig(self.filename)
         return appconfig('config:' + self.filename)
 
diff --git a/ckan/logic/action/create.py b/ckan/logic/action/create.py
index 43b39ac120d..0eadc45e9f0 100644
--- a/ckan/logic/action/create.py
+++ b/ckan/logic/action/create.py
@@ -262,7 +262,6 @@ def resource_create(context, data_dict):
     user = context['user']
 
     package_id = _get_or_bust(data_dict, 'package_id')
-    data_dict.pop('package_id')
     _get_or_bust(data_dict, 'url')
 
     pkg_dict = _get_action('package_show')(context, {'id': package_id})
diff --git a/ckan/logic/action/get.py b/ckan/logic/action/get.py
index d1ea5d081aa..155566c79fd 100644
--- a/ckan/logic/action/get.py
+++ b/ckan/logic/action/get.py
@@ -1027,7 +1027,7 @@ def resource_show(context, data_dict):
         if resource_dict['id'] == id:
             break
     else:
-        logging.error('Could not find resource ' + id)
+        log.error('Could not find resource ' + id)
         raise NotFound(_('Resource was not found.'))
 
     resource_dict['package_id'] = pkg_dict['id']
diff --git a/ckan/logic/auth/create.py b/ckan/logic/auth/create.py
index 8df9c964fcf..d7f9f598cb2 100644
--- a/ckan/logic/auth/create.py
+++ b/ckan/logic/auth/create.py
@@ -63,17 +63,40 @@ def related_create(context, data_dict=None):
 
 
 def resource_create(context, data_dict):
-    # resource_create runs through package_update, no need to
-    # check users eligibility to add resource to package here.
+    model = context['model']
+    user = context.get('user')
+
+    package_id = data_dict.get('package_id')
+    if not package_id and data_dict.get('id'):
+        # This can happen when auth is deferred, eg from `resource_view_create`
+        resource = logic_auth.get_resource_object(context, data_dict)
+        package_id = resource.package_id
+
+    if not package_id:
+        raise logic.NotFound(
+            _('No dataset id provided, cannot check auth.')
+        )
+
+    # check authentication against package
+    pkg = model.Package.get(package_id)
+    if not pkg:
+        raise logic.NotFound(
+            _('No package found for this resource, cannot check auth.')
+        )
+
+    pkg_dict = {'id': pkg.id}
+    authorized = new_authz.is_authorized('package_update', context, pkg_dict).get('success')
 
-    # FIXME This is identical behaviour to what existed but feels like we
-    # should be using package_update permissions and have better errors.  I
-    # am also not sure about the need for the group issue
-    return new_authz.is_authorized('package_create', context, data_dict)
+    if not authorized:
+        return {'success': False,
+                'msg': _('User %s not authorized to create resources on dataset %s') %
+                        (str(user), package_id)}
+    else:
+        return {'success': True}
 
 
 def resource_view_create(context, data_dict):
-    return resource_create(context, data_dict)
+    return resource_create(context, {'id': data_dict['resource_id']})
 
 
 def package_relationship_create(context, data_dict):
diff --git a/ckan/new_tests/lib/test_base.py b/ckan/new_tests/lib/test_base.py
index 04656093928..e728c38c513 100644
--- a/ckan/new_tests/lib/test_base.py
+++ b/ckan/new_tests/lib/test_base.py
@@ -1,6 +1,89 @@
 from nose import tools as nose_tools
 
-from ckan.new_tests import helpers
+import ckan.new_tests.factories as factories
+import ckan.new_tests.helpers as helpers
+
+
+class TestLoginView(helpers.FunctionalTestBase):
+
+    def _maybe_follow(self, response, **kw):
+        """
+        Follow all redirects. If this response is not a redirect, do nothing.
+        Returns another response object.
+
+        (backported from WebTest 2.0.1)
+        """
+        remaining_redirects = 100  # infinite loops protection
+
+        while 300 <= response.status_int < 400 and remaining_redirects:
+            response = response.follow(**kw)
+            remaining_redirects -= 1
+
+        assert remaining_redirects > 0, "redirects chain looks infinite"
+        return response
+
+    def test_registered_user_login(self):
+        '''
+        Registered user can submit valid login details at /user/login and
+        be returned to appropriate place.
+        '''
+        app = helpers._get_test_app()
+
+        # make a user
+        user = factories.User()
+
+        # get the form
+        response = app.get('/user/login')
+        # ...it's the second one
+        login_form = response.forms[1]
+
+        # fill it in
+        login_form['login'] = user['name']
+        login_form['password'] = 'pass'
+
+        # submit it
+        submit_response = login_form.submit()
+        # let's go to the last redirect in the chain
+        final_response = self._maybe_follow(submit_response)
+
+        # the response is the user dashboard, right?
+        final_response.mustcontain('<a href="/dashboard">Dashboard</a>',
+                                   '<span class="username">{0}</span>'
+                                   .format(user['fullname']))
+        # and we're definitely not back on the login page.
+        final_response.mustcontain(no='<h1 class="page-heading">Login</h1>')
+
+    def test_registered_user_login_bad_password(self):
+        '''
+        Registered user is redirected to appropriate place if they submit
+        invalid login details at /user/login.
+        '''
+        app = helpers._get_test_app()
+
+        # make a user
+        user = factories.User()
+
+        # get the form
+        response = app.get('/user/login')
+        # ...it's the second one
+        login_form = response.forms[1]
+
+        # fill it in
+        login_form['login'] = user['name']
+        login_form['password'] = 'badpass'
+
+        # submit it
+        submit_response = login_form.submit()
+        # let's go to the last redirect in the chain
+        final_response = self._maybe_follow(submit_response)
+
+        # the response is the login page again
+        final_response.mustcontain('<h1 class="page-heading">Login</h1>',
+                                   'Login failed. Bad username or password.')
+        # and we're definitely not on the dashboard.
+        final_response.mustcontain(no='<a href="/dashboard">Dashboard</a>'),
+        final_response.mustcontain(no='<span class="username">{0}</span>'
+                                   .format(user['fullname']))
 
 
 class TestCORS(helpers.FunctionalTestBase):
diff --git a/ckan/new_tests/logic/action/test_create.py b/ckan/new_tests/logic/action/test_create.py
index 33843856854..e5ab149096c 100644
--- a/ckan/new_tests/logic/action/test_create.py
+++ b/ckan/new_tests/logic/action/test_create.py
@@ -172,6 +172,32 @@ def setup_class(cls):
     def setup(self):
         model.repo.rebuild_db()
 
+    def test_resource_create(self):
+        context = {}
+        params = {
+            'package_id': factories.Dataset()['id'],
+            'url': 'http://data',
+            'name': 'A nice resource',
+        }
+        result = helpers.call_action('resource_create', context, **params)
+
+        id = result.pop('id')
+
+        assert id
+
+        params.pop('package_id')
+        for key in params.keys():
+            assert_equals(params[key], result[key])
+
+    def test_it_requires_package_id(self):
+
+        data_dict = {
+            'url': 'http://data',
+        }
+
+        assert_raises(logic.ValidationError, helpers.call_action,
+                      'resource_create', **data_dict)
+
     def test_it_requires_url(self):
         user = factories.User()
         dataset = factories.Dataset(user=user)
diff --git a/ckan/new_tests/logic/action/test_get.py b/ckan/new_tests/logic/action/test_get.py
index 588e55026d8..86ad06916bf 100644
--- a/ckan/new_tests/logic/action/test_get.py
+++ b/ckan/new_tests/logic/action/test_get.py
@@ -340,11 +340,10 @@ def test_organization_show_private_packages_not_returned(self):
         assert org_dict['packages'][0]['name'] == 'dataset_1'
         assert org_dict['package_count'] == 1
 
-    def test_user_get(self):
+    def test_user_show_default_values(self):
 
         user = factories.User()
 
-        ## auth_ignored
         got_user = helpers.call_action('user_show', id=user['id'])
 
         assert 'password' not in got_user
@@ -352,6 +351,10 @@ def test_user_get(self):
         assert 'apikey' not in got_user
         assert 'email' not in got_user
 
+    def test_user_show_keep_email(self):
+
+        user = factories.User()
+
         got_user = helpers.call_action('user_show',
                                        context={'keep_email': True},
                                        id=user['id'])
@@ -361,6 +364,10 @@ def test_user_get(self):
         assert 'password' not in got_user
         assert 'reset_key' not in got_user
 
+    def test_user_show_keep_apikey(self):
+
+        user = factories.User()
+
         got_user = helpers.call_action('user_show',
                                        context={'keep_apikey': True},
                                        id=user['id'])
@@ -370,6 +377,10 @@ def test_user_get(self):
         assert 'password' not in got_user
         assert 'reset_key' not in got_user
 
+    def test_user_show_sysadmin_values(self):
+
+        user = factories.User()
+
         sysadmin = factories.User(sysadmin=True)
 
         got_user = helpers.call_action('user_show',
diff --git a/ckan/new_tests/logic/auth/test_create.py b/ckan/new_tests/logic/auth/test_create.py
index 030ebed5f0c..fba8ad58a6f 100644
--- a/ckan/new_tests/logic/auth/test_create.py
+++ b/ckan/new_tests/logic/auth/test_create.py
@@ -105,3 +105,103 @@ def test_user_invite_delegates_correctly_to_group_member_create(self, gmc):
         gmc.return_value = {'success': True}
         result = helpers.call_auth('user_invite', context=context, **data_dict)
         assert result is True
+
+
+class TestCreateResources(object):
+
+    @classmethod
+    def setup_class(cls):
+
+        helpers.reset_db()
+
+    def test_authorized_if_user_has_permissions_on_dataset(self):
+
+        user = factories.User()
+
+        dataset = factories.Dataset(user=user)
+
+        resource = {'package_id': dataset['id'],
+                    'title': 'Resource',
+                    'url': 'http://test',
+                    'format': 'csv'}
+
+        context = {'user': user['name'], 'model': core_model}
+        response = helpers.call_auth('resource_create',
+                                     context=context, **resource)
+        assert_equals(response, True)
+
+    def test_not_authorized_if_user_has_no_permissions_on_dataset(self):
+
+        org = factories.Organization()
+
+        user = factories.User()
+
+        member = {'username': user['name'],
+                  'role': 'admin',
+                  'id': org['id']}
+        helpers.call_action('organization_member_create', **member)
+
+        user_2 = factories.User()
+
+        dataset = factories.Dataset(user=user, owner_org=org['id'])
+
+        resource = {'package_id': dataset['id'],
+                    'title': 'Resource',
+                    'url': 'http://test',
+                    'format': 'csv'}
+
+        context = {'user': user_2['name'], 'model': core_model}
+        nose.tools.assert_raises(logic.NotAuthorized, helpers.call_auth,
+                                 'resource_create', context=context,
+                                 **resource)
+
+    def test_not_authorized_if_not_logged_in(self):
+
+        resource = {'title': 'Resource',
+                    'url': 'http://test',
+                    'format': 'csv'}
+
+        context = {'user': None, 'model': core_model}
+        nose.tools.assert_raises(logic.NotAuthorized, helpers.call_auth,
+                                 'resource_create', context=context,
+                                 **resource)
+
+    def test_sysadmin_is_authorized(self):
+
+        sysadmin = factories.Sysadmin()
+
+        resource = {'title': 'Resource',
+                    'url': 'http://test',
+                    'format': 'csv'}
+
+        context = {'user': sysadmin['name'], 'model': core_model}
+        response = helpers.call_auth('resource_create',
+                                     context=context, **resource)
+        assert_equals(response, True)
+
+    def test_raises_not_found_if_no_package_id_provided(self):
+
+        user = factories.User()
+
+        resource = {'title': 'Resource',
+                    'url': 'http://test',
+                    'format': 'csv'}
+
+        context = {'user': user['name'], 'model': core_model}
+        nose.tools.assert_raises(logic.NotFound, helpers.call_auth,
+                                 'resource_create', context=context,
+                                 **resource)
+
+    def test_raises_not_found_if_dataset_was_not_found(self):
+
+        user = factories.User()
+
+        resource = {'package_id': 'does_not_exist',
+                    'title': 'Resource',
+                    'url': 'http://test',
+                    'format': 'csv'}
+
+        context = {'user': user['name'], 'model': core_model}
+        nose.tools.assert_raises(logic.NotFound, helpers.call_auth,
+                                 'resource_create', context=context,
+                                 **resource)
diff --git a/ckan/templates/package/read_base.html b/ckan/templates/package/read_base.html
index 559ca0b6972..b6f93106a83 100644
--- a/ckan/templates/package/read_base.html
+++ b/ckan/templates/package/read_base.html
@@ -11,7 +11,7 @@
   {{ super() }}
   {% set description = h.markdown_extract(pkg.notes, extract_length=200)|forceescape %}
   <meta property="og:title" content="{{ h.dataset_display_name(pkg) }} - {{ g.site_title }}">
-  <meta property="og:description" content="{{ description|forceescape }}">
+  <meta property="og:description" content="{{ description|forceescape|trim }}">
 {% endblock -%}
 
 {% block content_action %}
diff --git a/ckan/templates_legacy/__init__.py b/ckan/templates_legacy/__init__.py
deleted file mode 100644
index b646540d6be..00000000000
--- a/ckan/templates_legacy/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# empty file needed for pylons to find templates in this directory
diff --git a/ckan/templates_legacy/_snippet/data-api-help.html b/ckan/templates_legacy/_snippet/data-api-help.html
deleted file mode 100644
index 16349df9fec..00000000000
--- a/ckan/templates_legacy/_snippet/data-api-help.html
+++ /dev/null
@@ -1,139 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip=""
-  >
-
-<div class="modal-data-api-help modal fade in" style="display: none;"
-  py:def="data_api_help(datastore_api)">
-<div class="modal-header">
-  <a class="close" data-dismiss="modal">×</a>
-  <h3>
-    CKAN Data API
-  </h3>
-</div>
-<div class="modal-body">
-  <p><strong>Access resource data via a web API with powerful query
-    support</strong>. Further information in the <a
-    href="http://docs.ckan.org/en/latest/using-data-api.html" target="_blank">main
-    CKAN Data API and DataStore documentation</a>.</p>
-
-  <div class="accordion-group">
-    <div class="accordion-heading">
-      <a class="accordion-toggle" data-toggle="collapse" href=".collapse-endpoints">Endpoints &raquo;</a>
-    </div>
-    <div class="collapse-endpoints in accordion-body collapse">
-      <div class="accordion-inner">
-        <p>The Data API builds directly on ElasticSearch, with a resource API
-        endpoint being equivalent to a single index 'type' in ElasticSearch.
-        This means you can directly re-use <a
-          href="http://www.elasticsearch.org/guide/appendix/clients.html"
-          _target="blank">ElasticSearch
-          client libraries</a> when connecting to the API endpoint.</p>
-        <table class="table-condensed table-striped table-bordered">
-          <thead></thead>
-          <tbody>
-            <tr>
-              <th>Base</th>
-              <td><code>${datastore_api}</code></td>
-            </tr>
-            <tr>
-              <th>Query</th>
-              <td>
-                <code>${datastore_api}/_search</code>
-              </td>
-            </tr>
-            <tr>
-              <th>Query example</th>
-              <td>
-                <code><a href="${datastore_api}/_search?size=5&amp;pretty=true" target="_blank">${datastore_api}/_search?size=5&amp;pretty=true</a></code>
-              </td>
-            </tr>
-            <tr>
-              <th>Schema (Mapping)</th>
-              <td>
-                <code><a href="${datastore_api}/_mapping" target="_blank">${datastore_api}/_mapping?pretty=true</a></code>
-              </td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
-    </div>
-  </div>
-
-  <div class="accordion-group">
-    <div class="accordion-heading">
-      <a class="accordion-toggle" href=".collapse-querying" data-toggle="collapse">Querying
-        &raquo;</a>
-    </div>
-    <div class="collapse-endpoints in accordion-body">
-      <div class="accordion-inner">
-        <strong>Query example (first 5 results)</strong>
-        <p>
-        <code><a href="${datastore_api}/_search?size=5&amp;pretty=true" target="_blank">${datastore_api}/_search?size=5&amp;pretty=true</a></code>
-        </p>
-
-        <strong>Query example (results with 'jones' in <code>title</code> field)</strong>
-        <p>
-        <code><a href="${datastore_api}/_search?q=title:jones&amp;size=5&amp;pretty=true"
-            target="_blank">${datastore_api}/_search?q=title:jones&amp;size=5&amp;pretty=true</a></code>
-        </p>
-
-        <strong>Schema (Mapping)</strong>
-        <p>
-        <code><a href="${datastore_api}/_mapping" target="_blank">${datastore_api}/_mapping?pretty=true</a></code>
-        </p>
-
-        <strong>Endpoint (for clients)</strong>
-        <p>
-        <code>${datastore_api}</code>
-        </p>
-      </div>
-    </div>
-  </div>
-
-  <div class="accordion-group">
-    <div class="accordion-heading">
-      <a class="accordion-toggle" href=".collapse-javascript" data-toggle="collapse">Example: Javascript</a>
-    </div>
-    <div class="accordion-body collapse-javascript in">
-      <div class="accordion-inner">
-        <p>A simple ajax (JSONP) request to the data API using jQuery.</p>
-        <pre>
-var data = {
-  size: 5 // get 5 results
-  q: 'title:jones' // query on the title field for 'jones'
-};
-$.ajax({
-  url: '${datastore_api}/_search',
-  data: data,
-  dataType: 'jsonp',
-  success: function(data) {
-    alert('Total results found: ' + data.hits.total)
-  }
-});</pre>
-      </div>
-    </div>
-  </div>
-
-  <div class="accordion-group">
-    <div class="accordion-heading">
-      <a class="accordion-toggle" href=".collapse-javascript" data-toggle="collapse">Example: Python</a>
-    </div>
-    <div class="accordion-body collapse-javascript in">
-      <div class="accordion-inner">
-        <pre>
-import urllib
-url = '${datastore_api}/_search?size=5&amp;q=title:jones'
-fileobj = urllib.urlopen(url)
-print fileobj.read()
-</pre>
-      </div>
-    </div>
-  </div>
-</div>
-</div>
-
-</html>
diff --git a/ckan/templates_legacy/_util.html b/ckan/templates_legacy/_util.html
deleted file mode 100644
index 1c69831dc58..00000000000
--- a/ckan/templates_legacy/_util.html
+++ /dev/null
@@ -1,250 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip=""
-  >
-
-  <div py:def="markdown_editor(fieldname,value,id,placeholder)" class="markdown-editor">
-    <ul class="button-row">
-      <li><button class="btn js-markdown-edit depressed">Edit</button></li>
-      <li><button class="btn js-markdown-preview">Preview</button></li>
-    </ul>
-    <div>
-      <textarea class="markdown-input" name="${fieldname}" id="${id}" placeholder="${placeholder}">${value}</textarea>
-    </div>
-    <div class="markdown-preview" style="display: none;"></div>
-    <span class="hints">You can use <a href="http://daringfireball.net/projects/markdown/syntax" target="_blank">Markdown formatting</a> here.</span>
-  </div>
-
-  <!--! Herein can be found generic helper methods for a whole bunch of common
-        templating issues -->
-
-  <!--! plural(n, s, p): takes a number, a singular form and a plural form,
-        returning the appropriate form on the basis of the number specified -->
-  <py:def function="plural(num, s, p)" py:choose="num">
-    <py:when test="1">${s}</py:when>
-    <py:otherwise>${p}</py:otherwise>
-  </py:def>
-
-  <!--! nonempty(val, default): takes a variable string, and returns it or a
-        fallback 'default' string if it's blank -->
-  <py:def function="nonempty(val, default)" py:choose="val">
-    <py:when test="str(val).strip()">${val}</py:when>
-    <py:otherwise>${default}</py:otherwise>
-  </py:def>
-
-  <!--! List of tags: pass in a collection of tags and this renders the standard
-        tag listing -->
-  <ul py:def="tag_list(tags)" class="tags clearfix">
-    <py:for each="tag in tags">
-    <li py:if="not tag.get('vocabulary_id')">
-      ${h.link_to(tag['display_name'], h.url_for(controller='tag', action='read', id=tag['name']))}
-    </li>
-    </py:for>
-  </ul>
-
-  <!--! List of users: pass in a collection of users and this renders the standard
-          user listing -->
-    <ul py:def="user_list(users)" class="users">
-      <li py:for="user in users">
-        ${h.linked_user(user)}
-      </li>
-    </ul>
-
-  <!--! List of datasets: pass in a collection of tags and this renders the
-        standard dataset listing -->
-  <py:def function="package_list(packages)">
-	  ${package_list_from_dict(h.convert_to_dict('package', packages))}
-  </py:def>
-
-  <py:def function="package_list_from_dict(packages)">
-	${h.snippet('snippets/package_list.html', packages=packages)}
-  </py:def>
-
-  <!--! List of dataset groups: pass in a collection of dataset groups
-        and this renders the standard group listing -->
-  <table class="table table-bordered table-striped table-condensed groups" py:def="group_list(groups)">
-    <tr><th>Title</th><th>Number of datasets</th><th>Description</th></tr>
-    <py:for each="group in groups">
-    <tr>
-      <td><a href="${h.url_for(controller='group', action='read', id=group.name)}">${group.display_name}</a></td>
-      <td>${len(group.packages)}</td>
-      <td>${h.truncate(group.description, length=80, whole_word=True)}</td>
-    </tr>
-    </py:for>
-  </table>
-
-  <!--! List of dataset groups: pass in a collection of dataset groups
-        and this renders the standard group listing. Same as the above, but using dictionaries -->
-  <table class="table table-bordered table-striped table-condensed groups" py:def="group_list_from_dict(groups)">
-    <tr><th>Title</th><th>Number of datasets</th><th>Description</th></tr>
-    <py:for each="group in groups">
-    <tr>
-      <td><a href="${h.url_for( '%s_read' % str(group['type'])  , action='read', id=group['name'])}">${group['display_name']}</a></td>
-      <td>${group['packages']}</td>
-      <td>${h.truncate(group['description'], length=80, whole_word=True)}</td>
-    </tr>
-    </py:for>
-  </table>
-
-  <!--! Dataset openness icons -->
-  <img py:def="package_license_icon(package)"
-    src="${h.url_for('/images/icons/door_%s.png' % 'open' if package.isopen() else 'grey')}"
-    title="License: ${package.license.title if hasattr(package.license, 'title') else '?'}"
-    alt="${'OPEN' if package.isopen() else 'CLOSED'}" />
-
-  <py:def function="package_resources_icon(package)" py:choose="">
-    <a py:when="package.resources"
-       href="${h.url_for(controller='package', action='read', id=package.name, anchor='resources')}">
-      <img src="${h.icon_url('arrow_down')}" title="View dataset resources" alt="DOWNLOAD" />
-    </a>
-
-    <img py:otherwise="" src="${h.icon_url('arrow_down_grey')}" title="No downloadable resources." alt="" />
-  </py:def>
-
-  <py:def function="resource_summary(pkg, res)">
-      <a href="${h.url_for(controller='package', action='resource_read', id=pkg.id, resource_id=res.id)}">
-         ${h.resource_display_name(res)}
-      </a>
-  </py:def>
-
-
-  <py:def function="related_summary(related, allow_delete)">
-  <li id="related-item-${related.id}" class="span3">
-      <div class="thumbnail">
-        <button py:if="allow_delete and h.check_access('related_delete',{'id': '%s' % related.id})" class="close" data-action="delete" data-related-id="${related.id}">×</button>
-        <a href="${h.url_for('related_read', id=related.id)}" class="image">
-          <img src="${related.image_url}" width="210" py:if="related.image_url" />
-          <img src="/images/photo-placeholder.png" width="210" py:if="not related.image_url" />
-        </a>
-        <span style="display:none;">${related.view_count}</span>
-        <div class="caption">
-          <h5 class="heading" title="${related.title}">${h.markdown_extract(related.title, extract_length=30)}</h5>
-          <div class="description" data-truncate="55" py:if="related.description">${h.markdown_extract(related.description, extract_length=1000)}</div>
-          <i class="empty" py:if="not related.description">No description for this item</i>
-          <p class="read-more"><a href="${h.url_for('related_read', id=related.id)}">View this ${related.type}</a></p>
-        </div>
-      </div>
-    </li>
-  </py:def>
-
-
-  <!--! Used by group listing -->
-  <py:def function="package_summary(pkg)">
-      <a href="${h.url_for(controller='package', action='read', id=pkg.name)}">
-         ${pkg.name} - ${pkg.title}
-      </a>
-  </py:def>
-
-  <div py:def="package_rating(pkg)" class="rating-group">
-    <py:choose test="">
-      <div py:when="c.num_ratings" class="inline-rating">
-        <ul class="stars default${'%i' % (c.current_rating or 0)}star">
-          <li class="${name}" py:for="number,name in enumerate(['one', 'two', 'three', 'four', 'five'])"></li>
-        </ul>
-        ${'%0.1f (%i rating%s)' % (c.current_rating, c.num_ratings, ('s' if c.num_ratings != 1 else ''))}
-      </div>
-      <py:otherwise>no ratings yet</py:otherwise>
-    </py:choose>
-
-    &ndash;
-    rate it now
-
-    <div class="inline-rating">
-    <ul class="stars default0star">
-      <py:for each="number,name in zip(range(1,6), ['one', 'two', 'three', 'four', 'five'])">
-      <li class="${name}">
-      <a href="${h.url_for(controller='package',action='rate',id=c.pkg.name,rating=number)}" title="${number} Star">${number}</a>
-      </li>
-      </py:for>
-    </ul>
-    </div>
-  </div><!--! /rating-group -->
-
-  <table class="table table-bordered table-striped table-condensed" py:def="authz_form_table(id, roles, users, user_role_dict)">
-    <tr>
-      <th> User </th>
-      <py:for each="role in roles">
-      <th> ${role} </th>
-      </py:for>
-    </tr>
-    <py:for each="user in users">
-      <tr>
-        <td>
-          ${h.linked_user(user)}
-        </td>
-        <py:for each="role in roles">
-          <td>
-            <input type="hidden" name="${ h.literal( '%s$%s' % (user,role)) }" value="submitted"/>
-            <py:choose>
-              <py:when test="user_role_dict[(user,role)]">
-                <input type="checkbox"
-                   name="${ h.literal( '%s$%s' % (user,role)) }"
-                   checked='checked'/>
-              </py:when>
-              <py:otherwise>
-                <input type="checkbox"
-                       name="${ h.literal( '%s$%s' % (user,role)) }"
-                       />
-              </py:otherwise>
-            </py:choose>
-          </td>
-        </py:for>
-      </tr>
-    </py:for>
-  </table>
-
-
-
-  <table class="table table-bordered table-striped table-condensed" py:def="authz_add_table(roles)">
-    <tr>
-      <th>User</th>
-      <py:for each="role in roles">
-       <th> ${role} </th>
-     </py:for>
-    </tr>
-    <tr>
-      <td>
-        <input type="textbox" name="new_user_name" class="autocomplete-user" />
-      </td>
-      <py:for each="role in roles">
-        <td>
-          <input type="hidden" name="${ h.literal( '%s' % role) }" value="submitted"/>
-          <input type="checkbox" name="${ h.literal( '%s' % role) }"/>
-        </td>
-      </py:for>
-    </tr>
-  </table>
-
-
-  <py:def function="revision_list(revisions, allow_compare=False)">
-	${revision_list_from_dict(h.convert_to_dict('revisions', revisions), allow_compare=allow_compare)}
-  </py:def>
-
-  <py:def function="revision_list_from_dict(revisions, allow_compare=False)">
-    ${h.snippet('snippets/revision_list.html', revisions=revisions, allow_compare=allow_compare)}
-  </py:def>
-
-
-  <!--! jsConditionalForIe(ieVersion, tagContent, matchOperator): takes a
-        IE version number, a tag or other HTML code that will be wrapped inside
-        a IE conditional comment, and the comparison operator (lt, lte, etc..
-        see http://msdn.microsoft.com/en-us/library/ms537512%28v=vs.85%29.aspx)
-        returning Genshi stream ready to be shown in a template.
-
-        NOTE:
-        Internet Explorer Conditional Import are confused as Genshi comments
-        and python variables and method calls are not executed if inside them.
-        This function helps to output tags with Python code inside conditional
-        comments, eg ${h.url_for_static()} -->
-  <?python
-    from genshi import HTML
-    def jsConditionalForIe(ieVersion, tagContent, matchOperator = 'lt'):
-      html = HTML('<!--[if ' + matchOperator +  ' IE ' + str(ieVersion) + ''']>
-                     ''' + tagContent + '''
-                   <![endif]-->''')
-      return html
-  ?>
-</html>
diff --git a/ckan/templates_legacy/activity_streams/activity_stream_items.html b/ckan/templates_legacy/activity_streams/activity_stream_items.html
deleted file mode 100644
index b603f7da707..00000000000
--- a/ckan/templates_legacy/activity_streams/activity_stream_items.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip=""
-  >
-<py:for each="activity in activities" >
-
-<div class="activity">
-  ${    h.literal(activity.msg.format(**activity.data))  }
-    <span class="date">${ h.render_datetime(activity.timestamp) }</span>
-</div>
-</py:for>
-</html>
diff --git a/ckan/templates_legacy/admin/authz.html b/ckan/templates_legacy/admin/authz.html
deleted file mode 100644
index 82284e8387b..00000000000
--- a/ckan/templates_legacy/admin/authz.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-
-  <py:def function="page_title">Administration - Authorization</py:def>
-  <py:def function="page_heading">Administration - Authorization</py:def>
-
-  <div py:match="content">
-    <h3>Update Existing Roles</h3>
-
-    <form id="theform" method="POST">
-      ${authz_form_table('theform', c.roles, c.users, c.user_role_dict)}
-      <button type="submit" name="save" class="btn btn-primary">
-        Save Changes
-      </button>
-      <div class="clear"></div>
-    </form>
-
-    <h3>Add Roles for Any User</h3>
-    <form id="addform" method="POST">
-      ${authz_add_table(c.roles)}
-      <button type="submit" name="add" class="btn btn-primary">Add Role</button>
-      <div class="clear"></div>
-    </form>
-
-
-  </div>
-
-  <xi:include href="layout.html" />
-</html>
-
diff --git a/ckan/templates_legacy/admin/index.html b/ckan/templates_legacy/admin/index.html
deleted file mode 100644
index cb027d2f1fc..00000000000
--- a/ckan/templates_legacy/admin/index.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-
-  <py:def function="page_title">Administration Dashboard</py:def>
-  <py:def function="page_heading">Administration Dashboard</py:def>
-
-  <div py:match="content">
-    <h3>Current Sysadmins</h3>
-    <ul>
-      <li py:for="user in c.sysadmins">
-        ${h.linked_user(user)}
-      </li>
-    </ul>
-
-    <span class="insert-comment-recent"></span>
-  </div>
-
-  <xi:include href="layout.html" />
-</html>
-
diff --git a/ckan/templates_legacy/admin/layout.html b/ckan/templates_legacy/admin/layout.html
deleted file mode 100644
index bd3bbd96e67..00000000000
--- a/ckan/templates_legacy/admin/layout.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip=""
-  >
-  <py:match path="minornavigation">
-    <ul class="nav nav-pills">
-      <li class="${'active' if c.action=='index' else ''}">
-        <a href="${h.url_for('ckanadmin', action='index')}">Home</a>
-      </li>
-      <li class="${'active' if c.action=='trash' else ''}">
-        <a href="${h.url_for('ckanadmin', action='trash')}">Trash</a>
-      </li>
-    </ul>
-  </py:match>
-  
-  <xi:include href="../layout.html" />
-</html>
-
-
diff --git a/ckan/templates_legacy/admin/trash.html b/ckan/templates_legacy/admin/trash.html
deleted file mode 100644
index 6ef7d7b803a..00000000000
--- a/ckan/templates_legacy/admin/trash.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-
-  <py:def function="page_title">Administration - Trash</py:def>
-  <py:def function="page_heading">Administration - Trash</py:def>
-
-  <div py:match="content">
-    <h3>Deleted Revisions</h3>
-    ${revision_list(c.deleted_revisions)}
-    <form method="POST" id="form-purge-revisions">
-      <button
-        type="submit"
-        name="purge-revisions"
-        value="purge"
-        py:attrs=
-          "{'disabled':'disabled','class':'btn disabled'} 
-          if not any(c.deleted_revisions) 
-          else {'class':'btn btn-danger'}"
-        >
-        Purge them all (forever and irreversibly)
-      </button>
-      <div class="clear"></div>
-    </form>
-
-    <h3>Deleted Datasets</h3>
-    ${package_list(c.deleted_packages)}
-    <span py:if="not any(c.deleted_packages)"><em>(None)</em></span>
-    <form method="POST" id="form-purge-packages">
-      <button
-        type="submit"
-        name="purge-packages"
-        value="purge"
-        py:attrs=
-          "{'disabled':'disabled','class':'btn disabled'} 
-          if not any(c.deleted_packages) 
-          else {'class':'btn btn-danger'}"
-        >
-        Purge them all (forever and irreversibly)
-      </button>
-      <div class="clear"></div>
-    </form>
-  </div>
-
-  <xi:include href="layout.html" />
-</html>
-
diff --git a/ckan/templates_legacy/error_document_template.html b/ckan/templates_legacy/error_document_template.html
deleted file mode 100644
index 6a1e62028ec..00000000000
--- a/ckan/templates_legacy/error_document_template.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-  
-  <py:def function="page_title">Error ${c.code}</py:def>
-
-  <div py:match="content">
-
-    ${c.content}
-
-  </div>
-
-  <xi:include href="layout.html" />
-</html>
diff --git a/ckan/templates_legacy/facets.html b/ckan/templates_legacy/facets.html
deleted file mode 100644
index ec1387c4c4a..00000000000
--- a/ckan/templates_legacy/facets.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip=""
-  >
-
-<!--!
-Construct a facet <div> populated with links to filtered results.
-
-name
-  The field name identifying the facet field, eg. "tags"
-
-title
-  The title of the facet, eg. "Tags", or "Tag Cloud"
-
-label_function
-  Renders the human-readable label for each facet value.
-  If defined, this should be a callable that accepts a `facet_item`.
-  eg. lambda facet_item: facet_item.display_name.upper()
-  By default it displays the facet item's display name, which should
-  usually be good enough
-
-if_empty
-  A string, which if defined, and the list of possible facet items is empty,
-  is displayed in lieu of an empty list.
-
-count_label
-  A callable which accepts an integer, and returns a string.  This controls
-  how a facet-item's count is displayed.
-  
--->
-<py:def function="facet_div(name, title, limit=10, label_function=lambda item: item.display_name, if_empty=None, count_label=lambda c: ' (%d)'%c)">
-    <div py:if="if_empty is not None or h.unselected_facet_items(name, limit)" class="facet-box">
-        <h2>${h.get_facet_title(title)}</h2>
-        <ul class="facet-options">
-            ${facet_li(name, limit=limit, label_function=label_function, if_empty=None, count_label=count_label)}
-        </ul>
-        <p py:if="not h.unselected_facet_items(name, limit)">${if_empty}</p>
-    </div>
-</py:def>
-
-<!--!
-Generate <li>s for facet items.  The generated tags are not wrapped by any
-other tag, ie - it's up to the caller to wrap them in something suitable.
-
-name
-  The field name identifying the facet field, eg. "tags"
-
-label_function
-  Renders the human-readable label for each facet value.
-  If defined, this should be a callable that accepts a `facet_item`.
-  eg. lambda facet_item: facet_item.display_name.upper()
-  By default it displays the facet item's display name, which should
-  usually be good enough
-
-if_empty
-  A string, which if defined, and the list of possible facet items is empty,
-  is displayed in a <li> tag in lieu of an empty list.
-
-count_label
-  A callable which accepts an integer, and returns a string.  This controls
-  how a facet-item's count is displayed.
-  
--->
-<py:def function="facet_li(name, limit=5, label_function=lambda item: item.display_name, if_empty=None, count_label=lambda c: ' (%d)'%c)">
-
-    <li py:if="if_empty and not h.unselected_facet_items(name, limit)">${if_empty}</li>
-
-    <li py:for="facet_item in h.unselected_facet_items(name, limit)">
-        <a href="${c.drill_down_url(**{name: facet_item.name})}">
-            ${label_function(facet_item)}
-        </a>
-        ${count_label(facet_item['count'])}
-    </li>
-</py:def>
-
-<py:def function="field_list()">
-    <div class="filter-list" py:if="c.fields">
-        <div class="filter-entry" py:for="(field, value) in c.fields">
-            <span class="name">${h.get_facet_title(field)}</span>
-            <span class="value" py:choose="">
-                <py:when test="c.translated_fields and c.translated_fields.has_key((field,value))">
-                    ${c.translated_fields[(field,value)]}
-                </py:when>
-                <py:otherwise>
-                    ${value}
-                </py:otherwise>
-            </span>
-            <a href="${c.remove_field(field, value)}">
-                ${h.icon('unfilter')}
-            </a>
-        </div>  
-    </div>
-</py:def>
-
-</html>
diff --git a/ckan/templates_legacy/group/__init__.py b/ckan/templates_legacy/group/__init__.py
deleted file mode 100644
index b646540d6be..00000000000
--- a/ckan/templates_legacy/group/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# empty file needed for pylons to find templates in this directory
diff --git a/ckan/templates_legacy/group/authz.html b/ckan/templates_legacy/group/authz.html
deleted file mode 100644
index 63d955aa514..00000000000
--- a/ckan/templates_legacy/group/authz.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-
-  <py:def function="page_title">Authorization: ${c.group.display_name}</py:def>
-  <py:def function="page_heading">Authorization: ${c.group.display_name}</py:def>
-
-  <div py:match="content">
-    <h3>Update Existing Roles</h3>
-
-    <form id="theform" method="POST">
-      ${authz_form_table('theform', c.roles, c.users, c.user_role_dict)}
-      <button type="submit" name="save" class="btn btn-primary">
-        Save Changes
-      </button>
-      <div class="clear"></div>
-    </form>
-
-    <h3>Add Roles for Any User</h3>
-    <form id="addform" method="POST">
-      ${authz_add_table(c.roles)}
-      <button type="submit" name="add" class="btn btn-primary">Add Role</button>
-      <div class="clear"></div>
-    </form>
-
-  </div>
-
-  <xi:include href="layout.html" />
-</html>
diff --git a/ckan/templates_legacy/group/edit.html b/ckan/templates_legacy/group/edit.html
deleted file mode 100644
index 5456ce00356..00000000000
--- a/ckan/templates_legacy/group/edit.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-  
-  <py:def function="page_title">Edit: ${c.group.display_name}</py:def>
-  <py:def function="page_heading">Edit: ${c.group.display_name}</py:def>
-  <py:def function="body_class">${h.literal('no-sidebar')}</py:def>
-
-
-  <div py:match="content" class="group-edit-form">
-    ${Markup(c.form)}
-  </div>
-
-  <xi:include href="layout.html" />
-</html>
-
diff --git a/ckan/templates_legacy/group/edit_form.html b/ckan/templates_legacy/group/edit_form.html
deleted file mode 100644
index b56a61241ae..00000000000
--- a/ckan/templates_legacy/group/edit_form.html
+++ /dev/null
@@ -1,24 +0,0 @@
-    <form id="group-edit" action="" method="post"
-      xmlns:py="http://genshi.edgewall.org/"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      py:attrs="{'class':'has-errors'} if c.errors or c.fieldset.errors else {}"
-      >
-
-      ${h.literal(c.fieldset.render())}
-
-     <fieldset>
-      <legend>Datasets</legend>
-      <ul py:for="pkg in c.fieldset.model.packages">
-        <li>
-            <input checked="checked" id="Group-datasets-current" name="Group-packages-current" type="checkbox" value="${pkg.name}" />
-            <label for="Group-packages_${pkg.name}" style="display: inline;">${pkg.name}</label>
-        </li>
-      </ul>
-      <p py:if="not c.fieldset.model.packages">There are no datasets currently in this group.</p>
-     </fieldset>
-
-      ${h.literal(c.fieldset2.render())}
-
-      <br/>
-      ${h.submit('save', _('Save'))}
-    </form>
diff --git a/ckan/templates_legacy/group/history.html b/ckan/templates_legacy/group/history.html
deleted file mode 100644
index bde6ff1a768..00000000000
--- a/ckan/templates_legacy/group/history.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-  
-  <py:def function="page_title">History: ${c.group.display_name}</py:def>
-  <py:def function="page_heading">History: ${c.group.display_name}</py:def>
-
-  <div py:match="content" class="group">
-    <h3>
-      Revisions
-      <!--p class="atom-feed-link group-history-link">
-        <a
-          href="${h.url(controller='group', action='history', id=c.group_dict['name'], format='atom', days=7)}"
-          title="${g.site_title} - Group History - ${c.group_dict['name']}"
-          >
-          Subscribe &raquo;</a>
-      </p-->
-    </h3>
-    <form id="group-revisions" action="diff" method="post"
-      xmlns:py="http://genshi.edgewall.org/"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      > 
-
-      <h3 py:if="c.error" class="form-errors">
-        Error: ${c.error}
-      </h3>
-
-      <input type="hidden" name="group_name" value="${c.group_dict['name']}"/>
-
-      <table class="table table-bordered table-striped">
-        <tr>
-          <th></th><th>Revision</th><th>Timestamp</th><th>Author</th><th>Log Message</th>
-        </tr>
-        <py:for each="index, revision_dict in enumerate(c.group_revisions)">
-          <tr>
-            <td nowrap="nowrap">
-              ${h.radio("selected1", revision_dict['id'], checked=(index == 0))}
-              ${h.radio("selected2", revision_dict['id'], checked=(index == len(c.group_revisions)-1))}
-            </td>
-            <td>
-              <a href="${h.url_for(controller='revision',action='read',id=revision_dict['id'])}">${revision_dict['id']}</a>
-            </td>
-            <td>${revision_dict['timestamp']}</td>
-            <td>${h.linked_user(revision_dict['author'])}</td>
-            <td>${revision_dict['message']}</td>
-          </tr> 
-        </py:for>
-      </table>
-      <input type="submit" name="diff" value="${_('Compare &raquo;')}" class="btn primary" />
-    </form>
-  </div>
-
-  <py:def function="optional_feed">
-    <link rel="alternate" type="application/atom+xml" title="Group History"
-      href="${h.url(controller='group', action='history', id=c.group_dict['name'], format='atom', days=7)}" />
-  </py:def>
-
-  <xi:include href="layout.html" />
-</html>
diff --git a/ckan/templates_legacy/group/index.html b/ckan/templates_legacy/group/index.html
deleted file mode 100644
index 8502df970ce..00000000000
--- a/ckan/templates_legacy/group/index.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-  
-  <py:def function="page_title">Groups of Datasets</py:def>
-  <py:def function="page_heading">Groups of Datasets</py:def>
-
-  <py:match path="primarysidebar">
-    <li class="widget-container boxed widget_text">
-      <h3>What Are Groups?</h3>
-      <span i18n:msg="">Whilst tags are great at collecting datasets together, there are occasions when you want to restrict users from editing a collection. A <strong>group</strong> can be set-up to specify which users have permission to add or remove datasets from it.</span>
-    </li>
-  </py:match>
-
-  
-  <div py:match="content">
-    ${c.page.pager()}
-    ${group_list_from_dict(c.page.items)}
-    ${c.page.pager()}
-  </div>
-
-  <xi:include href="layout.html" />
-</html>
diff --git a/ckan/templates_legacy/group/layout.html b/ckan/templates_legacy/group/layout.html
deleted file mode 100644
index 3484ba293ee..00000000000
--- a/ckan/templates_legacy/group/layout.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip=""
-  >
-
-  <py:match path="minornavigation">
-    <ul class="nav nav-pills" py:choose="bool(c.group)">
-      <py:when test="True" py:with="can_update=h.check_access('group_update',{'id':c.group.id})">
-        <li class="${'active' if c.action=='read' else ''}">${h.subnav_named_route(h.icon('group') + _('View'), c.group.type + '_read',controller='group', action='read', id=c.group.name)}</li>
-        <li class="${'active' if c.action=='history' else ''}">${h.subnav_named_route(h.icon('page_white_stack') + _('History'),  c.group.type + '_action', controller='group', action='history', id=c.group.name)}</li>
-        <li class="divider" py:if="can_update">|</li>
-        <li class="dropdown ${'active' if c.action=='resource_read' else ''}" py:if="can_update">
-          <a class="dropdown-toggle" data-toggle="dropdown" href="#">${h.icon('add') + _('Add Dataset')}<b class="caret"></b></a>
-          <ul class="dropdown-menu">
-            <li><a href="${h.url_for(controller='package', action='new')}?groups__0__id=${c.group.id}">New Dataset...</a></li>
-            <li><a href="${h.url_for(controller='group', action='edit', id=c.group.name)}#datasets">Existing Dataset...</a></li>
-          </ul>
-        </li>
-        <li class="${'active' if c.action=='edit' else ''}" py:if="can_update">
-          <!-- TODO: We need to be able to change the URL below based on the type of the group -->
-          ${h.subnav_named_route(h.icon('group_edit') + _('Edit'), c.group.type + '_action', action='edit', id=c.group.name )}
-        </li>
-      </py:when>
-      <py:otherwise>
-        <li class="${'active' if c.action=='index' else ''}">
-          ${h.subnav_named_route(h.icon('group') + _('List Groups'), "%s_index" % h.default_group_type(), action="index" )}
-        </li>
-        <li style="display:none;" class="ckan-logged-in ${'active' if c.action=='new' else ''}">
-          ${ h.subnav_named_route(h.icon('group_add') + _('Add a Group'), "%s_new" % h.default_group_type(), action='new')}
-        </li>
-        <li class="ckan-logged-out ${'active' if c.action=='new' else ''}">
-          ${h.nav_link(h.icon('group_add') + _('Login to Add a Group'), controller='group', action='new')}
-        </li>
-      </py:otherwise>
-    </ul>
-  </py:match>
-
-  <xi:include href="../layout.html" />
-</html>
diff --git a/ckan/templates_legacy/group/new.html b/ckan/templates_legacy/group/new.html
deleted file mode 100644
index 3cbd4b972b8..00000000000
--- a/ckan/templates_legacy/group/new.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-  
-  <py:def function="page_title">Add A Group</py:def>
-  <py:def function="page_heading">Add A Group</py:def>
-
-  <div py:match="content" class="group-create-form">
-    ${Markup(c.form)}
-  </div>
-
-  <xi:include href="layout.html" />
-</html>
-
diff --git a/ckan/templates_legacy/group/new_group_form.html b/ckan/templates_legacy/group/new_group_form.html
deleted file mode 100644
index 9abc6c13cc2..00000000000
--- a/ckan/templates_legacy/group/new_group_form.html
+++ /dev/null
@@ -1,131 +0,0 @@
-<form
-  class="form-horizontal ${'has-errors' if errors else ''}"
-  id="group-edit"
-  action=""
-  method="post"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<xi:include href="../_util.html" />
-
-<div class="error-explanation" py:if="error_summary">
-<h2>Errors in form</h2>
-<p>The form contains invalid entries:</p>
-<ul>
-  <li py:for="key, error in error_summary.items()">${"%s: %s" % (key if not key=='Name' else 'URL', error)}</li>
-</ul>
-</div>
-
-<fieldset id="basic-information">
-  <div class="control-group">
-    <label for="name" class="control-label">Title</label>
-    <div class="controls">
-      <input class="js-title" id="title" name="title" type="text" value="${data.get('title', '')}"/>
-    </div>
-  </div>
-  <div class="control-group">
-    <label for="title" class="control-label">Url</label>
-    <div class="controls">
-      <div class="input-prepend">
-        <span class="add-on">${h.url(controller='group', action='index')+'/'}</span>
-        <input maxlength="100" name="name" type="text" class="js-url-input" value="${data.get('name', '')}" />
-      </div>
-      <p class="js-url-is-valid">&nbsp;</p>
-      <p class="url-is-long">Warning: URL is very long. Consider changing it to something shorter.</p>
-      <p>2+ characters, lowercase, using only 'a-z0-9' and '-_'</p>
-      <p class="field_error" py:if="errors.get('name', '')">${errors.get('name', '')}</p>
-    </div>
-  </div>
-  <div class="control-group">
-    <label for="" class="control-label">Description</label>
-    <div class="controls">
-      ${markdown_editor('description', data.get('description'), 'notes', _('Start with a summary sentence ...'))}
-    </div>
-  </div>
-  <div class="control-group">
-    <label for="name" class="control-label">Image URL:</label>
-    <div class="controls">
-      <input id="image_url" name="image_url" type="text" value="${data.get('image_url', '')}"/>
-      <p>The URL for the image that is associated with this group.</p>
-    </div>
-  </div>
-  <div class="state-field control-group" py:if="c.is_sysadmin or c.auth_for_change_state">
-    <label for="" class="control-label">State</label>
-    <div class="controls">
-      <select id="state" name="state" >
-        <option py:attrs="{'selected': 'selected' if data.get('state') == 'active' else None}" value="active">active</option>
-        <option py:attrs="{'selected': 'selected' if data.get('state') == 'deleted' else None}" value="deleted">deleted</option>
-      </select>
-    </div>
-  </div>
-</fieldset>
-
-<fieldset id="extras">
-  <h3>Extras</h3>
-  <dl>
-    <py:with vars="extras = data.get('extras', [])">
-    <py:for each="num, extra in enumerate(data.get('extras', []))">
-    <div class="control-group">
-      <label class="control-label" for="extras__${num}__value">${extra.get('key')}</label>
-      <div class="controls">
-        <input id="extras__${num}__key" name="extras__${num}__key" type="hidden" value="${extra.get('key')}" />
-        <input id="extras__${num}__value" name="extras__${num}__value" type="text" value="${extra.get('value')}" />
-        <label class="checkbox" style="display: inline-block;">
-          <input type="checkbox" name="extras__${num}__deleted" checked="${extra.get('deleted')}" />Delete
-        </label>
-      </div>
-    </div>
-    </py:for>
-    <hr py:if="len(extras)" class="extras-divider" />
-    <py:for each="num in range(len(extras), len(extras) + 4)">
-      <div class="control-group">
-        <label class="control-label" for="extras__${num}__key">Add...</label>
-        <div class="controls">
-          <label>
-            <span class="extras-label">Key =</span>
-            <input class="medium-width" id="extras__${num}__key" name="extras__${num}__key" type="text" />
-          </label>
-          <label>
-            <span class="extras-label">Value =</span>
-            <input class="medium-width" id="extras__${num}__value" name="extras__${num}__value" type="text" />
-          </label>
-        </div>
-      </div>
-    </py:for>
-    </py:with>
-  </dl>
-</fieldset>
-
-<fieldset id="datasets">
-  <h3>Datasets</h3>
-  <div py:if="data.get('packages')">
-    <py:for each="num, package in enumerate(data.get('packages'))">
-      <div class="control-group">
-        <div class="controls">
-          <div class="checkbox">
-            <input value="${package['name']}" checked="checked" id="datasets__${num}__name" name="packages__${num}__name" type="checkbox" />
-            <label for="packages__${num}__name">${package['name']}</label>
-          </div>
-        </div>
-      </div>
-    </py:for>
-  </div>
-  <p py:if="not data.get('packages')">There are no datasets currently in this group.</p>
-
-  <h3>Add datasets</h3>
-  <div class="control-group">
-    <label class="control-label" for="packages__${len(data.get('packages', []))}__name">Dataset</label>
-    <div class="controls">
-      <input class="autocomplete-dataset" id="datasets__${len(data.get('packages', []))}__name" name="packages__${len(data.get('packages', []))}__name" type="text" />
-    </div>
-  </div>
-</fieldset>
-
-<div class="form-actions">
-  <input id="save" class="btn btn-primary" name="save" type="submit" value="${_('Save Changes')}" />
-  <py:if test="c.group">
-    <input id="cancel" class="btn href-action" name="cancel" type="reset" value="${_('Cancel')}" action="${h.url_for(controller='group', action='read', id=c.group.name)}" />
-  </py:if>
-</div>
-</form>
diff --git a/ckan/templates_legacy/group/read.html b/ckan/templates_legacy/group/read.html
deleted file mode 100644
index c6c5839cc61..00000000000
--- a/ckan/templates_legacy/group/read.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-  
-  <xi:include href="../facets.html" />
-
-  <py:def function="page_title">${c.group_dict.display_name}</py:def>
-  <py:def function="page_heading">${c.group_dict.display_name}</py:def>
-  <py:if test="c.group.image_url">
-    <py:def function="page_logo">${c.group.image_url}</py:def>
-  </py:if>
-
-  <py:match path="primarysidebar">
-  
-    <li class="widget-container widget_text">
-      <ul class="property-list">
-        <py:if test="c.group_admins">
-        <li>
-        <h3>Administrators</h3> 
-          <ul class="no-break">
-            <li py:for="admin in c.group_admins">${h.linked_user(admin)}</li>
-          </ul>
-        </li>
-        </py:if>
-      </ul>
-    </li>
-    ${facet_div('tags', _('Tags'))}
-    ${facet_div('res_format', _('Resource Formats'))}
-  </py:match>
-
-  <py:match path="content">
-    <h3 py:if="c.group['state'] != 'active'">State: ${c.group['state']}</h3>
-    <div class="notes" py:if="str(c.description_formatted).strip()">
-      <div id="notes-extract">
-        ${c.description_formatted}
-      </div>
-      <div id="notes-remainder"></div>
-      <div id="notes-toggle" style="display: none;">
-        <button class="more btn"><img src="/images/chevron-down.png"/></button>
-        <button class="less btn" style="display: none;"><img src="/images/chevron-up.png"/></button>
-      </div>
-    </div>
-    <div class="group-dataset-list">
-      <h3>Datasets</h3>
-  <xi:include href="../package/search_form.html" />
-      ${field_list()}   
-
-      <p i18n:msg="query, number_of_results"><span py:if="c.q">You searched for "${c.q}". </span>${c.page.item_count} datasets found.</p>
-      ${c.page.pager()}
-      ${package_list_from_dict(c.page.items)}
-      ${c.page.pager()}
-    </div>
-  </py:match>
-
-  <py:def function="optional_feed">
-  <link rel="alternate" type="application/atom+xml" title="${g.site_title} - Datasets in group '${c.group['title']}'"
-    href="${h.url(controller='feed', action='group', id=c.group['name'])}" />
-  <link rel="alternate" type="application/atom+xml" title="${g.site_title} - Recent Revision History"
-    href="${h.url_for(controller='revision', action='list', format='atom', days=1)}" />
-  </py:def>
-
-  <xi:include href="layout.html" />
-</html>
-
-
diff --git a/ckan/templates_legacy/home/__init__.py b/ckan/templates_legacy/home/__init__.py
deleted file mode 100644
index 3c43ff00baa..00000000000
--- a/ckan/templates_legacy/home/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# empty file needed for pylons to find templates in this directory
\ No newline at end of file
diff --git a/ckan/templates_legacy/home/about.html b/ckan/templates_legacy/home/about.html
deleted file mode 100644
index 05b5bc99fb3..00000000000
--- a/ckan/templates_legacy/home/about.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-  
-  <py:def function="page_title">About</py:def>
-
-  <div py:match="content">
-    <h2>About ${g.site_title}</h2>
-    
-    <py:choose>
-    <py:when test="not g.site_about">
-
-      <p i18n:msg="">What was the <a href="http://thedatahub.org/dataset/house-prices-uk-from-1930">average price</a> of a house in the UK in 1935? When will India's projected population <a href="http://thedatahub.org/dataset/guardian-population-unitednations">overtake</a> that of China? Where can you see <a href="http://thedatahub.org/dataset/seattle-public-art">publicly-funded art</a> in Seattle? Data to answer many, many questions like these is out there on the Internet somewhere - but it is not always easy to find.</p>
-
-      <p i18n:msg="site_title, site_title">${g.site_title} is a community-run catalogue of useful sets of data on the Internet. You can collect links here to data from around the web for yourself and others to use, or search for data that others have collected. Depending on the type of data (and its conditions of use), ${g.site_title} may also be able to store a copy of the data or host it in a database, and provide some basic visualisation tools.</p>
-    </py:when>
-    <py:otherwise>
-      <p>${Markup(g.site_about.replace('${g.site_title}', g.site_title))}</p>
-    </py:otherwise>
-    </py:choose>
-
-    <h2>How it works</h2>
-
-    <p i18n:msg="ckan">This site is running a powerful piece of open-source data cataloguing software called <a href="http://ckan.org">CKAN</a>, written and maintained by the <a href="http://okfn.org">Open Knowledge Foundation</a>. Each 'dataset' record on CKAN contains a description of the data and other useful information, such as what formats it is available in, who owns it and whether it is freely available, and what subject areas the data is about. Other users can improve or add to this information (CKAN keeps a fully versioned history).</p>
-
-    <p i18n:msg="">CKAN powers a number of data catalogues on the Internet. <a href="http://thedatahub.org">The Data Hub</a> is an openly editable open data catalogue, in the style of Wikipedia. The UK Government uses CKAN to run <a href="http://data.gov.uk/">data.gov.uk</a>, which currently lists 8,000 government datasets. Official public data from most European countries is listed in a CKAN catalogue at <a href="http://publicdata.eu/">publicdata.eu</a>. There is a comprehensive list of catalogues like these around the world at <a href="http://datacatalogs.org/">datacatalogs.org</a>, which is itself powered by CKAN.
-</p>
-
-    <h2>Open data and the Open Knowledge Foundation</h2>
-
-    <p i18n:msg="site_title">Most of the data indexed at ${g.site_title} is openly licensed, meaning anyone is free to use or re-use it however they like. Perhaps someone will take that nice dataset of a city's public art that you found, and add it to a tourist map - or even make a neat app for your phone that'll help you find artworks when you visit the city. Open data means more enterprise, collaborative science and transparent government. You can read more about open data in the <a href="http://opendatahandbook.org" >Open Data Handbook</a>.</p>
-
-    <p i18n:msg="">The <a href="http://okfn.org">Open Knowledge Foundation</a> is a non-profit organisation <a href="http://okfn.org/about/vision/">promoting</a> open knowledge: writing and improving CKAN is one of the ways we do that. If you want to get involved with its design or code, join the discussion or development <a href="http://ckan.org/contact/">mailing lists</a>, or take a look at the <a href="http://okfn.org">OKFN</a> site to find out about our other projects.</p>
-
-	</div>
-
-  <xi:include href="layout.html" />
-</html>
diff --git a/ckan/templates_legacy/home/index.html b/ckan/templates_legacy/home/index.html
deleted file mode 100644
index 540deecf38a..00000000000
--- a/ckan/templates_legacy/home/index.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip=""
-  >
-
-  <py:def function="body_class">${h.literal('no-sidebar')}</py:def>
- 
-  <py:def function="page_title">Welcome</py:def>
-
-  <div py:match="//div[@id='content']" class="front-page">
-    <div>
-      <h1 class="page_heading">Welcome to ${g.site_title}!</h1>
-    </div>
-    <div class="row">
-      <div class="span4">
-        <div class="action-box">
-          <div class="action-box-inner find clearfix">
-            <h1>Find data</h1>
-
-            <form action="${h.url_for(controller='package', action='search')}" method="GET"> 
-              <input name="q" value="" class="search-field" placeholder="${_('Find datasets')}" /> 
-            </form> 
-            <p>${g.site_title} contains <a href="${h.url_for(controller='package', action='search')}">${c.package_count} datasets</a> that you can 
-            browse, learn about and download.</p>
-          </div>
-        </div>
-      </div>
-      <div class="span4">
-        <div class="action-box">
-          <div class="action-box-inner share clearfix">
-          <h1>Share data</h1>
-
-          <p>Add your own datasets to share them with others and
-          to find other people interested in your data.</p>
-          
-          <py:choose test="h.check_access('package_create')">
-            <a py:when="" href="${h.url_for(controller='package', action='new')}" class="create-button">Create a dataset &raquo;</a>
-            <py:otherwise>
-              <a href="${h.url_for(controller='user', action='login')}" class="create-button">Sign up &raquo;</a>
-            </py:otherwise>
-          </py:choose>
-          </div>
-        </div>
-      </div>
-      <div class="span4">
-        <div class="action-box">
-          <div class="action-box-inner collaborate clearfix">
-          <h1>Collaborate</h1>
-
-          <p>Find out more about working with open data by exploring 
-          these resources:</p>
-          <ul>
-            <li><a href="http://getthedata.org">GetTheData.org</a></li>
-            <li><a href="http://datapatterns.org">DataPatterns.org</a></li>
-            <li><a href="http://opendatahandbook.org">Open Data Handbook</a></li>
-          </ul>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div py:if="c.groups" class="row whoelse">
-      <div class="span12">
-        <h2>Who else is here?</h2>
-      </div>
-    </div>
-    <div class="row">
-      <py:for each="i, group_dict in enumerate(c.groups[:6])">
-        <div class="span4">
-          <div class="group">
-            <h3><a href="${h.url_for(controller='group', action='read', id=group_dict['name'])}">${group_dict['title']}</a></h3>
-            <p>
-              ${h.markdown_extract(group_dict['description'])}
-            </p>
-            <strong>${group_dict['title']} has ${group_dict['packages']} datasets.</strong>
-          </div>
-        </div>
-      </py:for>
-    </div>
-  </div>
-  <xi:include href="layout.html" />
-</html>
-
diff --git a/ckan/templates_legacy/home/layout.html b/ckan/templates_legacy/home/layout.html
deleted file mode 100644
index 28294f7b7a6..00000000000
--- a/ckan/templates_legacy/home/layout.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip=""
-  >
-  
-  <xi:include href="../layout.html" />
-</html>
diff --git a/ckan/templates_legacy/importer/__init__.py b/ckan/templates_legacy/importer/__init__.py
deleted file mode 100644
index b646540d6be..00000000000
--- a/ckan/templates_legacy/importer/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# empty file needed for pylons to find templates in this directory
diff --git a/ckan/templates_legacy/importer/importer.html b/ckan/templates_legacy/importer/importer.html
deleted file mode 100644
index f4ee91111fd..00000000000
--- a/ckan/templates_legacy/importer/importer.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-  
-  <py:def function="page_title">Importer</py:def>
-
-  <div py:match="content">
-    <h2>Import Datasets</h2>
-    <p>Here you can supply an Excel file with details of multiple datasets and import these into ${g.site_title}.</p>
-    <div>
-      <h3 py:if="c.error" class="form-errors">
-        Error: ${c.error}
-      </h3>
-
-      <h3 py:if="c.message">
-        ${c.message}
-      </h3>
-
-      ${h.form(h.url_for(controller='importer', action='preview'), multipart=True, id='import')}
-      <span class="ckan_logged_in" style="display: none;">
-	<div>
-          <?python enable_preview = {'disabled':'disabled'} if not c.user else {} ?>
-          ${h.file(name='file', **enable_preview)}
-	</div>
-	<p>
-          ${h.submit('preview', _('Preview'), **enable_preview)}
-	</p>
-      </span>
-      <span class="ckan_logged_out">
-        <p><strong>Log in to use this tool</strong></p>
-      </span>
-      ${h.end_form()}
-
-    </div>
-
-  </div>
-
-  <xi:include href="../layout.html" />
-</html>
diff --git a/ckan/templates_legacy/importer/preview.html b/ckan/templates_legacy/importer/preview.html
deleted file mode 100644
index a0b039fd3a3..00000000000
--- a/ckan/templates_legacy/importer/preview.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-  
-  <py:def function="page_title">Preview - Importer</py:def>
-
-  <div py:match="content">
-    <h2>Import Preview</h2>
-    <div>
-      <h3 py:if="c.error" class="form-errors">
-        Error: ${c.error}
-      </h3>
-
-      ${h.form(h.url_for(controller='importer', action='do_import'), multipart=True, id='import-preview')}
-          <p>${c.num_pkgs} dataset${'s' if c.num_pkgs != 1 else ''} read from ${c.import_filename}:</p>
-
-          <py:for each="pkg in c.import_previews">
-            <div>
-              ${pkg}
-            </div>
-          </py:for>
-
-          <py:if test="c.pkgs_suppressed">
-            <p>Further dataset previews not shown.</p>
-          </py:if>
-
-          <label for="log_message">Edit summary (briefly describe the changes you have made)</label>
-          <textarea id="log_message" name="log_message" class="short wide">${c.log_message}</textarea>
-          <p>Author: ${c.author}</p>
-
-          <div>          
-            <?python enable_import = {'disabled':'disabled'} if not (c.user and c.import_previews) and not c.errors else {} ?>
-            ${h.submit('import', _('Import'), **enable_import)}
-          </div>
-
-        ${h.end_form()}
-
-    </div>
-
-  </div>
-
-  <xi:include href="../layout.html" />
-</html>
diff --git a/ckan/templates_legacy/importer/result.html b/ckan/templates_legacy/importer/result.html
deleted file mode 100644
index 44c4a506993..00000000000
--- a/ckan/templates_legacy/importer/result.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-  
-  <py:def function="page_title">Results - Importer</py:def>
-
-  <div py:match="content">
-    <h2>Import Results</h2>
-    <div>
-
-      <h3 py:if="c.error" class="form-errors">
-        Error: ${c.error}
-      </h3>
-
-      <h3 py:if="c.message">
-        ${c.message}
-      </h3>
-
-    </div>
-
-  </div>
-
-  <xi:include href="../layout.html" />
-</html>
diff --git a/ckan/templates_legacy/js_strings.html b/ckan/templates_legacy/js_strings.html
deleted file mode 100644
index 96060be00bc..00000000000
--- a/ckan/templates_legacy/js_strings.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<script type="text/javascript"
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:py="http://genshi.edgewall.org/"
-  >
-
-  /* 
-   * Included as inline javascript in layout_base.html. Simpler than 
-   * trying to trick the translation system into reading a js file. 
-   */
-  var CKAN = CKAN || {};
-  CKAN.Strings = CKAN.Strings || {};
-
-  /*
-   * Used in application.js.
-   */
-  CKAN.Strings = ${
-    h.dump_json(dict(
-      checking = _('Checking...'),
-      urlIsTooShort = _('Type at least two characters...'),
-      urlIsUnchanged = _('This is the current URL.'),
-      urlIsAvailable = _('This URL is available!'),
-      urlIsNotAvailable = _('This URL is already used, please use a different one.'),
-      failedToSave = _('Failed to save, possibly due to invalid data '),
-      addDataset = _('Add Dataset'),
-      addGroup = _('Add Group'),
-      youHaveUnsavedChanges = _("You have unsaved changes. Make sure to click 'Save Changes' below before leaving this page."),
-      loading = _('Loading...'),
-      noNameBrackets = _('(no name)'),
-      deleteThisResourceQuestion = _('Delete the resource \'%name%\'?'),
-      previewNotAvailableForDataType = _('Preview not available for data type: '),
-      failedToGetCredentialsForUpload = _('Failed to get credentials for storage upload. Upload cannot proceed'),
-      checkingUploadPermissions = _('Checking upload permissions ...'),
-      uploadingFile = _('Uploading file ...'),
-      dataFile = _('Data File'),
-      api = _('API'),
-      visualization = _('Visualization'),
-      image = _('Image'),
-      metadata = _('Metadata'),
-      documentation = _('Documentation'),
-      code = _('Code'),
-      example = _('Example'),
-
-      upload = _('Upload'),
-      cancel = _('Cancel'),
-      name = _('Name'),
-      description = _('Description'),
-      url = _('Url'),
-      format = _('Format'),
-      resourceType = _('Resource Type'),
-      datastoreEnabled = _('DataStore enabled'),
-      sizeBracketsBytes = _('Size (Bytes)'),
-      mimetype = _('Mimetype'),
-      created = _('Created'),
-      lastModified = _('Last Modified'),
-      mimetypeInner = _('Mimetype (Inner)'),
-      hash = _('Hash'),
-      id = _('ID'),
-      doneEditing = _('Done'),
-      resourceHasUnsavedChanges = _('This resource has unsaved changes.'),
-      edit = _('Edit'),
-      preview = _('Preview'),
-      resourceFormatPlaceholder = _('e.g. csv, html, xls, rdf, ...'),
-      unknown = _('Unknown'),
-      extraFields = _('Extra Fields'),
-      addExtraField = _('Add Extra Field'),
-      key = _('Key'),
-      value = _('Value'),
-      deleteResource = _('Delete Resource'),
-      youCanUseMarkdown = _('You can use %aMarkdown formatting%b here.'),
-      datesAreInISO = _('Dates are in %aISO Format%b &mdash; eg. %c2012-12-25%d or %c2010-05-31T14:30%d.'),
-      dataFileUploaded = _('Data File (Uploaded)'),
-      follow = _('Follow'),
-      unfollow = _('Unfollow'),
-      errorLoadingPreview = _('Could not load preview'),
-      errorDataProxy = _('DataProxy returned an error'),
-      errorDataStore = _('DataStore returned an error')
-    ), indent=4)}
-
-</script>
-
diff --git a/ckan/templates_legacy/layout.html b/ckan/templates_legacy/layout.html
deleted file mode 100644
index a2d4770b993..00000000000
--- a/ckan/templates_legacy/layout.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:py="http://genshi.edgewall.org/" 
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-  <xi:include href="layout_base.html" />
-</html>
diff --git a/ckan/templates_legacy/layout_base.html b/ckan/templates_legacy/layout_base.html
deleted file mode 100644
index 11818927092..00000000000
--- a/ckan/templates_legacy/layout_base.html
+++ /dev/null
@@ -1,281 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!--[if IE 8 ]>    <html class="no-js ie8" lang="en"> <![endif]-->
-  <!--[if (gte IE 9)|!(IE)]><!--> <html class="no-js" lang="en"
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:i18n="http://genshi.edgewall.org/i18n"
-      xmlns:py="http://genshi.edgewall.org/"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      > <!--<![endif]-->
-<xi:include href="_util.html" />
-<head>
-  <meta charset="utf-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-
-  <title>${page_title()} - ${g.site_title}</title>
-  <meta name="description" content="" />
-  <meta name="author" content="" />
-
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <link rel="shortcut icon" href="${h.url_for_static_or_external(g.favicon)}" />
-
-  <py:choose>
-  <py:when test="defined('optional_feed')">
-    ${optional_feed()}
-  </py:when>
-  <py:otherwise>
-  <link rel="alternate" type="application/atom+xml" title="${g.site_title} - Recent Revision History" href="${h.url_for(controller='revision', action='list', format='atom', days=1)}" />
-  </py:otherwise>
-  </py:choose>
-  <link href='http://fonts.googleapis.com/css?family=Ubuntu:400,700' rel='stylesheet' type='text/css' />
-
-  <link rel="stylesheet" href="${h.url_for_static('/scripts/vendor/jqueryui/1.8.14/css/jquery-ui.custom.css')}" type="text/css" media="screen, print" />
-  <link rel="stylesheet" href="${h.url_for_static('/css/bootstrap.min.css')}" type="text/css" media="screen, projection" />
-  <link rel="stylesheet" href="${h.url_for_static('/css/chosen.css')}" type="text/css" />
-  <link rel="stylesheet" href="${h.url_for_static('/css/style.css?v=2')}" />
-  ${jsConditionalForIe(9, '&lt;script type="text/javascript" src="' + h.url_for_static('/scripts/vendor/html5shiv/html5.js') + '"&gt;&lt;/script&gt;')}
-
-  <py:if test="defined('optional_head')">
-    ${optional_head()}
-  </py:if>
-
-  ${h.literal(getattr(g, 'template_head_end', ''))}
-</head>
-
-<body class="${request.environ.get('pylons.routes_dict', {}).get('action')}
-             ${request.environ.get('pylons.routes_dict', {}).get('controller').split(':')[-1]}
-             ${defined('body_class') and body_class()}
-  ">
-
-  <div id="wrap">
-    <div class="header outer">
-      <header class="container">
-        <div class="menu account">
-          <span class="ckan-logged-in" style="display: none;">
-            <a href="${h.url_for(controller='user',action='me')}">${h.gravatar((c.userobj.email_hash if c and c.userobj else ''),size=20)}${c.user}</a>
-            <a href="${h.url_for('/user/_logout')}">Logout</a>
-          </span>
-          <span class="ckan-logged-out">
-            <a href="${h.url_for(controller='user',action='login')}">Login</a>
-            <a href="${h.url_for(controller='user',action='register')}">Register</a>
-          </span>
-        </div>
-        <a href="${h.url('home')}">
-          <img width="64" src="${h.url_for_static_or_external(g.site_logo)}" alt="${g.site_title} Logo" title="${g.site_title} Logo" id="logo" />
-        </a>
-        <div id="site-name">
-          <a href="${h.url('home')}">${g.site_title} &mdash; ${g.site_description}</a>
-        </div>
-        <div class="menu">
-          <span id="menusearch">
-            <form action="${h.url(controller='package', action='search')}" method="GET">
-              <input name="q" value="${c.q if hasattr(c, 'q') else ''}" class="search" placeholder="${_('Find datasets')}" />
-            </form>
-          </span>
-          <div id="mainmenu">
-            <span py:if="h.check_access('package_create')">${h.nav_link(_('Add a dataset'), controller='package', action='new')}</span>
-            ${h.nav_link(_('Search'), controller='package', action='search', highlight_actions = 'new index')}
-            ${h.nav_link(_('Groups'), named_route='%s_index' % h.default_group_type())}
-            ${h.nav_link(_('About'), controller='home', action='about')}
-          </div>
-        </div>
-      </header>
-    </div>
-    <py:with vars="messages = list(h.flash.pop_messages())">
-    <div class="flash-messages container">
-      <div class="alert ${m.category}" py:for="m in messages">
-        ${h.literal(m)}
-      </div>
-    </div>
-    </py:with>
-
-    <div id="main" class="container" role="main">
-      <h1 py:if="defined('page_heading')" class="page_heading">
-        <img py:if="defined('page_logo')" id="page-logo" src="${page_logo()}" alt="Page Logo" />
-        ${page_heading()}
-      </h1>
-      <div class="row">
-        <div class="span12">
-          <div id="minornavigation">
-              <minornavigation></minornavigation>
-          </div>
-        </div>
-      </div>
-
-      <div class="row">
-        <div class="span9 content-outer">
-          <div id="content">
-            <py:if test="defined('content')">
-              ${content()}
-            </py:if>
-            <content>
-              <p>Master content template placeholder &hellip; please replace me.</p>
-            </content>
-          </div> <!-- /content -->
-        </div>
-        <div class="span3 sidebar-outer">
-          <div id="sidebar">
-            <ul class="widget-list">
-              <py:if test="defined('primary_sidebar_extras')">
-                ${primary_sidebar_extras()}
-              </py:if>
-              <primarysidebar>
-                <!-- Primary Side Bar Goes Here -->
-              </primarysidebar>
-            </ul>
-          </div>
-        </div>
-      </div>
-    </div>
-    <br/><br/>
-  </div>
-  <div class="clearfix"></div>
-  <div class="footer outer">
-    <footer class="container">
-      <div class="row">
-        <div class="span3">
-          <h3 class="widget-title">About ${g.site_title}</h3>
-          <div class="textwidget">
-            <ul>
-                <li>${h.link_to(_('About'), h.url_for(controller='home', action='about'))}</li>
-              <li>
-                <a href="http://twitter.com/ckanproject">Twitter @ckanproject</a>
-              </li>
-                <li>${h.link_to(_('API'), h.url_for(controller='api', action='get_api', ver=1))}</li>
-                <li>${h.link_to(_('API Docs'), 'http://docs.ckan.org/en/latest/api/')}</li>
-              <li>
-                <a href="http://ckan.org/contact/">Contact Us</a>
-              </li>
-              <li>
-                <a href="http://okfn.org/privacy-policy/">Privacy Policy</a>
-              </li>
-            </ul>
-          </div>
-        </div>
-        <div class="span3">
-          <h3 class="widget-title">Sections</h3>
-          <div class="textwidget">
-            <ul>
-              <li>
-                <a href="${h.url(controller='user', action='index')}">
-                  Users
-                </a>
-              </li>
-              <li>
-                <a href="${h.url(controller='tag', action='index')}">
-                  Tags
-                </a>
-              </li>
-              <li py:if="'stats' in config.get('ckan.plugins','').split(' ')">
-                <a href="${h.url('stats')}">
-                  Statistics
-                </a>
-              </li>
-              <li>
-                <a href="${h.url(controller='revision', action='index')}">
-                  Revisions
-                </a>
-              </li>
-              <li>
-                <a href="${h.url_for('ckanadmin_index')}">
-                  Site Admin
-                </a>
-              </li>
-            </ul>
-          </div>
-        </div>
-        <div class="span3">
-          <h3 class="widget-title">Languages</h3>
-          <div class="textwidget">
-            <ul>
-<?python
-  current_url = request.environ['CKAN_CURRENT_URL']
-?>
-              <li py:for="locale in h.get_available_locales()">
-              <a href="${h.url(current_url, locale=str(locale))}">
-                  ${locale.display_name or locale.english_name}
-                </a>
-              </li>
-            </ul>
-          </div>
-        </div>
-        <div class="span3">
-          <h3 class="widget-title">Meta</h3>
-          <p id="credits">
-            &copy; 2012
-            <img src="http://assets.okfn.org/images/logo/okf_logo_white_and_green_tiny.png" id="footer-okf-logo" />
-            <a href="http://okfn.org/">Open Knowledge Foundation</a>
-            Licensed under the <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Database License</a>
-            <a href="http://opendefinition.org/"><img alt="This Content and Data is Open" src="http://assets.okfn.org/images/ok_buttons/od_80x15_blue.png" style="border: none;"/></a>
-
-            <br/><br/>
-            Powered by <a href="http://ckan.org">CKAN</a> v${c.__version__}.<br/>
-          </p>
-        </div>
-      </div>
-    </footer>
-  </div> <!-- eo #container -->
-  
-  <div style="display:none;" id="scripts">
-  <script src="${h.url_for_static('/scripts/vendor/jquery/1.7.1/jquery.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/json2.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/jquery.tmpl/beta1/jquery.tmpl.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/jquery.cookie/jquery.cookie.min.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/jquery.chosen/0.9.7/chosen.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/jquery.placeholder/jquery.placeholder.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/jqueryui/1.8.14/jquery-ui.min.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/bootstrap/2.0.3/bootstrap.min.js')}"></script>
-
-  <!-- for application.js -->
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/underscore/1.1.6/underscore.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/backbone/0.5.1/backbone.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/jquery.fileupload/20110801/jquery.iframe-transport.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/jquery.fileupload/20110801/jquery.fileupload.js')}"></script>
-
-  <!-- Translated js strings live inside an html template. -->
-  <xi:include href="js_strings.html" />
-  <!-- finally our application js that sets everything up-->
-  <script type="text/javascript" src="${h.url_for_static('/scripts/application.js?lang=${c.locale}')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/templates.js')}"></script>
-
-  <script type="text/javascript">
-    CKAN.plugins = [
-      // Declare js array from Python string
-      ${['\'%s\', '%s  for s in config.get('ckan.plugins','').split(' ')]}
-    ];
-    <py:if test="config.get('ckan.storage.bucket', '')">
-    CKAN.plugins.push('storage');
-    </py:if>
-    CKAN.SITE_URL = '${h.url('/')}';
-    CKAN.SITE_URL_NO_LOCALE = '${h.url('/', locale='default')}';
-    CKAN.LANG = '${h.lang()}';
-    // later use will add offsets with leading '/' so ensure no trailing slash
-    CKAN.SITE_URL = CKAN.SITE_URL.replace(/\/$/, '');
-    CKAN.SITE_URL_NO_LOCALE = CKAN.SITE_URL_NO_LOCALE.replace(/\/$/, '');
-    $(document).ready(function() {
-        var ckan_user = '${c.user}';
-        if (ckan_user) {
-            $(".ckan-logged-out").hide();
-            $(".ckan-logged-in").show();
-        }
-        $('input[placeholder], textarea[placeholder]').placeholder();
-
-		$(".chzn-select").chosen();
-    });
-  </script>
-
-  <py:if test="h.asbool(config.get('ckan.tracking_enabled', 'false'))">
-	${ h.snippet('snippets/internal-tracking.html') }
-  </py:if>
-  </div> <!-- #scripts -->
-
-  <py:if test="defined('optional_footer')">
-    ${optional_footer()}
-  </py:if>
-
-${h.literal(getattr(g, 'template_footer_end', ''))}
-</body>
-</html>
-
-
-
diff --git a/ckan/templates_legacy/package/__init__.py b/ckan/templates_legacy/package/__init__.py
deleted file mode 100644
index b646540d6be..00000000000
--- a/ckan/templates_legacy/package/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# empty file needed for pylons to find templates in this directory
diff --git a/ckan/templates_legacy/package/authz.html b/ckan/templates_legacy/package/authz.html
deleted file mode 100644
index 97c6772194a..00000000000
--- a/ckan/templates_legacy/package/authz.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-
-  <py:def function="page_title">Authorization: ${c.pkgtitle or c.pkgname}</py:def>
-  <py:def function="page_heading">Authorization: ${c.pkgtitle or c.pkgname}</py:def>
-
-  <div py:match="content">
-    <h3>Update Existing Roles</h3>
-
-    <form id="theform" method="POST">
-      ${authz_form_table('theform', c.roles, c.users, c.user_role_dict)}
-      <button type="submit" name="save" class="btn btn-primary">
-        Save Changes
-      </button>
-      <div class="clear"></div>
-    </form>
-
-    <h3>Add Roles for Any User</h3>
-    <form id="addform" method="POST">
-      ${authz_add_table(c.roles)}
-      <button type="submit" name="add" class="btn btn-primary">Add Role</button>
-      <div class="clear"></div>
-    </form>
-
-</div>
-
-  <xi:include href="layout.html" />
-</html>
diff --git a/ckan/templates_legacy/package/comments.html b/ckan/templates_legacy/package/comments.html
deleted file mode 100644
index 687837615a4..00000000000
--- a/ckan/templates_legacy/package/comments.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-  
-  <py:def function="page_title">${c.pkg_dict.get('title', c.pkg_dict['name'])} - Datasets - History</py:def>
-
-  <div py:match="content" class="dataset">
-    <h2 class="head">
-      ${c.pkg_dict.get('title', '')}
-      <span class="name">(${c.pkg_dict['name']})</span>
-    </h2>
-    
-  </div> <!-- content -->
-  <xi:include href="layout.html" />
-</html>
diff --git a/ckan/templates_legacy/package/edit.html b/ckan/templates_legacy/package/edit.html
deleted file mode 100644
index 5506137aa66..00000000000
--- a/ckan/templates_legacy/package/edit.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-  
-  <py:def function="page_title">${c.pkg.title or c.pkg.name} - Edit - Datasets</py:def>
-  <py:def function="page_heading">Edit: ${c.pkg.title or c.pkg.name}</py:def>
-  <py:def function="body_class">${h.literal('no-sidebar')}</py:def>
-
-  <py:def function="optional_head">
-    <script>
-      var resources_json = ${h.literal(c.resources_json)};
-      var form_errors = ${c.errors_json};
-    </script>
-  </py:def>
-
-  <div py:match="content" class="dataset-edit-form">
-    <div class="tabbable tabs-left dataset-edit-tabs">
-      <ul class="nav nav-tabs">
-        <!-- One button for each fieldset -->
-        <li class="active"><a data-toggle="tab" href="#basic-information">Basic Information</a></li>
-        <li><a data-toggle="tab" href="#further-information">Further Information</a></li>
-        <li><a data-toggle="tab" href="#extras">Extras</a></li>
-        <li py:if="(c.is_sysadmin or c.auth_for_change_state)"><a data-toggle="tab" href="#delete">Delete</a></li>
-      </ul>
-      ${c.form}
-    </div><!-- /tabbable -->
-  </div>
-
-  <xi:include href="layout.html" />
-</html>
-
diff --git a/ckan/templates_legacy/package/edit_form.html b/ckan/templates_legacy/package/edit_form.html
deleted file mode 100644
index 59c4d894a04..00000000000
--- a/ckan/templates_legacy/package/edit_form.html
+++ /dev/null
@@ -1,36 +0,0 @@
-    <form id="dataset-edit" action="" method="post" class="ckan dataset_create_form"
-      xmlns:i18n="http://genshi.edgewall.org/i18n"
-      xmlns:py="http://genshi.edgewall.org/"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      py:attrs="{'class':'has-errors'} if c.errors or c.fieldset.errors else {}"
-      >
-
-      ${c.form}
-
-
-      <hr />
-
-      <label for="log_message">Edit summary (briefly describe the changes you have made)</label>
-      <textarea id="log_message" name="log_message" class="short wide">${c.log_message}</textarea>
-
-      <div class="ckan-logged-in" style="display: none;">
-	<p>Author: ${c.author}</p>
-      </div>
-      <div class="ckan-logged-out">
-        <label>Author: ${c.author}</label>
-        <p class="hints">
-        Since you have not signed in this will just be your IP address.
-        <a href="${h.url_for(controller='user', action='login', id=None)}" target="_blank">Click here to sign in</a> before saving (opens in new window).
-        </p>
-      </div>
-
-      <div class="submit">
-        ${h.submit('save', _('Save'))}
-      </div>
-
-      <p i18n:msg="" class="hints">
-      <strong>Important:</strong> By submitting content, you agree to release your contributions under the <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Database License</a>. Please <strong>refrain</strong> from editing this page if you are <strong>not</strong> happy to do this.
-      </p>
-
-    </form>
-
diff --git a/ckan/templates_legacy/package/editresources.html b/ckan/templates_legacy/package/editresources.html
deleted file mode 100644
index 900785f02f1..00000000000
--- a/ckan/templates_legacy/package/editresources.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-  
-  <py:def function="page_title">${c.pkg.title or c.pkg.name} - Edit Resources - Datasets</py:def>
-  <py:def function="page_heading">Edit Resources: ${c.pkg.title or c.pkg.name}</py:def>
-  <py:def function="body_class">${h.literal('no-sidebar')}</py:def>
-
-  <py:def function="optional_head">
-    <script>
-      var resources_json = ${h.literal(c.resources_json)};
-    </script>
-  </py:def>
-
-  <div py:match="content" class="dataset-editresources-form">
-    ${c.form}
-  </div>
-
-  <xi:include href="layout.html" />
-</html>
-
diff --git a/ckan/templates_legacy/package/followers.html b/ckan/templates_legacy/package/followers.html
deleted file mode 100644
index 727dd3b5e9f..00000000000
--- a/ckan/templates_legacy/package/followers.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-
-  <py:def function="page_title">${c.pkg_dict.get('title', c.pkg_dict['name'])} - Datasets - Followers</py:def>
-  <py:def function="page_heading">Followers: ${c.pkg.title or c.pkg.name}</py:def>
-  <py:def function="body_class">no-sidebar</py:def>
-
-  <div py:match="content" class="dataset">
-    <h3>Followers</h3>
-    <ul class="userlist">
-     <li py:for="follower in c.followers" class="user">
-        <ul>
-          ${h.linked_user(follower['name'], maxlength=20)}
-        </ul>
-      </li>
-    </ul>
-  </div>
-
-  <xi:include href="layout.html" />
-</html>
diff --git a/ckan/templates_legacy/package/form.html b/ckan/templates_legacy/package/form.html
deleted file mode 100644
index 82a64af2c3e..00000000000
--- a/ckan/templates_legacy/package/form.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<py:if test="True" xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-
-  <py:if test="c.fieldset.errors or c.errors">
-    <div class="error-explanation">
-        <h2>Errors in form</h2> 
-        <p>The form contains invalid entries:</p> 
-        <ul> 
-          <py:for each="field, errors in c.fieldset.errors.items()">
-            <li py:for="error in errors">
-              ${field.label_text or c.fieldset.prettify(field.name)}: ${_(error)}
-            </li>
-          </py:for>
-          <li py:for="error in c.errors">
-              ${_(error)}
-          </li>
-        </ul> 
-    </div>
-  </py:if>
-
-  <xi:include href="form_fields.html" />
-
-  <fieldset py:for="field_group in c.fieldset.get_field_groups()">
-    <legend>
-      ${field_group}
-    </legend>
-    ${form_fields(field_group)}
-  </fieldset>
-</py:if>
diff --git a/ckan/templates_legacy/package/form_extra_fields.html b/ckan/templates_legacy/package/form_extra_fields.html
deleted file mode 100644
index 14ac076882b..00000000000
--- a/ckan/templates_legacy/package/form_extra_fields.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<py:if test="True" xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-      <dl>
-        <py:for each="field in c.fields">
-            <dt>
-              <label for="${field['name']}">
-                <py:choose test="field.has_key('key')">
-                  <py:when test="True">
-                    ${c.fieldset.prettify(field['key'])}
-                  </py:when>
-                  <py:when test="False">
-                    New key
-                  </py:when>
-                </py:choose>
-              </label>
-            </dt>
-            <dd>
-              <py:choose test="field.has_key('key')">
-                <py:when test="True">
-                  <input id="${field['name']}" name="${field['name']}" type="text" value="${field.get('value', '')}" />
-                  <input type="checkbox" name="${field['name']}-checkbox">Delete</input>
-
-                </py:when>
-                <py:when test="False">
-                  <input class="medium-width" id="${field['name']}-key" name="${field['name']}-key" type="text" />
-                  with value
-                  <input class="medium-width" id="${field['name']}-value" name="${field['name']}-value" type="text" />
-                </py:when>
-              </py:choose>
-            </dd>
-        </py:for>
-      </dl>
-<!--
-          <table>
-          <thead>
-            <tr><th>Key</th><th>Value</th></tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td><input name="Package-  -extras-newfield0-key" type="text" value="" /></td>
-              <td><input name="Package-  -extras-newfield0-value" type="text" class="short" value="" /></td>
-            </tr>
-          </tbody>
-          </table>
--->
-</py:if>
diff --git a/ckan/templates_legacy/package/form_fields.html b/ckan/templates_legacy/package/form_fields.html
deleted file mode 100644
index 6c2675739f6..00000000000
--- a/ckan/templates_legacy/package/form_fields.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<py:if test="True" xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-
-  <py:def function="form_fields(field_group)">
-    <?python 
-      fields = []
-      for field in c.fieldset.render_fields.itervalues():
-        if field.metadata.get('field_group', None) in (None, field_group):
-          fields.append(field)
-      need_labels = False
-      for field in fields:
-        if field.requires_label:
-          need_labels = True
-          break
-    ?>
-    <py:choose test="need_labels">
-      <dl py:when="True">
-        <py:for each="field in fields">
-          <py:if test="field.metadata.get('field_group', None) in (None, field_group)">
-            <py:if test="field.requires_label">
-              <dt>
-                <label class="${field.is_required() and 'field_req' or 'field_opt'}" for="${field.renderer.name}">
-                  ${[field.label_text, c.fieldset.prettify(field.key)][int(field.label_text is None)]}
-                  <py:if test="field.is_required()">*</py:if>
-                </label>
-              </dt>
-            </py:if>
-            <dd>
-              ${h.literal(field.render())}
-            </dd>
-            <py:if test="field.metadata.has_key('basic_instructions') and not field.is_readonly()">
-              <dd class="instructions basic">${field.metadata['basic_instructions']}</dd>
-            </py:if>
-            <py:if test="field.metadata.has_key('further_instructions') and not field.is_readonly()">
-              <dd class="instructions further">${field.metadata['further_instructions']}</dd>
-            </py:if>
-            <py:if test="field.metadata.has_key('hints') and not field.is_readonly()">
-              <dd class="hints">${field.metadata['hints']}</dd>
-            </py:if>
-            <dd py:for="error in field.errors" class="field_error">${_(error)}</dd>    
-          </py:if>
-        </py:for>
-      </dl>
-      <py:otherwise test="">
-        <py:for each="field in fields">
-          ${h.literal(field.render())}
-        </py:for>
-            <py:if test="field.metadata.has_key('basic_instructions')">
-              <div class="instructions basic">${field.metadata['basic_instructions']}</div>
-            </py:if>
-            <py:if test="field.metadata.has_key('further_instructions')">
-              <div class="instructions further">${field.metadata['further_instructions']}</div>
-            </py:if>
-            <py:if test="field.metadata.has_key('hints')">
-              <div class="hints">${field.metadata['hints']}</div>
-            </py:if>
-            <div py:for="error in field.errors" class="field_error">${_(error)}</div>
-
-            <py:if test="c.fieldset.focus == field or c.fieldset.focus is True">
-              <py:if test="not field.is_readonly()">
-                <script type="text/javascript">
-//<![CDATA[
-$(document).ready(function () {
-    $("#${field.renderer.name}").focus();
-});
-//]]>
-                </script>
-              </py:if>
-            </py:if>
-      </py:otherwise>
-    </py:choose>
-  </py:def>
-
-</py:if>
diff --git a/ckan/templates_legacy/package/form_resources.html b/ckan/templates_legacy/package/form_resources.html
deleted file mode 100644
index 6f4f81ba549..00000000000
--- a/ckan/templates_legacy/package/form_resources.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<table xmlns:py="http://genshi.edgewall.org/"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      >
-
-          <thead> 
-              <tr>
-                <th class="${c.field.is_required(column) and 'field_req' or 'field_opt'} resource-${column}" py:for="column in c.columns">
-                  ${c.fieldset.prettify(column)}
-                  <py:if test="c.field.is_required(column)">*</py:if>
-                </th>
-              </tr>
-          </thead> 
-          <tbody> 
-            <tr py:for="i, res in enumerate(c.resources)"> 
-              <td py:for="column in c.columns" class="resource-${column}">
-                <input name="${c.id}-${i}-${column}" type="${'url' if column == 'url' else 'text'}" value="${res[column] if res else ''}" class="${{'format':'short', 'description':'medium-width', 'hash':'short'}.get(column, 'short')}"/>
-              </td> 
-              <td class="resource-id"><input name="${c.id}-${i}-id" type="hidden" value="${res.get('id', '') if res else ''}" /></td>
-            </tr>
-          </tbody>
-</table>
diff --git a/ckan/templates_legacy/package/history.html b/ckan/templates_legacy/package/history.html
deleted file mode 100644
index 6f477c25a91..00000000000
--- a/ckan/templates_legacy/package/history.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-  
-  <py:def function="page_title">${c.pkg_dict.get('title', c.pkg_dict['name'])} - Datasets - History</py:def>
-  <py:def function="page_heading">History: ${c.pkg.title or c.pkg.name}</py:def>
-  <py:def function="body_class">${h.literal('no-sidebar')}</py:def>
-  
-  <div py:match="content" class="dataset">
-    <h3>Revisions</h3>
-    <form id="dataset-revisions" action="diff" method="post"
-      xmlns:py="http://genshi.edgewall.org/"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      > 
-
-      <h3 py:if="c.error" class="form-errors">
-        Error: ${c.error}
-      </h3>
-      
-      <input type="hidden" name="pkg_name" value="${c.pkg_dict['name']}"/>
-
-      <table class="table table-striped table-bordered table-condensed">
-        <tr>
-          <th></th><th>Revision</th><th>Timestamp</th><th>Author</th><th>Log Message</th>
-        </tr>
-        <py:for each="index, rev in enumerate(c.pkg_revisions)">
-          <tr>
-            <td nowrap="nowrap">
-              ${h.radio("selected1", rev.id, checked=(index == 0))}
-              ${h.radio("selected2", rev.id, checked=(index == len(c.pkg_revisions)-1))}
-            </td>
-            <td>
-              <a href="${h.url_for(controller='revision',action='read',id=rev['id'])}">${rev['id'][:4]}&#8230;</a>
-            </td>
-            <td>
-              <a href="${h.url_for(controller='package',action='read',id='%s@%s' % (c.pkg_dict['name'], rev['timestamp']))}" title="${_('Read dataset as of %s') % rev['timestamp']}">${h.render_datetime(rev['timestamp'], with_hours=True)}</a></td>
-            <td>${h.linked_user(rev['author'])}</td>
-            <td>${rev['message']}</td>
-          </tr> 
-        </py:for>
-      </table>
-      <input type="submit" name="diff" value="${_('Compare &raquo;')}" class="btn btn-primary" />
-    </form>
-  </div>
-
-  <py:def function="optional_feed">
-  <link rel="alternate" type="application/atom+xml" title="Dataset History"
-    href="${h.url(controller='package', action='history', id=c.pkg_dict['name'], format='atom', days=7)}" />
-  </py:def>
-
-  <xi:include href="layout.html" />
-</html>
diff --git a/ckan/templates_legacy/package/layout.html b/ckan/templates_legacy/package/layout.html
deleted file mode 100644
index d6a8a096737..00000000000
--- a/ckan/templates_legacy/package/layout.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip=""
-  >
-
-  <py:match path="minornavigation" py:if="c.pkg">
-    <ul class="nav nav-pills">
-      <li class="${'active' if c.action=='read' else ''}">${h.nav_link(h.icon('package') + _('View'), controller='package', action='read', id=c.pkg.name)}</li>
-      <py:choose test="len(c.pkg_dict.get('resources', []))==0 and not h.check_access('package_update',{'id':c.pkg.id})">
-      <py:when test="True">
-        <li class="disabled">
-          <a href="#" onclick="return false;">${h.icon('package-disabled') + _('Resources (0)')}</a>
-        </li>
-      </py:when>
-      <py:otherwise>
-        <li class="dropdown ${'active' if (c.action=='resource_read' or c.action=='editresources') else ''}">
-          <a class="dropdown-toggle" data-toggle="dropdown" href="#">${h.icon('page_white_stack') + _('Resources') + ' (' + str(len(c.pkg_dict.get('resources',[]))) + ')'}<b class="caret"></b></a>
-          <div class="dropdown-appears">
-            <ul class="dropdown-menu">
-              <li py:if="h.check_access('package_update',{'id':c.pkg.id})">
-                ${h.link_to(
-                  h.icon('page_white_add') + _('Add / Edit resources'),
-                  h.url_for(action='editresources', id=c.pkg.name, controller='package')
-                  )}
-                <hr py:if="len(c.pkg_dict.get('resources',[]))>0"/>
-              </li>
-              <li py:for="res in c.pkg_dict.get('resources', [])">
-			  <a href="${h.url_for(controller='package', action='resource_read', id=c.pkg_dict['name'], resource_id=res['id'])}">${h.resource_icon(res) + h.resource_display_name(res)}</a>
-              </li>
-            </ul>
-          </div>
-        </li>
-      </py:otherwise>
-      </py:choose>
-      <li py:if="h.asbool(config.get('ckan.dataset.show_apps_ideas', 'true'))" class="${'active' if c.action=='related' else ''}">${h.nav_link(h.icon('package') + _('Apps, Ideas etc') + ' (%s)' % c.related_count, controller='related', action='list', id=c.pkg.name)}</li>
-      <li class="${'active' if c.action=='history' else ''}">${h.nav_link(h.icon('page_stack') + _('History'), controller='package', action='history', id=c.pkg.name)}</li>
-      <li class="${'active' if c.action=='followers' else ''}" style="float:right;">
-        ${h.nav_link(
-            h.icon('followers') + _('Followers ({num_followers})').format(num_followers=h.follow_count('dataset', c.pkg_dict.id)),
-            controller='package',
-            action='followers',
-            id=c.pkg.name)}
-      </li>
-
-      <py:if test="h.check_access('package_update',{'id':c.pkg.id})">
-        <li class="divider">|</li>
-      </py:if>
-
-      <py:if test="h.check_access('package_update',{'id':c.pkg.id})">
-        <li class="${'active' if c.action=='edit' else ''}">
-          ${h.nav_link(h.icon('package_edit') + _('Settings'), controller='package', action='edit', id=c.pkg.name)}
-        </li>
-      </py:if>
-      <li py:if="c.user" style="float:right;">
-        ${h.follow_button('dataset', c.pkg_dict.id)}
-      </li>
-    </ul>
-  </py:match>
-
-  <xi:include href="../layout.html" />
-
-</html>
-
diff --git a/ckan/templates_legacy/package/new.html b/ckan/templates_legacy/package/new.html
deleted file mode 100644
index f05655e3b87..00000000000
--- a/ckan/templates_legacy/package/new.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-  
-  <py:def function="page_title">Add - Datasets</py:def>
-  <py:def function="page_heading">Add a Dataset</py:def>
-
-  <py:def function="body_class">${h.literal('no-sidebar')}</py:def>
-
-  <py:def function="optional_head">
-    <script>
-      var resources_json = ${h.literal(c.resources_json)};
-    </script>
-  </py:def>
-
-  <div py:match="content" class="dataset-create-form">
-    <h3 py:if="c.error" class="form-errors">
-      Error: ${c.error}
-    </h3>
-    ${c.form}
-  </div>
-
-  <xi:include href="layout.html" />
-</html>
-
diff --git a/ckan/templates_legacy/package/new_package_form.html b/ckan/templates_legacy/package/new_package_form.html
deleted file mode 100644
index a7e16e827fd..00000000000
--- a/ckan/templates_legacy/package/new_package_form.html
+++ /dev/null
@@ -1,309 +0,0 @@
-<form
-  py:with="tab_mode=(c.action=='edit')"
-  class="${'tab-content' if tab_mode else ''} ${'has-errors' if errors else ''} form-horizontal"
-  id="dataset-edit"
-  method="post"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude" >
-
-<xi:include href="../_util.html" />
-
-<div class="alert alert-error error-explanation" py:if="error_summary">
-<h2>Errors in form</h2>
-<p>The form contains invalid entries:</p>
-<ul>
-  <li py:for="key, error in error_summary.items()">${"%s: %s" % (key if not key=='Name' else 'URL', error)}
-    <py:if test="key=='Resources'">
-      <ul>
-        <py:for each="idx, errordict in enumerate(errors.get('resources', []))">
-          <li py:if="errordict">
-            Resource ${idx}:
-            <ul>
-              <li py:for="thiskey, thiserror in errordict.items()">${thiskey}: <py:for each="errorinfo in thiserror">${errorinfo}; </py:for></li>
-            </ul>
-          </li>
-        </py:for>
-      </ul>
-    </py:if>
-  </li>
-  <script>var global_form_errors = ${h.dump_json(errors)};</script>
-</ul>
-</div>
-
-<fieldset class="tab-pane fade in active" id="basic-information">
-  <div class="control-group title-field">
-    <label class="control-label" for="title">Title</label>
-    <div class="controls">
-      <input id="title"
-        class="js-title"
-        name="title" type="text"
-        value="${data.get('title', '')}"
-        placeholder="${_('A short descriptive title for the dataset')}"
-      />
-      <p class="field_error" py:if="errors.get('title', '')">${errors.get('title', '')}</p>
-    </div>
-  </div>
-
-  <div class="control-group name-field">
-    <label class="control-label" for="name">Url</label>
-    <div class="controls">
-      <div class="input-prepend">
-        <span class="add-on">${h.url(controller='package', action='search')+'/'}</span>
-        <input maxlength="100" name="name" type="text" class="js-url-input" value="${data.get('name', '')}" />
-      </div>
-      <p class="js-url-is-valid">&nbsp;</p>
-      <p class="url-is-long">Warning: URL is very long. Consider changing it to something shorter.</p>
-      <p>2+ characters, lowercase, using only 'a-z0-9' and '-_'</p>
-      <p class="field_error" py:if="errors.get('name', '')">${errors.get('name', '')}</p>
-    </div>
-  </div>
-
-  <div class="control-group homepage-field">
-    <label class="control-label" for="url">Home Page</label>
-    <div class="controls">
-      <input id="url" name="url" type="text" value="${data.get('url', '')}"/>
-      <p>The URL for the web page describing the data (not the data itself).</p>
-      <p>e.g. http://www.example.com/growth-figures.html</p>
-      <p class="field_error" py:if="errors.get('url', '')">${errors.get('url', '')}</p>
-    </div>
-  </div>
-
-  <div class="control-group license-field">
-    <label class="control-label" for="license_id">License</label>
-    <div class="controls">
-      <select id="license_id" name="license_id">
-        <py:for each="license_desc, license_id in c.licenses">
-          <option value="${license_id}" py:attrs="{'selected': 'selected' if data.get('license_id', '') == license_id else None}" >${license_desc}</option>
-        </py:for>
-      </select>
-      <p id="license-instructions">(Don't worry if you don't know which license the data has been released under).</p>
-    </div>
-  </div>
-
-
-  <div class="control-group description-field">
-    <label class="control-label" for="notes">Description</label>
-    <div class="controls">
-      ${markdown_editor('notes', data.get('notes'), 'notes', _('Start with a summary sentence ...'))}
-    </div>
-  </div>
-
-  <div class="control-group groups-field">
-    <label class="control-label">Groups</label>
-    <div class="controls">
-      <py:with vars="groups=data.get('groups',[])">
-      <strong py:if="len(groups)>0">Member of:</strong>
-      <py:for each="num, group in enumerate(groups)">
-        <div class="checkbox" py:if="'id' in group">
-          <input type="hidden" name="groups__${num}__id" checked="checked" value="${group['id']}"/>
-          <label for="groups__${num}__checked">${group.get('name', '')}</label>
-          <input type="hidden" name="groups__${num}__name" value="${group.get('name', '')}" />
-        </div>
-      </py:for>
-
-      <strong>Add to:</strong>
-      <select py:if="c.groups_available" id="groups__${len(groups)}__id" name="groups__${len(groups)}__id">
-        <option selected="selected" value="">(None)</option>
-        <py:for each="group in c.groups_available">
-        <option value="${group['id']}" >${group['name']}</option>
-        </py:for>
-      </select>
-      <em py:if="not c.groups_available">Cannot add any groups.</em>
-      </py:with>
-    </div>
-  </div>
-
-  <div class="control-group tags-field">
-    <label class="control-label">Tags</label>
-    <div class="controls">
-      <input class="long autocomplete-tag" id="tag_string" name="tag_string" size="60" type="text"
-               value="${data.get('tag_string') or ', '.join([tag['name'] for tag in data.get('tags', []) if not tag.get('vocabulary_id')])}" />
-      <p i18n:msg="">Comma-separated terms that may link this dataset to similar ones. For more information on conventions, see <a href="http://wiki.ckan.org/Managing_Datasets#Tag_Conventions">this wiki page</a>.</p>
-      <p>e.g. pollution, rivers, water quality</p>
-      <p class="field_error" py:if="errors.get('tag_string', '')">${errors.get('tag_string', '')}</p>
-    </div>
-  </div>
-</fieldset>
-
-<fieldset class="tab-pane" id="resources">
-  <legend>Add Resources</legend>
-  <div class="instructions">
-    <p>Upload or link data files, APIs and other materials related to your dataset.</p>
-  </div>
-  <div class="row">
-    <div class="span4">
-      <ul class="resource-list resource-list-edit drag-drop-list">
-      </ul>
-      <ul class="resource-list resource-list-add">
-        <li><a href="#" class="js-resource-add">${h.icon('page_white_add')}New resource...</a></li>
-      </ul>
-    </div>
-    <div class="span8">
-      <div style="display: none;" class="resource-panel">
-        <button class="btn btn-danger resource-panel-close">x</button>
-        <div class="resource-details resource-add">
-          <ul class="nav nav-tabs">
-            <li><a data-toggle="tab" href="#link-file">Link to a file</a></li>
-            <li><a data-toggle="tab" href="#link-api">Link to an API</a></li>
-            <li><a data-toggle="tab" href="#upload-file">Upload a file</a></li>
-          </ul>
-          <div class="tab-content">
-            <div class="tab-pane" id="link-file">
-              <div class="form-inline js-add-url-form">
-                <label class="field_opt" for="url">File URL</label>
-                <input name="add-resource-url" type="text" class="input-small" placeholder="http://mydataset.com/file.csv"/>
-                <input name="add-resource-save" type="submit" class="btn btn-primary" value="Add" />
-              </div>
-            </div>
-            <div class="tab-pane" id="link-api">
-              <div class="form-inline js-add-api-form">
-                <label class="field_opt" for="url">API URL</label>
-                <input name="add-resource-url" type="text" class="input-small" placeholder="http://mydataset.com/api/"/>
-                <input name="add-resource-save" type="submit" class="btn btn-primary" value="Add" />
-              </div>
-            </div>
-            <div class="tab-pane" id="upload-file">
-              <div class="js-add-upload-form">
-              </div>
-              <div class="alert alert-block" style="display: none;"></div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <div class="js-resource-edit-barebones">
-    <!-- The resource editor deletes these fields and replaces them with a dynamic editor.
-         They are required for the form to render correctly when not in resource-edit mode. -->
-    <py:for each="num,res in enumerate(data.get('resources', []))">
-      <py:for each="field in res.keys()">
-      <input type="hidden" name="resources__${res.get('position')}__${field}" value="${res.get(field)}" />
-      </py:for>
-    </py:for>
-  </div>
-</fieldset>
-
-<fieldset class="tab-pane fade" id='further-information'>
-  <div class="control-group">
-    <label class="control-label field_opt" for="author">Author</label>
-    <div class="controls">
-      <input id="author" name="author" type="text" value="${data.get('author', '')}" />
-      <p>The name of the main contact, for enquiries about this particular dataset, using the e-mail address in the following field.</p>
-    </div>
-  </div>
-
-  <div class="control-group">
-    <label class="control-label field_opt" for="author_email">Author email</label>
-    <div class="controls">
-      <input id="author_email" name="author_email" type="text" value="${data.get('author_email', '')}" />
-    </div>
-  </div>
-
-  <div class="control-group">
-    <label class="control-label field_opt" for="maintainer">Maintainer</label>
-    <div class="controls">
-      <input id="maintainer" name="maintainer" type="text" value="${data.get('maintainer', '')}" />
-      <p>If there is another important contact person (in addition to the person in the Author field) then provide details here.</p>
-    </div>
-  </div>
-
-  <div class="control-group">
-    <label class="control-label field_opt" for="maintainer_email">Maintainer email</label>
-    <div class="controls">
-      <input id="maintainer_email" name="maintainer_email" type="text" value="${data.get('maintainer_email', '')}" />
-    </div>
-  </div>
-
-  <div class="control-group">
-    <label class="control-label field_opt" for="version">Version</label>
-    <div class="controls">
-      <input id="version" maxlength="100" name="version" type="text" value="${data.get('version', '')}" />
-      <p>A number representing the version (if applicable)</p>
-      <p>e.g. 1.2.0</p>
-    </div>
-  </div>
-</fieldset>
-
-<fieldset class="tab-pane fade" id='extras'>
-  <p>Adding custom fields to the dataset such as "location:uk" can help users find it in the search engine. This data will also appear under <strong>Additional Information</strong> when viewing the dataset.</p>
-  <py:with vars="extras = data.get('extras', [])">
-    <py:for each="num, extra in enumerate(extras)">
-      <div class="control-group">
-        <label class="control-label" for="extras__${num}__value">${extra.get('key')}</label>
-        <div class="controls">
-          <input id="extras__${num}__key" name="extras__${num}__key" type="hidden" value="${extra.get('key')}" />
-          <input id="extras__${num}__value" name="extras__${num}__value" type="text" value="${extra.get('value')}" />
-          <label class="checkbox" style="display: inline-block;">
-            <input type="checkbox" name="extras__${num}__deleted" checked="${extra.get('deleted')}" />Delete
-          </label>
-        </div>
-      </div>
-    </py:for>
-    <hr py:if="len(extras)" class="extras-divider" />
-    <py:for each="num in range(len(extras), len(extras) + 4)">
-      <div class="control-group">
-        <label class="control-label" for="extras__${num}__key">Add...</label>
-        <div class="controls">
-          <label>
-            <span class="extras-label">Key =</span>
-            <input class="medium-width" id="extras__${num}__key" name="extras__${num}__key" type="text" />
-          </label>
-          <label>
-            <span class="extras-label">Value =</span>
-            <input class="medium-width" id="extras__${num}__value" name="extras__${num}__value" type="text" />
-          </label>
-        </div>
-      </div>
-    </py:for>
-  </py:with>
-</fieldset>
-
-<fieldset id='delete' class="tab-pane fade" py:if="c.is_sysadmin or c.auth_for_change_state">
-  <dl>
-    <dt>Delete</dt>
-    <dd>
-      <p>Do you really want to change the state of this dataset? &nbsp;&nbsp;<button class="dataset-delete btn">Yes!</button></p>
-      <span>
-      This dataset is&nbsp;&nbsp;
-      <select id="state" class="dataset-delete" name="state" style="display:inline;">
-        <option py:attrs="{'selected': 'selected' if data.get('state') == 'active' else None}" value="active">active</option>
-        <option py:attrs="{'selected': 'selected' if data.get('state') == 'deleted' else None}" value="deleted">deleted</option>
-      </select>
-      </span>
-    </dd>
-  </dl>
-</fieldset>
-
-<fieldset id='summary'>
-  <div class="control-group">
-    <label class="control-label" for="log_message">Summary</label>
-    <div class="controls">
-      <p>Briefly describe the changes you have made...</p>
-      <textarea id="log_message" name="log_message">${data.get('log_message', h.auto_log_message())}</textarea>
-    </div>
-  </div>
-</fieldset>
-
-<div class="author-box ckan-logged-in" style="display: none;">
-  <p>Author: ${c.author}</p>
-</div>
-<div class="author-box ckan-logged-out">
-  <label>Author: ${c.author}</label>
-  <p i18n:msg="" class="hints">
-    Since you have not signed in this will just be your IP address.
-    <a href="${h.url_for(controller='user', action='login', id=None)}" target="_blank">Click here to sign in</a> before saving (opens in new window).
-  </p>
-</div>
-
-<div class="form-actions">
-  <input id="save" class="btn btn-primary" name="save" type="submit" value="${_('Save Changes')}" />
-  <py:if test="c.pkg">
-    <input id="cancel" class="btn href-action" name="cancel" type="reset" value="${_('Cancel')}" action="${h.url_for(controller='package', action='read', id=c.pkg.name)}" />
-  </py:if>
-  <p class="hints"><strong>Important:</strong> By submitting content, you agree to release your contributions under the <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Database License</a>. Please <strong>refrain</strong> from editing this page if you are <strong>not</strong> happy to do this.</p>
-</div>
-
-
-</form>
diff --git a/ckan/templates_legacy/package/read.html b/ckan/templates_legacy/package/read.html
deleted file mode 100644
index 7c76ef39192..00000000000
--- a/ckan/templates_legacy/package/read.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:foaf="http://xmlns.com/foaf/0.1/"
-  xmlns:owl="http://www.w3.org/2002/07/owl#"
-  xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-  xmlns:dc="http://purl.org/dc/terms/"
-  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-  xmlns:dcat="http://www.w3.org/ns/dcat#"
-  typeof="dcat:Dataset"
-  about=""
-  py:strip="">
-
-  <py:def function="page_title">${c.pkg_dict.get('title', c.pkg_dict['name'])}
-  - Datasets</py:def>
-
-  <py:def function="page_heading" property="dc:title">
-    ${c.pkg_dict['title']}
-  </py:def>
-
-  <py:match path="primarysidebar">
-
-    <li py:if="c.pkg.license_id" id="dataset-license" class="sidebar-section">
-      <strong>License:</strong>
-        <py:choose test="">
-          <span py:when="c.pkg_dict.get('license_url')"><a
-              href="${c.pkg_dict.get('license_url')}" rel="dc:rights">${c.pkg_dict.get('license_title')}</a></span>
-          <span py:when="c.pkg.license" property="dc:rights">${c.pkg_dict.get('license_title')}</span>
-        </py:choose>
-
-        <py:if test="c.pkg_dict.get('isopen')">
-            <a href="http://opendefinition.org/okd/" title="This dataset satisfies the Open Definition.">
-              <img class="open-data" src="http://assets.okfn.org/images/ok_buttons/od_80x15_blue.png" alt="[Open Data]" />
-            </a>
-        </py:if>
-        <py:if test="not c.pkg_dict.get('isopen')">
-            <span class="closed">
-              ${h.icon('lock')}
-            </span>
-        </py:if>
-    </li>
-
-    <li py:if="c.pkg_dict.get('tags')" class="sidebar-section">
-      <h3>Tags</h3>
-      ${tag_list(c.pkg_dict.get('tags', ''))}
-    </li>
-
-    <li py:if="'groups' in c.pkg_dict" class="sidebar-section">
-      <h3>Groups</h3>
-      <ul class="groups">
-        <li py:for="group in sorted(c.pkg_dict.groups, key=lambda g: g['title'] or g['name'])">
-        <a href="${h.url_for(controller='group', action='read', id=group['name'])}">${group.get('title') or group.get('name')}</a>
-        </li>
-      </ul>
-    </li>
-
-    <li py:if="c.package_relationships" class="sidebar-section">
-      <h3>Related Datasets</h3>
-      <ul class="related-datasets">
-        <py:for each="pkg, relationship_str, comment in c.package_relationships">
-          <li>
-            ${h.literal(relationship_str % (h.link_to(pkg.name, h.url_for(controller="package", action="read", id=pkg.name))))}
-            <span py:if="comment is not None and len(comment)" class="relationship_comment">
-                (${comment})
-            </span>
-          </li>
-        </py:for>
-      </ul>
-    </li>
-
-    <!-- <py:if test="not(c.pkg.isopen() and c.pkg.resources)"> -->
-    <!--   <h3 i18n:msg="">This dataset is Not Open</h3>  -->
-    <!--   <p>Either because it is not openly licensed or is missing -->
-    <!--   downloadable resources.</p> -->
-    <!--   <p class="widget_action"> -->
-    <!--     <a href="http://isitopendata.org/enquiry/start/?ckan_dataset=${c.pkg.name}">Start an enquiry on IsItOpenData &raquo;</a> -->
-    <!--   </p> -->
-    <!-- </py:if> -->
-    <!-- </li> -->
-
-  </py:match>
-
-  <div py:match="content">
-    <py:if test="c.pkg_revision_id">
-      <div id="revision" class="widget-container">
-        <p py:if="c.pkg_revision_not_latest">This is an old revision of this dataset, as edited <!--!by ${h.linked_user(rev.author)}-->at ${h.render_datetime(c.pkg_revision_timestamp, with_hours=True)}. It may differ significantly from the <a href="${h.url(controller='package', action='read', id=c.pkg.name)}">current revision</a>.</p>
-        <p py:if="not c.pkg_revision_not_latest">This is the current revision of this dataset, as edited <!--!by ${h.linked_user(rev.author)}-->at ${h.render_datetime(c.pkg_revision_timestamp, with_hours=True)}.</p>
-      </div>
-    </py:if>
-
-    <xi:include href="read_core.html" />
-
-    <span class="insert-comment-thread"></span>
-  </div>
-
-  <py:def function="optional_head">
-      <link rel="alternate" type="application/rdf+xml" title="RDF/XML" href="${ h.url_for(controller='package', action='read', id=c.pkg.id, qualified=True)}.rdf" />
-  </py:def>
-
-  <py:def function="optional_feed">
-  <link rel="alternate" type="application/atom+xml" title="Dataset History"
-    href="${h.url(controller='package', action='history', id=c.pkg.name, format='atom', days=7, qualified=True)}" />
-  </py:def>
-
-  <xi:include href="layout.html" />
-</html>
-
diff --git a/ckan/templates_legacy/package/read.n3 b/ckan/templates_legacy/package/read.n3
deleted file mode 100644
index 7a42af63f3d..00000000000
--- a/ckan/templates_legacy/package/read.n3
+++ /dev/null
@@ -1,45 +0,0 @@
-@prefix : <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix dcat: <http://www.w3.org/ns/dcat#> .
-@prefix dct: <http://purl.org/dc/terms/> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix owl: <http://www.w3.org/2002/07/owl#> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-<${ h.url_for(controller='package',action='read',id=c.pkg_dict['name'], qualified=True)}>
-a dcat:Dataset;
-     dct:description "${c.pkg_dict['notes']}";
-     dct:identifier "${c.pkg_dict['name']}";
-     dct:relation  [
-         rdf:value "";
-         :label "change_note" ],
-             [
-         rdf:value "";
-         :label "definition_note" ],
-             [
-         rdf:value "";
-         :label "editorial_note" ],
-             [
-         rdf:value "";
-         :label "example_note" ],
-             [
-         rdf:value "";
-         :label "history_note" ],
-             [
-         rdf:value "";
-         :label "scope_note" ],
-             [
-         rdf:value "";
-         :label "skos_note" ],
-             [
-         rdf:value "";
-         :label "temporal_granularity" ],
-             [
-         rdf:value "";
-         :label "type_of_dataset" ],
-             [
-         rdf:value "";
-         :label "update_frequency" ];
-     dct:title "${c.pkg_dict['title']}";
-     :label "${c.pkg_dict['name']}";
-     = <urn:uuid:${c.pkg_dict['id']}>;
-     foaf:homepage <http://127.0.0.1:5000/dataset/testt> .
\ No newline at end of file
diff --git a/ckan/templates_legacy/package/read.rdf b/ckan/templates_legacy/package/read.rdf
deleted file mode 100644
index c652c88c6a0..00000000000
--- a/ckan/templates_legacy/package/read.rdf
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rdf:RDF
-  xmlns:py="http://genshi.edgewall.org/"
-  xmlns:foaf="http://xmlns.com/foaf/0.1/"
-  xmlns:owl="http://www.w3.org/2002/07/owl#"
-  xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-  xmlns:dcat="http://www.w3.org/ns/dcat#"
-  xmlns:dct="http://purl.org/dc/terms/"
->
-  <dcat:Dataset rdf:about="${ h.url_for(controller='package',action='read',id=c.pkg_dict['name'], qualified=True)}">
-    <owl:sameAs rdf:resource="urn:uuid:${c.pkg_dict['id']}"/>
-    <dct:description>${c.pkg_dict['notes']}</dct:description>
-    <py:for each="tag_dict in c.pkg_dict['tags']">
-        <dcat:keyword>${ tag_dict["name"] }</dcat:keyword>
-    </py:for>
-    <foaf:homepage rdf:resource="${ h.url_for(controller='package',action='read',id=c.pkg_dict['name'], qualified=True)}"/>
-    <rdfs:label>${c.pkg_dict['name']}</rdfs:label>
-
-    <dct:identifier>${c.pkg_dict['name']}</dct:identifier>
-    <dct:title>${c.pkg_dict['title']}</dct:title>
-    <py:for each="rsc_dict in c.pkg_dict['resources']">
-        <dcat:distribution>
-            <dcat:Distribution>
-                <dcat:accessURL rdf:resource="${ rsc_dict['url'] }"/>
-                    <dct:format py:if="rsc_dict.get('format')">
-                        <dct:IMT>
-                            <rdf:value>${rsc_dict.get('format')}</rdf:value>
-                            <rdfs:label>${rsc_dict.get('format')}</rdfs:label>
-                        </dct:IMT>
-                    </dct:format>
-               <dct:title py:if="rsc_dict.get('name')">${rsc_dict.get('name')}</dct:title>
-            </dcat:Distribution>
-        </dcat:distribution>
-    </py:for>
-    <dct:creator  py:if="c.pkg_dict.get('author', None)">
-      <rdf:Description>
-        <foaf:name>${ c.pkg_dict['author'] }</foaf:name>
-        <foaf:mbox  py:if="c.pkg_dict.get('maintainer_email', None)" rdf:resource="mailto:${c.pkg_dict['author_email']}"/>
-      </rdf:Description>
-    </dct:creator>
-    <dct:contributor py:if="c.pkg_dict.get('maintainer', None)">
-      <rdf:Description>
-        <foaf:name>${ c.pkg_dict['maintainer'] }</foaf:name>
-        <foaf:mbox  py:if="c.pkg_dict.get('maintainer_email', None)" rdf:resource="mailto:${c.pkg_dict['maintainer_email']}"/>
-      </rdf:Description>
-    </dct:contributor>
-
-    <dct:rights py:if="c.pkg_dict.get('license_url', None)" rdf:resource="${c.pkg_dict['license_url']}"/>
-    <py:for each="extra_dict in c.pkg_dict.get('extras',None)">
-        <dct:relation>
-          <rdf:Description>
-            <rdfs:label>${extra_dict.get('key','')}</rdfs:label>
-            <rdf:value>${extra_dict.get('value','')}</rdf:value>
-          </rdf:Description>
-        </dct:relation>
-    </py:for>
-  </dcat:Dataset>
-</rdf:RDF>
\ No newline at end of file
diff --git a/ckan/templates_legacy/package/read_core.html b/ckan/templates_legacy/package/read_core.html
deleted file mode 100644
index 427775a8d42..00000000000
--- a/ckan/templates_legacy/package/read_core.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  py:strip=""
-  >
-  <xi:include href="../_util.html" />
-
-  <div id="dataset" class="dataset">
-    <!-- Overview Section -->
-    <div id="dataset-overview">
-
-      <!-- Description -->
-      <div class="notes" py:if="c.pkg_notes_formatted">
-        <div id="notes-extract">
-          ${c.pkg_notes_formatted}
-        </div>
-        <div id="notes-remainder"></div>
-        <div id="notes-toggle" style="display: none;">
-          <button class="more btn"><img src="/images/chevron-down.png"/></button>
-          <button class="less btn" style="display: none;"><img src="/images/chevron-up.png"/></button>
-        </div>
-      </div>
-
-      <!-- Resources -->
-      <div id="dataset-resources" class="resources subsection">
-        <h3>Resources
-        <py:if test="h.check_access('package_update',{'id':c.pkg.id})"> &nbsp;
-          ${h.nav_link(_('(edit)'), controller='package', action='editresources', id=c.pkg.name)}
-        </py:if></h3>
-        <ul class="resource-list">
-          <py:for each="res in c.pkg_dict.get('resources', [])">
-          <li>
-            <a href="${h.url_for(controller='package', action='resource_read', id=c.pkg_dict['name'], resource_id=res['id'])}">
-              ${h.resource_icon(res)}
-              ${h.resource_display_name(res)}
-              <span py:if="res.get('format')" class="format-box" property="dc:format">${res.get('format')}</span>
-            </a>
-            </li>
-          </py:for>
-        </ul>
-        <py:if test="not len(c.pkg_dict.get('resources', []))">
-          (none)
-        </py:if>
-      </div>
-
-    </div>
-
-    <!-- Dataset Information Section -->
-    <h3>Additional Information
-      <py:if test="h.check_access('package_update',{'id':c.pkg.id})"> &nbsp;
-        ${h.nav_link(_('(settings)'), controller='package', action='edit', id=c.pkg.name)}
-      </py:if></h3>
-    <div id="dataset-information">
-    <table class="table table-striped table-bordered table-condensed">
-      <thead>
-        <tr>
-          <th>Field</th>
-          <th>Value</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr py:if="c.pkg.url">
-          <td class="dataset-label">Source</td>
-          <td class="dataset-details" property="foaf:homepage">${c.pkg_url_link}</td>
-        </tr>
-
-        <tr py:if="c.pkg_author_link">
-          <td class="dataset-label">Author</td>
-          <td class="dataset-details" property="dc:creator">${c.pkg_author_link}</td>
-        </tr>
-
-        <tr py:if="c.pkg_maintainer_link">
-          <td class="dataset-label">Maintainer</td>
-          <td class="dataset-details" property="dc:contributor">${c.pkg_maintainer_link}</td>
-        </tr>
-
-        <tr py:if="c.pkg.version">
-          <td class="dataset-label">Version</td>
-          <td class="dataset-details">${c.pkg.version}</td>
-        </tr>
-
-        <tr py:if="c.eu_country">
-          <td class="dataset-label">Country</td>
-          <td class="dataset-details">${h.code_to_country(c.eu_country)}</td>
-        </tr>
-
-        <tr py:if="h.check_access('package_update',{'id':c.pkg.id})">
-          <td class="dataset-label">State</td>
-          <td class="dataset-details">${c.pkg.state}</td>
-        </tr>
-
-        <tr py:if="c.harvest_catalogue_name">
-          <td class="dataset-label">Harvest Source</td>
-          <td class="dataset-details" i18n:msg="harvest_catalogue_name">
-            <a href="${c.harvest_dataset_url}">Dataset page</a> on 
-            <a href="${c.harvest_catalogue_url}">${c.harvest_catalogue_name}</a>
-          </td>
-        </tr>
-
-        <tr py:for="i, (key, value) in enumerate(c.pkg_extras)"
-          rel="dc:relation" resource="_:extra${i}">
-          <td class="dataset-label" property="rdfs:label">${_(key)}</td>
-          <td class="dataset-details" property="rdf:value">${value}</td>
-        </tr>
-      </tbody>
-    </table>
-
-    </div>
-
-  </div> <!-- /dataset -->
-
-</html>
diff --git a/ckan/templates_legacy/package/resource_embedded_dataviewer.html b/ckan/templates_legacy/package/resource_embedded_dataviewer.html
deleted file mode 100644
index 4f996577dee..00000000000
--- a/ckan/templates_legacy/package/resource_embedded_dataviewer.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-
-  <py:def function="optional_head">
-
-    <xi:include href="../snippets/recline-extra-header.html" />
-
-    <style type="text/css">
-
-      /* Hide the query controls */
-      .header {
-        display: none;
-      }
-
-      /* Hide the fields control */
-/*      .recline-fields-view {*/
-      .data-view-sidebar{
-        display: none;
-      }
-
-      .data-view-container {
-        margin-right: 0 !important;
-      }
-
-      /* Hide CKAN footer */
-      .footer.outer {
-        display: none;
-      }
-
-      /* Don't center the main container. And provide a little space to the
-         left and above the viewer.  This is for the graph-view, which, if a
-         small amount of room is not given, the y-axis' labels are uncomfortably
-         close to the edge of the viewport.
-      */
-      #main.container {
-        width: auto;
-        margin-left: 2px;
-      }
-
-      /* Remove the border from the right-hand-side */
-      #content {
-        border: 0px;
-      }
-
-      #ckanext-datapreview {
-        width: ${c.width-2}px;
-        height: ${c.height-81}px;
-      }
-
-      .recline-slickgrid {
-        height: ${c.height-81}px;
-      }
-
-      .slick-header-column {
-        border-top: 0 !important;
-        border-bottom: 0 !important;
-      }
-
-      .recline-graph .graph {
-        height: ${c.height-81}px;
-      }
-
-      .recline-map .map {
-        height: ${c.height-81}px;
-      }
-
-      .branded-link {
-        height: 34px;
-      }
-
-      .alert-messages {
-        display: none;
-      }
-
-    </style>
-    <script type="text/javascript">
-      var preload_resource = ${h.literal(c.resource_json)};
-      var reclineState = ${h.literal(c.recline_state)};
-    </script>
-  </py:def>
-
-  <py:def function="page_title">
-    ${h.dataset_display_name(c.package)} /
-    ${h.resource_display_name(c.resource)} - Dataset - Resource
-  </py:def>
-
-  <div py:match="content">
-    <div class="resource-preview">
-      <div id="ckanext-datapreview"></div>
-    </div>
-    <xi:include href="../snippets/data-viewer-embed-branded-link.html" />
-  </div>
-
-  <py:def function="optional_footer">
-
-    <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/jquery.mustache/jquery.mustache.js')}"></script>
-
-    <xi:include href="../snippets/recline-extra-footer.html" />
-
-  </py:def>
-
-  <xi:include href="../layout_base.html" />
-</html>
diff --git a/ckan/templates_legacy/package/resource_read.html b/ckan/templates_legacy/package/resource_read.html
deleted file mode 100644
index b8d9b27d50a..00000000000
--- a/ckan/templates_legacy/package/resource_read.html
+++ /dev/null
@@ -1,187 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:foaf="http://xmlns.com/foaf/0.1/"
-  xmlns:owl="http://www.w3.org/2002/07/owl#"
-  xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-  xmlns:dc="http://purl.org/dc/terms/"
-  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-  xmlns:dcat="http://www.w3.org/ns/dcat#"
-  typeof="dcat:Dataset"
-  about=""
-  py:strip="">
-
-  <xi:include href="../_snippet/data-api-help.html" />
-  <xi:include href="../snippets/data-viewer-embed-dialog.html" />
-
-  <py:def function="optional_head">
-
-    <xi:include href="../snippets/recline-extra-header.html" />
-
-    <style type="text/css">
-      .resource-actions {
-        margin-right: 0;
-      }
-      .resource-actions .btn {
-        position: relative;
-        bottom: 3px;
-        padding: 8px 10px;
-      }
-      .resource-actions .download {
-        display: inline;
-      }
-      .resource-actions .download img {
-        margin: 0px 4px -4px 0;
-      }
-      .preview-header {
-        padding-bottom: 13px;
-        padding-top: 0px;
-      }
-      .preview-header h3 {
-        display: inline;
-      }
-      .preview-header .btn {
-        float: right;
-        position: relative;
-        bottom: 6px;
-        padding: 8px 15px;
-      }
-    </style>
-    <script type="text/javascript">
-      var preload_resource = ${h.literal(c.resource_json)};
-      var embedPath = "${h.url_for(controller='package', action='resource_embedded_dataviewer', id=c.package.id, resource_id=c.resource.id, qualified=True)}";
-    </script>
-  </py:def>
-
-  <py:def function="page_title">
-    ${h.dataset_display_name(c.package)} /
-    ${h.resource_display_name(c.resource)} - Dataset - Resource
-  </py:def>
-
-  <py:def function="page_heading">
-    ${h.dataset_link(c.package)}
-    /
-    ${h.resource_display_name(c.resource)}
-  </py:def>
-
-  <div py:match="content">
-    <div class="resource-actions">
-      <a py:if="c.resource.get('url')" class="btn btn-primary resource-url-analytics resource-type-${c.resource.get('resource_type')}" href="${c.resource.get('url')}">
-        <py:choose test="c.resource.get('resource_type')">
-          <py:when test="'listing'">View</py:when>
-          <py:when test="'service'">View</py:when>
-          <py:when test="'api'">API Endpoint</py:when>
-          <py:otherwise>
-            <div class="download">
-              <img src="${h.icon_url('arrow-down-16')}"/>
-              Download
-            </div>
-          </py:otherwise>
-        </py:choose>
-      </a>
-      <py:if test="config.get('ckan.datastore.enabled', False)">
-        <py:if test="c.resource.get('webstore_url')">
-          <a class="btn btn-success" data-toggle="modal" href=".modal-data-api-help">Data API</a>
-        </py:if>
-        <py:if test="not c.resource.get('webstore_url')">
-          <a class="btn disabled" rel="tooltip" title="Data API is unavailable for this resource as DataStore is disabled">Data API</a>
-        </py:if>
-      </py:if>
-    </div>
-
-  <py:if test="config.get('ckan.datastore.enabled', False)">
-    ${data_api_help(c.datastore_api)}
-  </py:if>
-
-  ${data_viewer_embed_dialog()}
-
-    <div class="quick-info">
-      <dl>
-        <dt>Last updated</dt>
-        <dd>${h.time_ago_in_words_from_str(c.resource['last_modified'], granularity='day')}</dd>
-        <dt>Format</dt>
-        <dd>
-          ${c.resource['format'] or 'Unknown'}
-        </dd>
-        <dt>License</dt>
-        <dd>
-          <py:choose test="">
-            <span py:when="c.pkg.license and c.pkg.license.url"><a
-                href="${c.pkg.license.url}" rel="dc:rights">${c.pkg.license.title.split('::')[-1]}</a></span>
-            <span py:when="c.pkg.license" property="dc:rights">${c.pkg.license.title}</span>
-            <span py:when="c.pkg.license_id" property="dc:rights">${c.pkg.license_id}</span>
-            <span py:when="not(c.pkg.license)">License unknown</span>
-          </py:choose>
-          <py:if test="c.pkg.isopen()">
-              <a href="http://opendefinition.org/okd/" title="This dataset satisfies the Open Definition.">
-                <img class="open-data" src="http://assets.okfn.org/images/ok_buttons/od_80x15_blue.png" alt="[Open Data]" />
-              </a>
-          </py:if>
-          <py:if test="not c.pkg.isopen()">
-              <span class="closed">
-                ${h.icon('lock')}
-              </span>
-          </py:if>
-        </dd>
-      </dl>
-    </div>
-
-    <div class="notes" property="rdfs:label" py:if="c.resource.get('description')">
-      <div id="notes-extract">
-        ${ h.render_markdown(c.resource.get('description')) }
-      </div>
-    </div>
-
-    <div py:if="not c.resource.get('description') and c.package.get('notes')">
-      <div>
-        <strong i18n:msg="">
-          From the <a href="${h.url_for(controller='package', action='read', id=c.package['name'])}">Dataset</a>:
-        </strong>
-      </div>
-      <div class="notes">
-        <div id="notes-extract">${h.render_markdown(c.package.get('notes')) }</div>
-      </div>
-    </div>
-
-    <div class="resource-preview">
-      <div class="preview-header">
-        <h3>Preview</h3>
-          ${ h.resource_preview(c.resource, c.package) }
-        <a py:if="c.pkg.private" title="Cannot embed as resource is private." style="display: none;" class="btn disabled" data-toggle="modal" href=".modal-data-viewer-embed-dialog">Embed</a>
-        <a py:if="not c.pkg.private" style="display: none;" class="btn btn-primary" data-toggle="modal" href=".modal-data-viewer-embed-dialog">Embed</a>
-      </div>
-      <div id="ckanext-datapreview"></div>
-    </div>
-
-    <br/>
-    <div class="resource-information">
-      <h3>Additional Information</h3>
-      <table class="table table-bordered table-striped table-condensed">
-        <thead>
-          <tr>
-            <th>Field</th>
-            <th>Value</th>
-          </tr>
-        </thead>
-        <tbody>
-          <py:for each="i, key in enumerate(sorted(c.resource.keys()))">
-            <tr py:if="not key=='description'">
-              <td class="dataset-label" property="rdfs:label">${_(key)}</td>
-              <td class="dataset-details" property="rdf:value">${c.resource[key]}</td>
-            </tr>
-          </py:for>
-        </tbody>
-      </table>
-    </div>
-
-    <span class="insert-comment-thread"></span>
-  </div>
-
-  <py:def function="optional_footer">
-    <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/resize/resize.js')}"></script>
-    <script type="text/javascript" src="${h.url_for_static('/scripts/outside.js')}"></script>
-  </py:def>
-
-  <xi:include href="layout.html" />
-</html>
-
diff --git a/ckan/templates_legacy/package/resources.html b/ckan/templates_legacy/package/resources.html
deleted file mode 100644
index a121aee70e4..00000000000
--- a/ckan/templates_legacy/package/resources.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<table>
- Someresources
-
-
-</table>
diff --git a/ckan/templates_legacy/package/search.html b/ckan/templates_legacy/package/search.html
deleted file mode 100644
index c2527a32a0e..00000000000
--- a/ckan/templates_legacy/package/search.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-
-  <xi:include href="../facets.html" />
-  <py:def function="page_title">Search - ${g.site_title}</py:def>
-  <py:def function="page_heading">Search - ${g.site_title}</py:def>
-
-  <py:match path="primarysidebar">
-    
-    <li class="widget-container boxed widget_text" py:if="h.check_access('package_create')">
-        <h3>Add a dataset</h3>
-        <p>
-            Do you know of a dataset that should be added to ${g.site_title}?
-            <br/>
-            
-            <a href="${h.url_for(controller='package', action='new', id=None)}">Register it now</a>.
-        </p>
-    </li>
-
-    ${facet_div('tags', _('Tags'))}
-    ${facet_div('res_format', _('Resource Formats'))}
-    ${facet_div('groups', _('Groups'))}
-
-    <li class="widget-container widget_text">
-        <h2>Other access</h2>
-<?python
-  from pylons import config
-  dumps_url = config.get('ckan.dumps_url')
-  dumps_format = config.get('ckan.dumps_format', '')
-?>
-        <p>
-            You can also access this registry using the 
-            ${h.link_to(_('API'), h.url_for(controller='api', action='get_api', id=None, ver=3))}
-            (see ${h.link_to(_('API Docs'), 'http://docs.ckan.org/en/latest/api/')})<py:if test="dumps_url">
-                or download a <a href="${dumps_url}">full ${dumps_format} 
-                dump</a></py:if>.
-        </p>
-    </li>
- 
-  </py:match>
-
-  <div py:match="content">
-    <xi:include href="search_form.html" />
-    ${field_list()}   
-      <py:if test="c.query_error">
-        <p i18n:msg="item_count"><strong>There was an error while searching.</strong> 
-            Please try again.</p>
-      </py:if>
-      <py:if test="request.params">      
-        <h4 i18n:msg="item_count"><strong>${c.page.item_count}</strong> datasets found</h4>            
-     </py:if>
-      <py:if test="c.page.item_count == 0 and request.params">
-        <p i18n:msg="">Would you like to <a href="${h.url_for(action='new', id=None)}">create a new dataset?</a></p>
-      </py:if>
-      ${package_list_from_dict(c.page.items)}
-      ${c.page.pager(q=c.q)}
-
-  </div>
-
-  <py:def function="optional_feed">
-  <link rel="alternate" type="application/atom+xml" title="${g.site_title} - Datasets found with custom search: '${c.search_url_params}'"
-    href="${h.url(controller='feed', action='custom')}?${c.search_url_params}" />
-  <link rel="alternate" type="application/atom+xml" title="${g.site_title} - Recent Revision History"
-    href="${h.url_for(controller='revision', action='list', format='atom', days=1)}" />
-  </py:def>
-
-  <xi:include href="layout.html" />
-</html>
-
-
diff --git a/ckan/templates_legacy/package/search_form.html b/ckan/templates_legacy/package/search_form.html
deleted file mode 100644
index e7812343599..00000000000
--- a/ckan/templates_legacy/package/search_form.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip=""
-  >
-
-<form id="dataset-search" class="dataset-search clearfix" method="GET">
-  <input type="search" class="search" name="q" value="${c.q}" autocomplete="off" results="0" placeholder="${_('Search...')}" />
-  <input type="submit" value="${_('Search')}" class="btn btn-large button" />
-  <span py:if="c.fields">
-  <py:for each="(k, v) in c.fields"> 
-    <input type="hidden" name="${k}" value="${v}" />  
-  </py:for>
-  </span>
-  <div id="dataset-search-ext"></div>
-</form>
-
-</html>
diff --git a/ckan/templates_legacy/package/snippets/data_preview.html b/ckan/templates_legacy/package/snippets/data_preview.html
deleted file mode 100644
index 57790a88680..00000000000
--- a/ckan/templates_legacy/package/snippets/data_preview.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="module-content">
-  {% if embed %}
-    {# images can be embedded directly #}
-    <img class="ckanext-datapreview-direct-embed" src="{{ resource_url }}"></img>
-  {% else %}
-    <iframe src="{{ resource_url }}" class="ckanext-datapreview-iframe" frameborder="0" scrolling="auto" width="100%">
-      <p>Your browser does not support iframes.</p>
-    </iframe>
-  {% endif %}
-</div>
diff --git a/ckan/templates_legacy/related/add-related.html b/ckan/templates_legacy/related/add-related.html
deleted file mode 100644
index a84793bbb98..00000000000
--- a/ckan/templates_legacy/related/add-related.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip=""
->
-<div class="modal-add-related modal fade in" style="display: none"
-  py:def="add_related(dataset)">
-  <div class="modal-header">
-    <a class="close" data-dismiss="modal">×</a>
-    <h3 class="heading">Add item</h3>
-  </div>
-  <div class="modal-body">
-    <form id="form-add-related" action="" method="POST" class="well">
-      <div class="control-group">
-        <input id="related-dataset" type="hidden" name="dataset_id" value="${c.pkg.id}"/>
-        <label for="related-title">Title <span class="required">(required)</span></label>
-        <input id="related-title" name="title" class="span6" placeholder='${_("Please add the title for the item")}'/>
-      </div>
-      <div class="control-group">
-        <label for="related-type">Type of item</label>
-        <select id="related-type" name="type" class="span6 chzn-select">
-          <option value="api">API</option>
-          <option value="application">Application</option>
-          <option value="idea">Idea</option>
-          <option value="news-article">News Article</option>
-          <option value="paper">Paper</option>
-          <option value="post">Post</option>
-          <option value="visualization">Visualization</option>
-        </select>
-      </div>
-      <div class="control-group">
-        <label for="related-description">Description</label>
-        <textarea id="related-description" name="description" class="input-xlarge span6" rows="4" placeholder='${_("Please describe the item")}'></textarea>
-      </div>
-      <div class="control-group">
-        <label for="related-url">URL <span class="required">(required)</span></label>
-        <input id="related-url" name="url" type="url" class="span6" placeholder='${_("Please add a url")}'/>
-      </div>
-      <div class="control-group">
-        <label for="related-image-url">Image URL</label>
-        <input id="related-image-url" name="image_url" type="url" class="span6" placeholder='${_("Please add a link to the image")}'/>
-      </div>
-      <div>
-        <button type="submit" class="btn btn-primary">Submit</button>
-        <button type="button" class="btn" data-dismiss="modal">Cancel</button>
-      </div>
-    </form>
-  </div>
-</div>
-</html>
diff --git a/ckan/templates_legacy/related/dashboard.html b/ckan/templates_legacy/related/dashboard.html
deleted file mode 100644
index 64383c390a8..00000000000
--- a/ckan/templates_legacy/related/dashboard.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:foaf="http://xmlns.com/foaf/0.1/"
-  xmlns:owl="http://www.w3.org/2002/07/owl#"
-  xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-  xmlns:dc="http://purl.org/dc/terms/"
-  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-  xmlns:dcat="http://www.w3.org/ns/dcat#"
-  typeof="dcat:Dataset"
-  about=""
-  py:strip="">
-
-  <py:def function="body_class">no-sidebar</py:def>
-  <xi:include href="add-related.html" />
-
-  <py:def function="page_title">Apps &amp; Ideas</py:def>
-
-  <py:def function="page_heading" property="dc:title">
-    Apps &amp; Ideas
-  </py:def>
-
-  <div py:match="content">
-    <h4 py:if="c.page.item_count">Showing items <strong>${c.page.first_item} - ${c.page.last_item}</strong> of <strong>${c.page.item_count}</strong> related items found</h4>
-    <h4 py:if="not c.page.item_count"><strong>${c.page.item_count}</strong> related items found</h4>
-
-    <div class="well">
-        <form action="" method="get" class="form-inline">
-            <input type='hidden' name='page' value='1'/>
-
-            <label for="type">Filter by type</label>
-            <select name="type">
-                <option value="">All</option>
-                <option value="api" py:attrs="{'selected': 'selected' if c.filters.get('type') == 'api' else None}">API</option>
-                <option value="application" py:attrs="{'selected': 'selected' if c.filters.get('type') == 'application' else None}">Application</option>
-                <option value="idea"  py:attrs="{'selected': 'selected' if c.filters.get('type') == 'idea' else None}">Idea</option>
-                <option value="news-article" py:attrs="{'selected': 'selected' if c.filters.get('type') == 'news-article' else None}">News Article</option>
-                <option value="paper" py:attrs="{'selected': 'selected' if c.filters.get('type') == 'paper' else None}">Paper</option>
-                <option value="post" py:attrs="{'selected': 'selected' if c.filters.get('type') == 'post' else None}">Post</option>
-                <option value="visualization"  py:attrs="{'selected': 'selected' if c.filters.get('type') == 'visualization' else None}">Visualization</option>
-            </select>
-
-            <label for="sort">Sort by</label>
-            <select name="sort">
-                <option value="">Default</option>
-                <option value="view_count_desc" py:attrs="{'selected': 'selected' if c.filters.get('sort') == 'view_count_desc' else None}">Most viewed</option>
-                <option value="view_count_asc" py:attrs="{'selected': 'selected' if c.filters.get('sort') == 'view_count_asc' else None}">Least viewed</option>
-
-                <option value="created_desc" py:attrs="{'selected': 'selected' if c.filters.get('sort') == 'created_desc' else None}">Newest</option>
-                <option value="created_asc" py:attrs="{'selected': 'selected' if c.filters.get('sort') == 'created_asc' else None}">Oldest</option>
-
-            </select>
-
-
-            <label for="featured">Featured items only?</label>
-            <input type="checkbox" name="featured" py:attrs="{'checked': 'checked' if c.filters.get('featured') == 'on' else None}"></input>
-            <button class="btn btn-primary pull-right">Apply</button>
-        </form>
-    </div>
-
-      <ul class="related-items thumbnails">
-        <py:for each="related in c.page.items">
-          ${related_summary(related,False)}
-        </py:for>
-      </ul>
-
-    ${c.page.pager()}
-
-    <span class="insert-comment-thread"></span>
-  </div>
-
-  <xi:include href="../layout.html" />
-</html>
-
diff --git a/ckan/templates_legacy/related/related_list.html b/ckan/templates_legacy/related/related_list.html
deleted file mode 100644
index a5342085c5e..00000000000
--- a/ckan/templates_legacy/related/related_list.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:foaf="http://xmlns.com/foaf/0.1/"
-  xmlns:owl="http://www.w3.org/2002/07/owl#"
-  xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-  xmlns:dc="http://purl.org/dc/terms/"
-  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-  xmlns:dcat="http://www.w3.org/ns/dcat#"
-  typeof="dcat:Dataset"
-  about=""
-  py:strip="">
-
-  <py:def function="body_class">no-sidebar</py:def>
-  <xi:include href="add-related.html" />
-
-  <py:def function="page_title">${c.pkg_dict.get('title', c.pkg_dict['name'])}
-  - Apps, Ideas etc</py:def>
-
-  <py:def function="page_heading" property="dc:title">
-  ${c.pkg_dict['title']} - Apps, Ideas etc
-  </py:def>
-
-  <div py:match="content">
-    ${add_related(c.pkg)}
-    <h3>Apps, Ideas etc  <i class="related-help icon-info-sign" rel="popover" data-content="These are applications, ideas, articles and visualisations that are using this dataset." data-original-title="What are apps and ideas?"></i> <a class="btn btn-small btn-primary pull-right" data-toggle="modal" href=".modal-add-related" py:if="h.check_access('related_create',{'dataset_id':c.pkg.id})"><i class="icon-plus-sign icon-white"></i> Add item</a></h3>
-    <div>
-      <div py:if="not c.pkg.related" class="span8 no-related-items">
-          There are no items here yet<span py:if="h.check_access('related_create',{'dataset_id':c.pkg.id})">, why not <a data-toggle="modal" href=".modal-add-related">add one</a>?</span>
-      </div>
-
-      <ul class="related-items thumbnails">
-        <py:for each="related in c.pkg.related">
-          ${related_summary(related, True)}
-        </py:for>
-      </ul>
-    </div>
-
-    <span class="insert-comment-thread"></span>
-  </div>
-
-  <py:def function="optional_head">
-    <script type="text/javascript" py:if="c.user">
-        function related_delete(related_id) {
-          var data = { 'id' : related_id }
-          $.ajax({
-            type: "post",
-            url: CKAN.SITE_URL + '/api/3/action/related_delete',
-            data: JSON.stringify(data),
-            success: function (data) {
-              window.location.reload();
-            },
-            error: function(err, txt, w) {
-              // This needs to be far more informative.
-              var msg = '<strong>Error:</strong> Unable to delete item';
-              $('<div class="alert alert-error" />').html(msg).hide().prependTo($('div#main')).fadeIn();
-            }
-          });
-
-        }
-    </script>
-
-      <link rel="alternate" type="application/rdf+xml" title="RDF/XML" href="${h.url(controller='package', action='read', id=c.pkg.id)}" />
-  </py:def>
-
-  <py:def function="optional_feed">
-  <link rel="alternate" type="application/atom+xml" title="Dataset History"
-    href="${h.url(controller='package', action='history', id=c.pkg.name, format='atom', days=7)}" />
-  </py:def>
-
-  <xi:include href="../package/layout.html" />
-</html>
-
diff --git a/ckan/templates_legacy/rest/__init__.py b/ckan/templates_legacy/rest/__init__.py
deleted file mode 100644
index b646540d6be..00000000000
--- a/ckan/templates_legacy/rest/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# empty file needed for pylons to find templates in this directory
diff --git a/ckan/templates_legacy/revision/__init__.py b/ckan/templates_legacy/revision/__init__.py
deleted file mode 100644
index b646540d6be..00000000000
--- a/ckan/templates_legacy/revision/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# empty file needed for pylons to find templates in this directory
diff --git a/ckan/templates_legacy/revision/diff.html b/ckan/templates_legacy/revision/diff.html
deleted file mode 100644
index fdc9628547d..00000000000
--- a/ckan/templates_legacy/revision/diff.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-  
-  <py:def function="page_title">Differences - Revisions</py:def>
-  <py:def function="body_class">${h.literal('no-sidebar')}</py:def>
-
-  <div py:match="content">
-    <h2>Revision Differences - 
-    <span py:choose="c.diff_entity">
-        <a py:when="'package'">
-            <a href="${h.url_for(controller='package', action='read', id=c.pkg.name)}">${c.pkg.name}</a>
-        </a>
-        <a py:when="'group'">
-            <a href="${h.url_for(controller='group', action='read', id=c.group.name)}">${c.group.name}</a>
-        </a>
-    </span>
-    </h2>
-        
-          
-    <p>
-    From: ${c.revision_from.id} - ${c.revision_from.timestamp}
-    </p>
-
-    <p>
-    To: ${c.revision_to.id} - ${c.revision_to.timestamp}
-    </p>
-
-    <py:if test="c.diff">
-      <table class="table table-bordered table-striped">
-        <tr>
-          <th>Field</th><th>Difference</th>
-        </tr>
-       <py:for each="field, diff in c.diff">
-          <tr><td>${field}</td><td><pre>${diff}</pre></td></tr>
-        </py:for>
-      </table>
-    </py:if>
-    <py:if test="not c.diff">
-      <h3>No differences</h3>
-    </py:if>
-  </div>
-
-  <xi:include href="layout.html" />
-</html>
diff --git a/ckan/templates_legacy/revision/layout.html b/ckan/templates_legacy/revision/layout.html
deleted file mode 100644
index fab8f069929..00000000000
--- a/ckan/templates_legacy/revision/layout.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip=""
-  >
-  <py:match path="minornavigation">
-    <ul class="nav nav-pills">
-      <li class="${'active' if c.action=='index' else ''}">${h.nav_link(h.icon('page_white_stack') + _('List'), controller='revision', action='index')}</li>
-      <py:if test="c.action=='read'">
-        <li class="divider">|</li>
-        <li class="${'active' if c.action=='read' else ''}">${h.nav_link(h.icon('page_white') + _('View'), controller='revision', action='read', id=c.id)}</li>
-      </py:if>
-    </ul>
-  </py:match>
-
-
-  <xi:include href="../layout.html" />
-</html>
-
diff --git a/ckan/templates_legacy/revision/list.html b/ckan/templates_legacy/revision/list.html
deleted file mode 100644
index 11a44326f07..00000000000
--- a/ckan/templates_legacy/revision/list.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-  
-  <py:def function="page_title">Revision History</py:def>
-  <py:def function="page_heading">Revision History</py:def>
-  <py:def function="body_class">${h.literal('no-sidebar')}</py:def>
-
-  <div py:match="content">
-    <p>Track the most recent changes to the system, with most recent
-    changes first.</p>
-      
-    ${c.page.pager()}
-
-    ${revision_list(c.page.items)}
-    
-    ${c.page.pager()}
-  </div>
-
-  <xi:include href="layout.html" />
-</html>
diff --git a/ckan/templates_legacy/revision/read.html b/ckan/templates_legacy/revision/read.html
deleted file mode 100644
index 3422095512e..00000000000
--- a/ckan/templates_legacy/revision/read.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-  
-  <py:def function="page_title">Revision ${c.revision.id}</py:def>
-  <py:def function="page_heading">Revision: ${c.revision.id}</py:def>
-
-  <py:match path="primarysidebar">
-    <li class="widget-container widget_text">
-      <h2>Revision Actions</h2>
-      <py:if test="c.revision_change_state_allowed">
-      <div class="actions">
-        <form
-          method="POST"
-          action="${h.url_for(controller='revision',
-              action='edit',
-              id=c.revision.id)}"
-          >
-          <py:if test="c.revision.state!='deleted'">
-          <button type="submit" name="action" value="delete" class="btn btn-danger">Delete</button>
-          </py:if>
-          <py:if test="c.revision.state=='deleted'">
-          <button type="submit" name="action" value="undelete" class="btn btn-danger">Undelete</button>
-          </py:if>
-        </form>
-      </div>
-      </py:if>
-    </li>
-  </py:match>
-
-  <div py:match="content" class="revision state-${c.revision.state}">
-    <p py:if="c.revision.state != 'active'" class="state-notice">
-      ${c.revision.state} 
-    </p>
-    <p>
-      <strong>Author:</strong> ${c.revision.author}
-    </p>
-    <p>
-      <strong>Timestamp:</strong> ${c.revision.timestamp}
-    </p>
-    <p><strong>Log Message:</strong></p>
-    ${c.revision.message}
-
-    <h3>Changes</h3>
-    <h4>Datasets</h4>
-    <ul>
-      <py:for each="pkg in c.packages">
-      <li>
-      ${h.link_to(pkg.name, h.url_for(controller='package', action='read', id=pkg.name))}
-      </li>
-      </py:for>
-    </ul>
-
-    <h4>Datasets' Tags</h4>
-    <ul>
-      <py:for each="pkgtag in c.pkgtags">
-      <li>
-      Dataset - ${h.link_to(pkgtag.package.name, h.url_for(controller='package', action='read', id=pkgtag.package.name))},
-      Tag - ${h.link_to(pkgtag.tag.name, h.url_for(controller='tag', action='read', id=pkgtag.tag.name))}
-      </li>
-      </py:for>
-    </ul>
-    
-    <h4>Groups</h4>
-    <ul>
-      <py:for each="group in c.groups">
-      <li>
-      ${h.link_to(group.name, h.url_for(controller='group', action='read', id=group.name))}
-      </li>
-      </py:for>
-    </ul>
-  </div>
-
-  <xi:include href="layout.html" />
-</html>
-
diff --git a/ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html b/ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html
deleted file mode 100644
index 940989792d9..00000000000
--- a/ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip=""
-  >
-
-<div class="branded-link">
-  <p>Powered by <a href="${h.url_for(controller='package', action='resource_read', id=c.package.id, resource_id=c.resource.id)}">
-  
-  ${g.site_title}
-  <img width="28" src="${h.url_for_static_or_external(g.site_logo)}" alt="${g.site_title} Logo" title="${g.site_title} Logo" id="logo" />
-  </a>
-  </p>
-</div>
-
-</html>
-
diff --git a/ckan/templates_legacy/snippets/data-viewer-embed-dialog.html b/ckan/templates_legacy/snippets/data-viewer-embed-dialog.html
deleted file mode 100644
index b0b382d4ff9..00000000000
--- a/ckan/templates_legacy/snippets/data-viewer-embed-dialog.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip=""
-  >
-
-<div class="modal-data-viewer-embed-dialog modal fade in" style="display: none;"
-  py:def="data_viewer_embed_dialog()">
-  <div class="modal-header">
-    <a class="close" data-dismiss="modal">×</a>
-    <h3>
-      Embed Data Viewer
-    </h3>
-  </div>
-  <div class="modal-body">
-    <div>
-      <p><strong>Embed this view</strong> by copying this into your webpage:</p>
-      <textarea class="embedIframeText" style="width: 100%; height: 200px;"></textarea>
-      <p>Choose width and height in pixels:</p>
-      <label for="iframe-width">Width:</label>
-      <input class="iframe-width" name="iframe-width" value="800"/>
-      <label for="iframe-height">Height:</label>
-      <input class="iframe-height" name="iframe-height" value="500"/>
-    </div>
-    <a class="embedLink" href="">Preview</a>
-  </div>
-</div>
-
-</html>
diff --git a/ckan/templates_legacy/snippets/follow_button.html b/ckan/templates_legacy/snippets/follow_button.html
deleted file mode 100644
index 1e0a0d99e51..00000000000
--- a/ckan/templates_legacy/snippets/follow_button.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip=""
-  >
-  <py:choose test="following">
-    <a py:when="True" id="${obj_type}_follow_button" class="btn btn-mini" data-obj-id="${obj_id}" data-state="unfollow">Unfollow</a>
-    <a py:otherwise="" id="${obj_type}_follow_button" class="btn btn-mini" data-obj-id="${obj_id}" data-state="follow">Follow</a>
-  </py:choose>
-</html>
diff --git a/ckan/templates_legacy/snippets/internal-tracking.html b/ckan/templates_legacy/snippets/internal-tracking.html
deleted file mode 100644
index 6979935caa4..00000000000
--- a/ckan/templates_legacy/snippets/internal-tracking.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html
-      xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:i18n="http://genshi.edgewall.org/i18n"
-      xmlns:py="http://genshi.edgewall.org/"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      py:strip="True"
-      >
-  <script type="text/javascript">
-    $(function (){
-      // Tracking
-      var url = location.pathname;
-      // remove any site root from url
-      url = url.substring(CKAN.SITE_URL.length, url.length);
-      // trim any trailing /
-      url = url.replace(/\/*$/, '');
-      $.ajax({url : CKAN.SITE_URL_NO_LOCALE + '/_tracking',
-              type : 'POST',
-              data : {url:url, type:'page'},
-              timeout : 300 });
-      $('a.resource-url-analytics').click(function (e){
-        var url = $(e.target).closest('a').attr('href');
-        $.ajax({url : CKAN.SITE_URL_NO_LOCALE + '/_tracking',
-                data : {url:url, type:'resource'},
-                type : 'POST',
-                complete : function () {location.href = url;},
-                timeout : 30});
-        e.preventDefault();
-      });
-    });
-  </script>
-</html>
diff --git a/ckan/templates_legacy/snippets/package_list.html b/ckan/templates_legacy/snippets/package_list.html
deleted file mode 100644
index c90a4b78721..00000000000
--- a/ckan/templates_legacy/snippets/package_list.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip=""
-  >
-
-  <ul class="datasets">
-    <li py:for="package in packages"
-        class="${'fullyopen' if (package.isopen and package.get('resources')) else None}">
-        <div class="header">
-      <span class="title">
-        ${h.link_to(package.get('title') or package.get('name'), h.url_for(controller='package', action='read', id=package.get('name')))}
-      </span>
-
-      <div class="search_meta">
-        <py:if test="package.resources">
-          <ul class="dataset_formats">
-            <py:for each="resource in package.resources">
-              <py:if test="resource.get('format')">
-                <li><a href="${resource.get('url')}" class="resource-url-analytics"
-                  title="${resource.get('description')}">${resource.get('format')}</a></li>
-              </py:if>
-            </py:for>
-          </ul>
-        </py:if>
-        <ul class="openness">
-          <py:if test="package.isopen">
-            <li>
-              <a href="http://opendefinition.org/okd/" title="This dataset satisfies the Open Definition.">
-                  <img src="http://assets.okfn.org/images/ok_buttons/od_80x15_blue.png" alt="[Open Data]" />
-              </a>
-            </li>
-          </py:if>
-          <py:if test="not package.isopen">
-            <li>
-              <span class="closed">
-                ${h.icon('lock')} Not Openly Licensed
-              </span>
-            </li>
-          </py:if>
-        </ul>
-      </div>
-		</div>
-		<div class="extract">
-			${h.markdown_extract(package.notes)}
-		</div>
-        <!--ul py:if="package.tags" class="tags">
-          <li py:for="tag in package.tags">${tag.name}</li>
-        </ul-->
-    </li>
-  </ul>
-
-</html>
diff --git a/ckan/templates_legacy/snippets/recline-extra-footer.html b/ckan/templates_legacy/snippets/recline-extra-footer.html
deleted file mode 100644
index 88a44ecdc6a..00000000000
--- a/ckan/templates_legacy/snippets/recline-extra-footer.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip=""
-  >
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/mustache/0.5.0-dev/mustache.js')}"></script>
-
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/slickgrid/2.0.1/slick.grid.min.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/flot/0.7/jquery.flot.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/moment/1.6.2/moment.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/leaflet/0.3.1/leaflet.js')}"></script>
-
-  <script src="${h.url_for_static('/scripts/vendor/recline/recline.js')}"></script>
-
-</html>
diff --git a/ckan/templates_legacy/snippets/recline-extra-header.html b/ckan/templates_legacy/snippets/recline-extra-header.html
deleted file mode 100644
index 0bd8333a666..00000000000
--- a/ckan/templates_legacy/snippets/recline-extra-header.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip=""
-  >
-
-  <link rel="stylesheet" href="${h.url_for_static('/scripts/vendor/slickgrid/2.0.1/slick.grid.css')}" />
-  <link rel="stylesheet" href="${h.url_for_static('/scripts/vendor/leaflet/0.3.1/leaflet.css')}" />
-  <!--[if lte IE 8]>
-  <link rel="stylesheet" href="${h.url_for_static('/scripts/vendor/leaflet/0.3.1/leaflet.ie.css')}" />
-  <![endif]-->
-  <link rel="stylesheet" href="${h.url_for_static('/scripts/vendor/recline/css/recline.css')}" />
-
-  <style type="text/css">
-    .recline-query-editor form, .recline-query-editor .text-query {
-      height: 28px;
-    }
-
-    .recline-query-editor .pagination ul {
-      margin: 0;
-      padding: 0;
-    }
-
-    .recline-slickgrid {
-      height: 550px;
-    }
-
-    .slick-header-column {
-      border-top: 0 !important;
-      border-bottom: 0 !important;
-    }
-
-    /* needed for Chrome but not FF */
-    .header .recline-query-editor .add-on {
-      margin-left: -27px;
-    }
-
-    /* needed for FF but not chrome */
-    .header .recline-query-editor .input-prepend {
-      vertical-align: top;
-    }
-  </style>
-
-</html>
diff --git a/ckan/templates_legacy/snippets/revision_list.html b/ckan/templates_legacy/snippets/revision_list.html
deleted file mode 100644
index 1450c9389ed..00000000000
--- a/ckan/templates_legacy/snippets/revision_list.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip=""
-  >
-
-  <table class="table table-bordered table-striped table-condensed">
-    <tr>
-      <th>Revision</th><th>Timestamp</th><th>Author</th><th>Entity</th><th>Log Message</th>
-    </tr>
-    <tr
-      class="state-${revision['state']}"
-      py:for="revision in revisions"
-      >
-      <td>
-        ${
-          h.link_to(revision['id'],
-            h.url_for(
-              controller='revision',
-              action='read',
-              id=revision['id'])
-            )
-        }
-        <py:if test="c.revision_change_state_allowed">
-        <div class="actions">
-          <form
-            method="POST"
-            action="${h.url_for(controller='revision',
-                action='edit',
-                id=revision['id'])}"
-		    id="undelete-${revision.id}"
-            >
-            <py:if test="revision['state']!='deleted'">
-            <button type="submit" name="action" value="delete" class="btn btn-small">Delete</button>
-            </py:if>
-            <py:if test="revision['state']=='deleted'">
-            <button type="submit" name="action" value="undelete" class="btn btn-small">Undelete</button>
-            </py:if>
-          </form>
-        </div>
-        </py:if>
-      </td>
-      <td>${h.render_datetime(revision['timestamp'], with_hours=True)}</td>
-      <td>${h.linked_user(revision['author'])}</td>
-      <td>
-        <py:for each="pkg in revision['packages']">
-          <a href="${h.url_for(controller='package', action='read', id=pkg)}">${pkg}</a>
-        </py:for>
-        <py:for each="grp in revision['groups']">
-          <a href="${h.url_for(controller='group', action='read', id=grp)}">${grp}</a>
-        </py:for>
-      </td>
-      <td>${revision['message']}</td>
-    </tr>
-  </table>
-</html>
diff --git a/ckan/templates_legacy/storage/index.html b/ckan/templates_legacy/storage/index.html
deleted file mode 100644
index f26f87b8542..00000000000
--- a/ckan/templates_legacy/storage/index.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-
-  <py:def function="page_title">Upload</py:def>
-
-  <py:def function="optional_head">
-    <script type="text/javascript">
-      var form_data = ${c.data_json};
-    </script>
-  </py:def>
-
-  <div py:match="content">
-    <h1>Upload</h1>
-
-    <p>This upload form is valid for a limited time (usually 1h or so). If the
-    form expires please reload the page.</p>
-
-    <form action="${c.data['action']}"
-      enctype="multipart/form-data"
-      method="POST">
-
-      <py:for each="field in c.data['fields']">
-      <input type="hidden" name="${field['name']}" value="${field['value']}" />
-      </py:for>
-      <!--
-      <input type="text" name="filename" value="" />
-      -->
-      <fieldset>
-        <dl>
-          <dt>
-            <label>File:</label>
-          </dt>
-          <dd>
-            ${h.file('file', size=50)}
-          </dd>
-        </dl>
-        <!--
-        <dl>
-          <dt>
-            <label>Related Package [optional]</label>
-          </dt>
-          <dd>
-            ${h.text('dir', value=c.dir, size=50)}
-          </dd>
-        </dl>
-        -->
-        <div class="submit">
-          <input type="submit" value="Upload &raquo;" />
-        </div>
-      </fieldset>
-    </form>
-  </div>
-
-  <xi:include href="../layout.html" />
-</html>
-
diff --git a/ckan/templates_legacy/storage/success.html b/ckan/templates_legacy/storage/success.html
deleted file mode 100644
index c3c387ddce0..00000000000
--- a/ckan/templates_legacy/storage/success.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-
-  <py:def function="page_title">Upload</py:def>
-
-  <py:def function="optional_head">
-  </py:def>
-
-  <div py:match="content">
-    <h1>Upload - Successful</h1>
-
-    <p>Filed uploaded to:</p>
-    <p><a href="${c.file_url}">${c.file_url}</a></p>
-
-    <p><a href="${c.upload_url}">Upload another &raquo;</a></p>
-  </div>
-
-  <xi:include href="../layout.html" />
-</html>
-
diff --git a/ckan/templates_legacy/tag/__init__.py b/ckan/templates_legacy/tag/__init__.py
deleted file mode 100644
index b646540d6be..00000000000
--- a/ckan/templates_legacy/tag/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# empty file needed for pylons to find templates in this directory
diff --git a/ckan/templates_legacy/tag/index.html b/ckan/templates_legacy/tag/index.html
deleted file mode 100644
index 8c383c8c87f..00000000000
--- a/ckan/templates_legacy/tag/index.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-  
-  <py:def function="page_title">Tags</py:def>
-
-  <div py:match="content">
-    <h2>Tags</h2>
-
-    <form class="form-inline" id="tag-search" action="" method="GET">
-      <input type="text" id="q" name="q" value="${c.q}" />
-      <input class="btn btn-primary" type="submit" name="search" value="${_('Search')} &raquo;" />
-    </form>
-    
-    <hr />
-    
-    <p>
-      <py:choose test="">
-        <py:when test="c.q" i18n:msg="item_count, tagname">
-          There are <strong>${c.page.item_count}</strong> results for &lsquo;<strong>${c.q.strip()}</strong>&rsquo;.
-        </py:when>
-        <py:otherwise i18n:msg="item_count">
-          There are <strong>${c.page.item_count}</strong> results for tags.
-        </py:otherwise>
-      </py:choose>
-    </p>
-    
-    ${c.page.pager(q=c.q)}
-    ${tag_list(c.page.items)}
-    ${c.page.pager(q=c.q)}
-    
-    <p py:if="c.q">
-      ${h.link_to(_('Clear search'), h.url_for(controller='tag', action='index', id=None))} and see all tags.
-    </p>
-    
-  </div>
-
-  <xi:include href="layout.html" />
-</html>
diff --git a/ckan/templates_legacy/tag/layout.html b/ckan/templates_legacy/tag/layout.html
deleted file mode 100644
index f202ec1bdfb..00000000000
--- a/ckan/templates_legacy/tag/layout.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip=""
-  >
-  
-  <xi:include href="../layout.html" />
-</html>
-
diff --git a/ckan/templates_legacy/tag/read.html b/ckan/templates_legacy/tag/read.html
deleted file mode 100644
index 65256f0295f..00000000000
--- a/ckan/templates_legacy/tag/read.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-  
-  <py:def function="page_title">${c.tag['display_name']} - Tags</py:def>
-  <py:def function="page_heading">Tag: ${c.tag['display_name']}</py:def>
-
-  <div py:match="content">
-    <p i18n:msg="count, tagname">There are ${len(c.tag['packages'])} datasets tagged with <strong>${c.tag['display_name']}</strong>:</p>
-    ${package_list_from_dict(c.tag['packages'])}
-  </div>
-
-  <py:def function="optional_feed">
-  <link rel="alternate" type="application/atom+xml" title="${g.site_title} - Datasets tagged with '${c.tag['name']}'"
-    href="${h.url(controller='feed', action='tag', id=c.tag['name'])}" />
-  <link rel="alternate" type="application/atom+xml" title="${g.site_title} - Recent Revision History"
-    href="${h.url_for(controller='revision', action='list', format='atom', days=1)}" />
-  </py:def>
-
-
-  <xi:include href="layout.html" />
-</html>
-
-
diff --git a/ckan/templates_legacy/user/__init__.py b/ckan/templates_legacy/user/__init__.py
deleted file mode 100644
index b646540d6be..00000000000
--- a/ckan/templates_legacy/user/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# empty file needed for pylons to find templates in this directory
diff --git a/ckan/templates_legacy/user/dashboard.html b/ckan/templates_legacy/user/dashboard.html
deleted file mode 100644
index 289d6516769..00000000000
--- a/ckan/templates_legacy/user/dashboard.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-    xmlns:i18n="http://genshi.edgewall.org/i18n"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    py:strip="">
-
-    <py:def function="page_title">${c.user} - Dashboard - User</py:def>
-    <py:def function="page_heading">
-        ${h.linked_gravatar(c.user_dict['email_hash'],48)}
-        <span class="username">${c.user_dict['name']}</span>
-        <py:if test="c.user_dict['fullname']">
-        <span class="fullname">(${c.user_dict['fullname']})</span>
-        </py:if>
-    </py:def>
-
-
-    <div py:match="content">
-        <h2>What's going on?</h2>
-        <div class="activity-stream">
-            <!--checkpoint:my-dashboard-->
-            ${h.dashboard_activity_stream(c.user_dict['id'])}
-        </div>
-    </div>
-
-    <div py:match="primarysidebar">
-        <h3>Nothing new on CKAN?</h3>
-        <h4>So, why don't you ...</h4>
-        <ul>
-            <li><a href="${h.url(controller='package', action='new')}">Add a new dataset</a></li>
-            <li><a href="${h.url(controller='user', action='index')}">Follow another user</a></li>
-            <li><a href="${h.url(controller='group', action='index')}">Create a group or a tag</a></li>
-            <li><a href="${h.url(controller='package', action='search')}">Or simply browse the repository</a></li>
-        </ul>
-    </div>
-
-    <xi:include href="layout.html" />
-</html>
diff --git a/ckan/templates_legacy/user/edit.html b/ckan/templates_legacy/user/edit.html
deleted file mode 100644
index 198f5470cfd..00000000000
--- a/ckan/templates_legacy/user/edit.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-  
-  <py:def function="page_title">${c.user} - Edit - User</py:def>
-  <py:def function="page_heading">
-      Edit User: ${c.user_name}
-  </py:def>
-
-  <div py:match="content">
-    ${Markup(c.form)}
-  </div>
-
-  <xi:include href="layout.html" />
-</html>
diff --git a/ckan/templates_legacy/user/edit_user_form.html b/ckan/templates_legacy/user/edit_user_form.html
deleted file mode 100644
index 7a297d072d6..00000000000
--- a/ckan/templates_legacy/user/edit_user_form.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<form
-  id="user-edit"
-  action=""
-  method="post"
-  class="form-horizontal ${'has-errors' if errors else ''}"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude">
-
-  <xi:include href="../_util.html" />
-
-<div class="alert alert-error error-explanation" py:if="error_summary">
-<h2>Errors in form</h2>
-<p>The form contains invalid entries:</p>
-<ul>
-  <li py:for="key, error in error_summary.items()">${"%s: %s" % (key, error)}</li>
-</ul>
-</div>
-  <fieldset>
-    <div class="control-group">
-      <label for="fullname" class="control-label">Full name</label>
-      <div class="controls">
-        <input type="text" name="fullname" value="${data.get('fullname','')}" />
-      </div>
-    </div>
-    <div class="control-group">
-      <label for="email" class="control-label">E-mail</label>
-      <div class="controls">
-        <input type="text" name="email" value="${data.get('email','')}" />
-      </div>
-    </div>
-    <div class="control-group" py:if="g.openid_enabled">
-      <label for="openid" class="control-label">OpenId</label>
-      <div class="controls">
-        <input type="text" name="openid" value="${data.get('openid','')}" />
-      </div>
-    </div>
-    <div class="control-group">
-      <label for="about" class="control-label">About</label>
-      <div class="controls">
-        ${markdown_editor('about',data.get('about',''),'about',_('A little about you...'))}
-      </div>
-    </div>
-  </fieldset>
-  <fieldset>
-    <legend>Change your password</legend>
-    <div class="control-group">
-      <label for="password1" class="control-label">Password</label>
-      <div class="controls">
-        <input type="password" name="password1" value="" />
-      </div>
-    </div>
-    <div class="control-group">
-      <label for="password2" class="control-label">Password (repeat)</label>
-      <div class="controls">
-        <input type="password" name="password2" value="" />
-      </div>
-    </div>
-  </fieldset>
-  <fieldset>
-    <legend>Change your username</legend>
-    <div class="control-group">
-      <label for="name" class="control-label">Username</label>
-      <div class="controls">
-        <input type="text" name="name" value="${data.get('name','')}" />
-        <p>Changing your username will log you out, and require you to log back in with the new username</p>
-      </div>
-    </div>
-  </fieldset>
-  <div class="form-actions">
-    <input id="save" class="btn btn-primary" name="save" type="submit" value="${_('Save Changes')}" />
-    <input id="cancel" class="btn href-action" name="cancel" type="reset" value="${_('Cancel')}" action="${h.url_for(controller='user', action='me')}" />
-  </div>
-</form>
-
diff --git a/ckan/templates_legacy/user/followers.html b/ckan/templates_legacy/user/followers.html
deleted file mode 100644
index 1540c7f7cf3..00000000000
--- a/ckan/templates_legacy/user/followers.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-  
-  <py:def function="page_title">${c.user} - Followers - User</py:def>
-  <py:def function="page_heading">
-      ${c.user_dict.display_name}'s Followers
-  </py:def>
-
-  <div py:match="content">
-    <ul class="userlist">
-     <li py:for="follower in c.followers" class="user">
-        <ul>
-          ${h.linked_user(follower['name'], maxlength=20)}
-        </ul>
-      </li>
-    </ul>
-  </div>
-
-  <xi:include href="layout.html" />
-</html>
diff --git a/ckan/templates_legacy/user/layout.html b/ckan/templates_legacy/user/layout.html
deleted file mode 100644
index da2e3cc4e6c..00000000000
--- a/ckan/templates_legacy/user/layout.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip=""
-  >
-
-  <py:match path="minornavigation">
-    <ul class="nav nav-pills" py:choose="c.is_myself">
-      <py:when test="True">
-        <li class="${'active' if c.action=='dashboard' else ''}"><a href="${h.url_for(controller='user', action='dashboard')}">Dashboard</a></li>
-        <li class="${'active' if c.action=='read' else ''}"><a href="${h.url_for(controller='user', action='read', id=c.user_dict.name)}">My Profile</a></li>
-        <li class="${'active' if c.action=='edit' else ''}"><a href="${h.url_for(controller='user', action='edit')}">Edit Profile</a></li>
-        <li><a href="${h.url_for('/user/logout')}">Log out</a></li>
-        <li style="float:right;" class="${'active' if c.action=='followers' else ''}">
-          ${h.nav_link(
-            h.icon('followers') + _('My Followers ({num_followers})').format(num_followers=h.follow_count('user', c.user_dict.id)),
-            controller='user',
-            action='followers',
-            id=c.user_dict.name)}
-        </li>
-      </py:when>
-      <py:otherwise>
-        <py:if test="c.id">
-          <li class="${'active' if c.action=='read' else ''}"><a href="${h.url_for(controller='user', action='read', id=c.user_dict.name)}">View Profile</a></li>
-          <li style="float:right;" class="${'active' if c.action=='followers' else ''}">
-            ${h.nav_link(
-              h.icon('followers') + _('Followers ({num_followers})').format(num_followers=h.follow_count('user', c.user_dict.id)),
-              controller='user',
-              action='followers',
-              id=c.user_dict.name)}
-          </li>
-          <li py:if="c.user" style="float:right;">
-            ${h.follow_button('user', c.user_dict.id)}
-          </li>
-        </py:if>
-        <py:if test="not c.id">
-          <li class="${'active' if c.action=='login' else ''}"><a href="${h.url_for(controller='user', action='login')}">Login</a></li>
-          <li class="${'active' if c.action=='register' else ''}"><a href="${h.url_for(controller='user', action='register')}">Register Account</a></li>
-        </py:if>
-      </py:otherwise>
-    </ul>
-  </py:match>
-
-
-  <xi:include href="../layout.html" />
-</html>
-
diff --git a/ckan/templates_legacy/user/list.html b/ckan/templates_legacy/user/list.html
deleted file mode 100644
index 1ef2655f697..00000000000
--- a/ckan/templates_legacy/user/list.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-  
-  <py:def function="page_title">Users</py:def>
-  <py:def function="page_heading">Users</py:def>
-  
-  <py:match path="primarysidebar">
-    <li class="widget-container widget_text">
-      <h3>Search Users</h3>
-      <form id="user-search" class="form-inline user-search" action="" method="GET">
-        <input type="text" class="input-medium" id="q" name="q" value="${c.q}" />
-        <input type="submit" class="btn btn-small btn-primary" name="" value="${_('Search')} &raquo;" />
-      </form>
-      <p py:if="c.q" i18n:msg="item_count">
-        <strong>${c.page.item_count}</strong> users found.
-      </p>
-    </li>
-  </py:match>
-  
-  <py:match path="minornavigation">
-    <ul class="nav nav-pills">
-      <li class="${'active' if c.order_by=='name' else ''}">
-        <a href="?q=${c.q}&amp;order_by=name" rel="nofollow">Sort by name</a>
-      </li>
-      <li class="${'active' if c.order_by=='edits' else ''}">
-        <a href="?q=${c.q}&amp;order_by=edits" rel="nofollow">Sort by edits</a>
-      </li>
-    </ul>
-  </py:match>
-
-
-  <div py:match="content">
-    <ul class="userlist">
-     <li py:for="user in c.page.items" class="user">
-        <ul>
-          <li class="username">
-          ${h.linked_user(user['name'], maxlength=20)}
-          </li>
-          <li class="created">
-            Member for ${h.time_ago_in_words_from_str(user['created'].isoformat(),granularity='month')}
-          </li>
-          <li>
-            <span class="edits" title="${user['number_of_edits']} Edits">
-              ${user['number_of_edits']}
-            </span>
-            <span class="administered"
-              title="${user['number_administered_packages']} Administered">
-              <span class="badge">
-                ●
-              </span>
-              ${user['number_administered_packages']}
-            </span>
-          </li>
-        </ul>
-      </li>
-    </ul>
-    ${c.page.pager(q=c.q,order_by=c.order_by)}
-  </div>
-
-  <xi:include href="layout.html" />
-</html>
diff --git a/ckan/templates_legacy/user/login.html b/ckan/templates_legacy/user/login.html
deleted file mode 100644
index f6eb45b0de6..00000000000
--- a/ckan/templates_legacy/user/login.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-
-  <py:def function="optional_head">
-    <!-- Simple OpenID Selector -->
-    <link rel="stylesheet" href="${h.url_for_static('/scripts/vendor/openid-selector/css/openid.css')}" />
-  </py:def>
-  <py:def function="optional_footer">
-    <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/openid-selector/js/openid-jquery.js')}"></script>
-    <script type="text/javascript">
-      $(document).ready(function() {
-          openid.init('openid_identifier');
-      });
-    </script>
-  </py:def>
-  
-  <py:def function="page_title">Login - User</py:def>
-  <py:def function="page_heading">Login to ${g.site_title}</py:def>
-  <py:def function="body_class">no-sidebar</py:def>
-
-  <div py:match="content">
-
-    <form action="${c.login_handler}" method="post" class="form-horizontal" id="login">  
-      <fieldset>
-        <!--legend i18n:msg="site_title">Login</legend-->
-        <div class="control-group">
-          <label class="control-label" for="login">Login:</label>
-          <div class="controls">
-            <input type="text" class="input-xlarge" name="login" id="login" value="" />
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="password">Password:</label>
-          <div class="controls">
-            <input type="password" name="password" id="password" value="" />
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="remember">Remember me:</label>
-          <!-- optional 2 year cookie expiry -->
-          <div class="controls">
-            <input type="checkbox" name="remember" id="remember" value="63072000" checked="checked"/>
-          </div>
-        </div>        
-
-        <div class="form-actions">
-          <button name="s" id="s" type="submit" class="btn btn-primary">${_('Sign In')}</button>
-          &mdash; 
-          <a href="${h.url_for(controller='user', action='request_reset')}">Forgot your password?</a>
-        </div>
-      </fieldset>
-    </form>
-    <br/> 
-    <!-- Simple OpenID Selector -->
-    <form py:if="g.openid_enabled" action="${h.url_for('/login_openid')}" method="post"
-      class="simple-form" id="openid_form">
-      <input type="hidden" name="action" value="verify" />
-      <fieldset>
-        <legend i18n:msg="site_title">Login using Open ID</legend>
-        <p i18n:msg="site_title">NB: To set-up your OpenID for this site, you first need to <a href="${h.url_for(controller='user', action='register')}">Register</a> and then edit your Profile to provide your OpenID.</p>
-        <div id="openid_choice">
-          <p>Please click your account provider:</p>
-          <div id="openid_btns"></div>
-        </div>
-        <div id="openid_input_area">
-          <label for="openid_identifier">OpenID Identifier:</label>
-          <input id="openid_identifier" name="openid_identifier" type="text" value="http://" />
-        </div>
-      <div py:if="g.openid_enabled">
-        <h3>Don't have an OpenID?</h3>
-        <p i18n:msg="">
-          OpenID is service that allows you to log-on to many different websites
-          using a single identity. Find out <a href="http://openid.net/what/">more
-          about OpenID</a> and <a href="http://openid.net/get/">how to get an
-          OpenID enabled account</a>. Probably the simplest way is sign up with a
-          free OpenID provider such as <a 
-          href="https://www.myopenid.com/">https://www.myopenid.com/</a>.
-        </p>
-      </div>
-      </fieldset>
-      <input id="openid_submit" type="submit" class="btn primary" value="${_('Sign in with OpenID')}"/>
-    </form>
-  </div>
-  <xi:include href="layout.html" />
-</html>
diff --git a/ckan/templates_legacy/user/logout.html b/ckan/templates_legacy/user/logout.html
deleted file mode 100644
index 0f372721954..00000000000
--- a/ckan/templates_legacy/user/logout.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-  
-  <py:def function="page_title">Logout - User</py:def>
-
-  <py:def function="page_title">Logout</py:def>
-  <py:def function="page_heading">Logout from ${g.site_title}</py:def>
-  <py:def function="body_class">no-sidebar</py:def>
-
-  <div py:match="content">
-    <p>You have logged out successfully.</p>
-  </div>
-
-  <xi:include href="layout.html" />
-</html>
diff --git a/ckan/templates_legacy/user/logout_first.html b/ckan/templates_legacy/user/logout_first.html
deleted file mode 100644
index 603a7cdbb2e..00000000000
--- a/ckan/templates_legacy/user/logout_first.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-
-  <py:def function="page_title">Logged in - User</py:def>
-  <py:def function="page_heading">Logged into ${g.site_title}</py:def>
-
-  <div py:match="content">
-
-    <p>
-    ${h.linked_user(c.user)} is currently logged in
-    </p>
-
-    <p>
-    To register or log in as another user, you need to 
-    <a href="${h.url_for('/user/logout')}">logout</a>
-    first.
-    </p>
-
-  </div>
-
-  <xi:include href="layout.html" />
-</html>
diff --git a/ckan/templates_legacy/user/new.html b/ckan/templates_legacy/user/new.html
deleted file mode 100644
index a1f9612b1c6..00000000000
--- a/ckan/templates_legacy/user/new.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-  
-  <py:def function="page_title">Register - User</py:def>
-  <py:def function="page_heading">Register for a new Account</py:def>
-
-  <div py:match="content">
-    ${Markup(c.form)}
-  </div>
-
-  <xi:include href="layout.html" />
-</html>
-
diff --git a/ckan/templates_legacy/user/new_user_form.html b/ckan/templates_legacy/user/new_user_form.html
deleted file mode 100644
index ea22398d414..00000000000
--- a/ckan/templates_legacy/user/new_user_form.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<form 
-  id="user-edit" 
-  action="" 
-  method="post"
-  class="form-horizontal ${'has-errors' if errors else ''}"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<div class="alert alert-error error-explanation" py:if="error_summary">
-  <h2>Errors in form</h2>
-  <p>The form contains invalid entries:</p>
-  <ul>
-    <li py:for="key, error in error_summary.items()">${"%s: %s" % (key, error)}</li>
-  </ul>
-</div>
-
-<div class="control-group">
-  <label for="name" class="control-label">Login</label>
-  <div class="controls">
-    <input type="text" name="name" value="${data.get('name','')}" />
-    <p>3+ chars, using only 'a-z0-9' and '-_'</p>
-    <p class="field_error" py:if="errors.get('name', '')">${errors.get('name', '')}</p>
-  </div>
-</div>
-<div class="control-group">
-  <label for="fullname" class="control-label">Full name (optional)</label>
-  <div class="controls">
-    <input type="text" name="fullname" value="${data.get('fullname','')}" />
-    <p class="field_error" py:if="errors.get('fullname', '')">${errors.get('fullname', '')}</p>
-  </div>
-</div>
-<div class="control-group">
-  <label for="email" class="control-label">E-Mail</label>
-  <div class="controls">
-    <input type="text" name="email" value="${data.get('email','')}" />
-  </div>
-</div>
-<div class="control-group">
-  <label for="password1" class="control-label">Password</label>
-  <div class="controls">
-    <input type="password" name="password1" value="" />
-    <p class="field_error" py:if="errors.get('password1', '')">${errors.get('password1', '')}</p>
-  </div>
-</div>
-<div class="control-group">
-  <label for="password2" class="control-label">Password (repeat)</label>
-  <div class="controls">
-    <input type="password" name="password2" value="" />
-  </div>
-</div>
-<div class="control-group" py:if="g.recaptcha_publickey">
-  <div class="controls">
-    <script type="text/javascript" src="http://www.google.com/recaptcha/api/challenge?k=${g.recaptcha_publickey}"></script>
-    <noscript>
-      <iframe src="http://www.google.com/recaptcha/api/noscript?k=${g.recaptcha_publickey}"
-        height="300" width="500" frameborder="0"></iframe><br/>
-      <textarea name="recaptcha_challenge_field" rows="3" cols="40"> </textarea>
-      <input type="hidden" name="recaptcha_response_field" value="manual_challenge" />
-    </noscript>
-  </div>
-</div>
-
-<div class="form-actions">
-    <input id="save" name="save" type="submit" class="btn btn-primary" value="${_('Register now')} &raquo;" />
-</div>
-</form>
diff --git a/ckan/templates_legacy/user/perform_reset.html b/ckan/templates_legacy/user/perform_reset.html
deleted file mode 100644
index 82309feec08..00000000000
--- a/ckan/templates_legacy/user/perform_reset.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-  
-  <py:def function="page_title">Reset your password</py:def>
-
-  <div py:match="content">
-    <form id="user-reset" action="" method="post" class="simple-form" 
-      xmlns:py="http://genshi.edgewall.org/"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      >
-      <fieldset>
-        <legend>Reset your password</legend>
-        <label for="password1">Password:</label>
-        <input type="password" name="password1" value="" />
-        <br/>
-        <label for="password2">Password (repeat):</label>
-        <input type="password" name="password2" value="" />
-        <br/>
-      </fieldset>
-      <div>
-        <input type="submit" id="save" name="save" class="btn primary" value="Save" />
-      </div>
-    </form>
-  </div>
-
-  <xi:include href="layout.html" />
-</html>
-
diff --git a/ckan/templates_legacy/user/read.html b/ckan/templates_legacy/user/read.html
deleted file mode 100644
index f93a64635df..00000000000
--- a/ckan/templates_legacy/user/read.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-
-  <py:def function="page_title">${c.user_dict['display_name']} - User</py:def>
-  <py:def function="page_heading">
-    ${h.linked_gravatar(c.user_dict['email_hash'],48)}
-    <span class="username">
-    ${c.user_dict['name']}
-    </span>
-    <py:if test="c.user_dict['fullname']">
-    <span class="fullname">
-      (${c.user_dict['fullname']})
-    </span>
-    </py:if>
-  </py:def>
-
-  <div py:match="content" py:strip="">
-    <div class="summary">
-      <div class="row">
-        <div class="span6">
-          <dl class="vcard">
-            <dt>Name</dt>
-            <dd>${c.user_dict['fullname'] or 'No name provided'}</dd>
-            <dt>Member since</dt>
-            <dd>${h.render_datetime(c.user_dict['created'])}</dd>
-            <py:if test="unicode(c.about_formatted)">
-            <dt>About</dt>
-            <dd>${c.about_formatted}</dd>
-            </py:if>
-          <py:if test="c.is_myself">
-            <dt>Email</dt>
-            <dd>
-              <py:if test="c.user_dict['email']">
-              ${h.mail_to(c.user_dict['email'], encode='javascript')}
-              </py:if>
-              <py:if test="not c.user_dict['email']">
-              No email
-              </py:if>
-            </dd>
-            <!--checkpoint:is-myself-->
-            <dt>API Key</dt>
-            <dd>
-            ${c.user_dict['apikey']}
-            <br />
-            <em>&ndash; Note: your API key is visible only to you!</em>
-            </dd>
-          </py:if>
-          </dl>
-        </div>
-        <div class="span6">
-          <ul class="stats">
-            <li>
-              <strong>${c.user_dict['number_administered_packages']}</strong>
-              <span>Datasets</span>
-            </li>
-            <li>
-              <strong>${c.user_dict['number_of_edits']}</strong>
-              <span>Edits</span>
-            </li>
-            <li>
-              <a href="${h.url_for(controller='user', action='followers',
-                  id=c.user_dict.name)}">
-                <strong>${c.num_followers}</strong>
-                <span>Followers</span>
-              </a>
-            </li>
-          </ul>
-        </div>
-      </div><!-- /row -->
-    </div><!-- /summary -->
-    <div class="rule"></div>
-
-    <div class="listing">
-      <div class="row">
-        <div class="span6">
-          <div class="datasets">
-            <h2>Datasets</h2>
-            ${package_list_from_dict(c.user_dict['datasets'])}
-          </div>
-        </div>
-        <div class="span6">
-          <div class="changes">
-            <h2>Public Activity</h2>
-            <div class="activity-stream">
-              ${c.user_activity_stream}
-            </div>
-          </div>
-        </div>
-      </div><!-- /row -->
-    </div><!-- /listing -->
-  </div>
-
-  <xi:include href="layout.html" />
-</html>
diff --git a/ckan/templates_legacy/user/request_reset.html b/ckan/templates_legacy/user/request_reset.html
deleted file mode 100644
index 49020c89174..00000000000
--- a/ckan/templates_legacy/user/request_reset.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  py:strip="">
-  
-  <py:def function="page_title">Reset password</py:def>
-  <py:def function="page_heading">Request a password reset</py:def>
-
-  <div py:match="content">
-    <form id="user-password-reset" action="" method="post" class="simple-form" 
-      >
-      <fieldset>
-        <label for="user">User name:</label>
-        <input type="text" name="user" value="" /><br/>
-      </fieldset>
-      <div>
-        <input type="submit" id="reset" name="reset" class="btn primary" value="Reset Password" />
-      </div>
-    </form>
-  </div>
-
-  <xi:include href="layout.html" />
-</html>
-
diff --git a/ckan/tests/functional/test_activity.py b/ckan/tests/functional/test_activity.py
index fa4b80423c0..7458651bdc9 100644
--- a/ckan/tests/functional/test_activity.py
+++ b/ckan/tests/functional/test_activity.py
@@ -49,7 +49,7 @@ def test_user_activity(self):
             'allow_partial_update': True,
             }
         user = user_create(context, user_dict)
-        offset = url_for(controller='user', action='read', id=user['id'])
+        offset = url_for(controller='user', action='activity', id=user['id'])
         result = self.app.get(offset, status=200)
         stripped = self.strip_tags(result)
         assert '%s signed up' % user['fullname'] in stripped, stripped
@@ -231,8 +231,8 @@ def test_user_activity(self):
         # By now we've created >15 activities, but only the latest 15 should
         # appear on the page.
         result = self.app.get(offset, status=200)
-        assert result.body.count('<div class="activity">') \
-                == 15
+        assert result.body.count('<span class="actor">') \
+                == 15, result.body.count('<span class="actor">')
 
         # The user's dashboard page should load successfully and have the
         # latest 15 activities on it.
@@ -241,4 +241,5 @@ def test_user_activity(self):
                 str(ckan.model.User.get('billybeane').apikey)}
         result = self.app.post(offset, extra_environ=extra_environ,
                 status=200)
-        assert result.body.count('<div class="activity">') == 15
+        assert result.body.count('<span class="actor">') == 15, \
+            result.body.count('<span class="actor">')
diff --git a/ckan/tests/functional/test_admin.py b/ckan/tests/functional/test_admin.py
index 38083df569e..4be776c0bf6 100644
--- a/ckan/tests/functional/test_admin.py
+++ b/ckan/tests/functional/test_admin.py
@@ -149,124 +149,3 @@ def get_roles_by_name(user=None, group=None):
         assert get_roles_by_name(user=u'tester') == ['admin'], \
             "tester should be an admin now"
 
-
-
-class TestAdminTrashController(WsgiAppCase):
-    def setup(cls):
-        CreateTestData.create()
-
-    def teardown(self):
-        model.repo.rebuild_db()
-
-    def test_purge_revision(self):
-        as_testsysadmin = {'REMOTE_USER': 'testsysadmin'}
-
-        # Put a revision in deleted state
-        rev = model.repo.youngest_revision()
-        revid = rev.id
-        rev.state = model.State.DELETED
-        model.Session.commit()
-
-        # check it shows up on trash page and
-        url = url_for('ckanadmin', action='trash')
-        response = self.app.get(url, extra_environ=as_testsysadmin)
-        assert revid in response, response
-
-        # check it can be successfully purged
-        form = response.forms['form-purge-revisions']
-        res = form.submit('purge-revisions', status=[302], extra_environ=as_testsysadmin)
-        res = res.follow(extra_environ=as_testsysadmin)
-        assert not revid in res, res
-        rev = model.Session.query(model.Revision).filter_by(id=revid).first()
-        assert rev is None, rev
-
-    def test_purge_package(self):
-        as_testsysadmin = {'REMOTE_USER': 'testsysadmin'}
-
-        # Put packages in deleted state
-        rev = model.repo.new_revision()
-        pkg = model.Package.by_name(u'warandpeace')
-        pkg.state = model.State.DELETED
-        model.repo.commit_and_remove()
-
-        # Check shows up on trash page
-        url = url_for('ckanadmin', action='trash')
-        response = self.app.get(url, extra_environ=as_testsysadmin)
-        assert 'dataset/warandpeace' in response, response
-
-        # Check we get correct error message on attempted purge
-        form = response.forms['form-purge-packages']
-        response = form.submit('purge-packages', status=[302],
-                extra_environ=as_testsysadmin)
-        response = response.follow(extra_environ=as_testsysadmin)
-        assert 'Cannot purge package' in response, response
-        assert 'dataset/warandpeace' in response
-
-        # now check we really can purge when things are ok
-        model.repo.new_revision()
-        pkg = model.Package.by_name(u'annakarenina')
-        pkg.state = model.State.DELETED
-        model.repo.commit_and_remove()
-
-        response = self.app.get(url, extra_environ=as_testsysadmin)
-        assert 'dataset/warandpeace' in response, response
-        assert 'dataset/annakarenina' in response, response
-
-        form = response.forms['form-purge-packages']
-        res = form.submit('purge-packages', status=[302], extra_environ=as_testsysadmin)
-        res = res.follow(extra_environ=as_testsysadmin)
-
-        pkgs = model.Session.query(model.Package).all()
-        assert len(pkgs) == 0
-
-    def test_purge_youngest_revision(self):
-        as_testsysadmin = {'REMOTE_USER': 'testsysadmin'}
-
-        id = u'warandpeace'
-        log_message = 'test_1234'
-        edit_url = url_for(controller='package', action='edit', id=id)
-
-        # Manually create a revision
-        res = self.app.get(edit_url, extra_environ=as_testsysadmin)
-        fv = res.forms['dataset-edit']
-        fv['title'] = 'RevisedTitle'
-        fv['log_message'] = log_message
-        res = fv.submit('save', extra_environ=as_testsysadmin)
-
-        # Delete that revision
-        rev = model.repo.youngest_revision()
-        assert rev.message == log_message
-        rev.state = model.State.DELETED
-        model.Session.commit()
-
-        # Run a purge
-        url = url_for('ckanadmin', action='trash')
-        res = self.app.get(url, extra_environ=as_testsysadmin)
-        form = res.forms['form-purge-revisions']
-        res = form.submit('purge-revisions', status=[302], extra_environ=as_testsysadmin)
-        res = res.follow(extra_environ=as_testsysadmin)
-
-        # Verify the edit page can be loaded (ie. does not 404)
-        res = self.app.get(edit_url, extra_environ=as_testsysadmin)
-
-    def test_undelete(self):
-        as_testsysadmin = {'REMOTE_USER': 'testsysadmin'}
-
-        rev = model.repo.youngest_revision()
-        rev_id = rev.id
-        rev.state = model.State.DELETED
-        model.Session.commit()
-
-        # Click undelete
-        url = url_for('ckanadmin', action='trash')
-        res = self.app.get(url, extra_environ=as_testsysadmin)
-        form = res.forms['undelete-'+rev.id]
-        res = form.submit('action', status=[302], extra_environ=as_testsysadmin)
-        res = res.follow(extra_environ=as_testsysadmin)
-
-        assert 'Revision updated' in res
-        assert not 'DELETED' in res
-
-        rev = model.repo.youngest_revision()
-        assert rev.id == rev_id
-        assert rev.state == model.State.ACTIVE
diff --git a/ckan/tests/functional/test_follow.py b/ckan/tests/functional/test_follow.py
deleted file mode 100644
index acb97deb0ac..00000000000
--- a/ckan/tests/functional/test_follow.py
+++ /dev/null
@@ -1,199 +0,0 @@
-from pylons.test import pylonsapp
-import paste.fixture
-import ckan
-from routes import url_for
-from ckan.tests.html_check import HtmlCheckMethods
-import json
-
-class TestFollow(HtmlCheckMethods):
-
-    @classmethod
-    def setupClass(cls):
-        ckan.tests.CreateTestData.create()
-        cls.testsysadmin = ckan.model.User.get('testsysadmin')
-        cls.annafan = ckan.model.User.get('annafan')
-        cls.russianfan = ckan.model.User.get('russianfan')
-        cls.tester = ckan.model.User.get('tester')
-        cls.joeadmin = ckan.model.User.get('joeadmin')
-        cls.warandpeace = ckan.model.Package.get('warandpeace')
-        cls.annakarenina = ckan.model.Package.get('annakarenina')
-        cls.app = paste.fixture.TestApp(pylonsapp)
-
-        # Make three users follow annakarenina.
-        params = {'id': 'annakarenina'}
-        extra_environ = {'Authorization': str(cls.joeadmin.apikey)}
-        response = cls.app.post('/api/action/follow_dataset',
-            params=json.dumps(params), extra_environ=extra_environ).json
-        assert response['success'] is True
-        params = {'id': 'annakarenina'}
-        extra_environ = {'Authorization': str(cls.annafan.apikey)}
-        response = cls.app.post('/api/action/follow_dataset',
-            params=json.dumps(params), extra_environ=extra_environ).json
-        assert response['success'] is True
-        params = {'id': 'annakarenina'}
-        extra_environ = {'Authorization': str(cls.russianfan.apikey)}
-        response = cls.app.post('/api/action/follow_dataset',
-            params=json.dumps(params), extra_environ=extra_environ).json
-        assert response['success'] is True
-
-        # Make two users follow annafan.
-        params = {'id': 'annafan'}
-        extra_environ = {'Authorization': str(cls.russianfan.apikey)}
-        response = cls.app.post('/api/action/follow_user',
-            params=json.dumps(params), extra_environ=extra_environ).json
-        assert response['success'] is True
-        params = {'id': 'annafan'}
-        extra_environ = {'Authorization': str(cls.tester.apikey)}
-        response = cls.app.post('/api/action/follow_user',
-            params=json.dumps(params), extra_environ=extra_environ).json
-        assert response['success'] is True
-
-    @classmethod
-    def teardownClass(cls):
-        ckan.model.repo.rebuild_db()
-
-    def test_dataset_read_not_logged_in(self):
-        offset = url_for(controller='package', action='read',
-                id='warandpeace')
-        result = self.app.get(offset)
-        assert 'href="/dataset/followers/warandpeace"' in result
-        assert 'Followers (0)' in result
-        assert 'id="dataset_follow_button"' not in result
-
-        offset = url_for(controller='package', action='read',
-                id='annakarenina')
-        result = self.app.get(offset)
-        assert 'href="/dataset/followers/annakarenina"' in result
-        assert 'Followers (3)' in result
-        assert 'id="dataset_follow_button"' not in result
-    
-    def test_dataset_followers_not_logged_in(self): 
-        '''Not-logged-in users cannot see /dataset/followers/ pages.'''
-        offset = url_for(controller='package', action='followers',
-                id='warandpeace')
-        result = self.app.get(offset)
-        assert result.status == 302
-        assert '/user/login' in result.header_dict['location']
-
-    def test_user_read_not_logged_in(self):
-        offset = url_for(controller='user', action='read',
-                id='joeadmin')
-        result = self.app.get(offset)
-        assert 'href="/user/followers/joeadmin"' in result
-        assert 'Followers (0)' in result
-        assert 'id="user_follow_button"' not in result
-
-        offset = url_for(controller='user', action='read',
-                id='annafan')
-        result = self.app.get(offset)
-        assert 'href="/user/followers/annafan"' in result
-        assert 'Followers (2)' in result
-        assert 'id="user_follow_button"' not in result
-    
-    def test_user_followers_not_logged_in(self):
-        offset = url_for(controller='user', action='followers',
-                id='joeadmin')
-        result = self.app.get(offset)
-        assert result.status == 302
-        assert '/user/login' in result.header_dict['location']
-
-    def test_own_user_read_logged_in(self):
-        offset = url_for(controller='user', action='read',
-                id='joeadmin')
-        extra_environ = {'Authorization': str(self.joeadmin.apikey)}
-        result = self.app.get(offset, extra_environ=extra_environ)
-        assert 'href="/user/followers/joeadmin"' in result
-        assert 'My Followers (0)' in result
-        assert 'id="user_follow_button"' not in result
-
-        offset = url_for(controller='user', action='read',
-                id='annafan')
-        extra_environ = {'Authorization': str(self.annafan.apikey)}
-        result = self.app.get(offset, extra_environ=extra_environ)
-        assert 'href="/user/followers/annafan"' in result
-        assert 'My Followers (2)' in result
-        assert 'id="user_follow_button"' not in result
-    
-    def test_own_user_followers_logged_in(self):
-        offset = url_for(controller='user', action='followers',
-                id='joeadmin')
-        extra_environ = {'Authorization': str(self.testsysadmin.apikey)}
-        result = self.app.get(offset, extra_environ=extra_environ)
-        assert 'href="/user/followers/joeadmin"' in result
-        assert 'Followers (0)' in result
-        assert 'id="user_follow_button"' in result
-        assert '<li class="user">' not in result
-
-    def test_dataset_read_logged_in(self):
-        offset = url_for(controller='package', action='read',
-                id='warandpeace')
-        extra_environ = {'Authorization': str(self.testsysadmin.apikey)}
-        result = self.app.get(offset, extra_environ=extra_environ)
-        assert 'href="/dataset/followers/warandpeace"' in result
-        assert 'Followers (0)' in result
-        assert 'id="dataset_follow_button"' in result
-
-        offset = url_for(controller='package', action='read',
-                id='annakarenina')
-        extra_environ = {'Authorization': str(self.tester.apikey)}
-        result = self.app.get(offset, extra_environ=extra_environ)
-        assert 'href="/dataset/followers/annakarenina"' in result
-        assert 'Followers (3)' in result
-        assert 'id="dataset_follow_button"' in result
-
-    def test_dataset_follow_logged_in(self):
-        offset = url_for(controller='package', action='followers',
-                id='warandpeace')
-        extra_environ = {'Authorization': str(self.testsysadmin.apikey)}
-        result = self.app.get(offset, extra_environ=extra_environ)
-        assert 'id="dataset_follow_button"' in result
-        assert 'Followers (0)' in result
-        assert 'id="dataset_follow_button"' in result
-        assert '<li class="user">' not in result
-
-        offset = url_for(controller='package', action='followers',
-                id='annakarenina')
-        extra_environ = {'Authorization': str(self.testsysadmin.apikey)}
-        result = self.app.get(offset, extra_environ=extra_environ)
-        assert 'href="/dataset/followers/annakarenina"' in result
-        assert 'Followers (3)' in result
-        assert 'id="dataset_follow_button"' in result
-        assert str(result).count('<li class="user">') == 3
-        assert self.joeadmin.display_name in result
-        assert self.annafan.display_name in result
-        assert self.russianfan.display_name in result
-
-        # joeadmin is following annakarenina so he should see an Unfollow
-        # button.
-        offset = url_for(controller='package', action='followers',
-                id='annakarenina')
-        extra_environ = {'Authorization': str(self.testsysadmin.apikey)}
-        result = self.app.get(offset, extra_environ=extra_environ)
-        assert 'Unfollow' in result
-        
-    def test_user_read_logged_in(self):
-        offset = url_for(controller='user', action='read',
-                id='joeadmin')
-        extra_environ = {'Authorization': str(self.tester.apikey)}
-        result = self.app.get(offset, extra_environ=extra_environ)
-        assert 'href="/user/followers/joeadmin"' in result
-        assert 'Followers (0)' in result
-        assert 'id="user_follow_button"' in result
-
-        offset = url_for(controller='user', action='read',
-                id='annafan')
-        extra_environ = {'Authorization': str(self.tester.apikey)}
-        result = self.app.get(offset, extra_environ=extra_environ)
-        assert 'href="/user/followers/annafan"' in result
-        assert 'Followers (2)' in result
-        assert 'id="user_follow_button"' in result
-
-    def test_user_follow_logged_in(self):
-        offset = url_for(controller='user', action='followers',
-                id='joeadmin')
-        extra_environ = {'Authorization': str(self.testsysadmin.apikey)}
-        result = self.app.get(offset, extra_environ=extra_environ)
-        assert 'href="/user/followers/joeadmin"' in result
-        assert 'Followers (0)' in result
-        assert '<li class="user">' not in result
-        assert 'id="user_follow_button"' in result
diff --git a/ckan/tests/functional/test_group.py b/ckan/tests/functional/test_group.py
index cae3ffe74fb..4d091615f6e 100644
--- a/ckan/tests/functional/test_group.py
+++ b/ckan/tests/functional/test_group.py
@@ -57,51 +57,6 @@ def test_atom_feed_page_negative(self):
         res = self.app.get(offset, expect_errors=True)
         assert '"page" parameter must be a positive integer' in res, res
 
-    def test_children(self):
-        if model.engine_is_sqlite():
-            from nose import SkipTest
-            raise SkipTest("Can't use CTE for sqlite")
-
-        group_name = 'deletetest'
-        CreateTestData.create_groups([{'name': group_name,
-                                       'packages': []},
-                                      {'name': "parent_group",
-                                       'packages': []}],
-                                     admin_user_name='testsysadmin')
-
-        parent = model.Group.by_name("parent_group")
-        group = model.Group.by_name(group_name)
-
-        rev = model.repo.new_revision()
-        rev.author = "none"
-
-        member = model.Member(group_id=group.id, table_id=parent.id,
-                              table_name='group', capacity='member')
-        model.Session.add(member)
-        model.repo.commit_and_remove()
-
-        offset = url_for(controller='group', action='edit', id=group_name)
-        res = self.app.get(offset, status=200,
-                           extra_environ={'REMOTE_USER': 'testsysadmin'})
-        main_res = self.main_div(res)
-        assert 'Edit: %s' % group.title in main_res, main_res
-        assert 'value="active" selected' in main_res, main_res
-
-        parent = model.Group.by_name("parent_group")
-        assert_equal(len(parent.get_children_groups()), 1)
-
-        # delete
-        form = res.forms['group-edit']
-        form['state'] = 'deleted'
-        res = form.submit('save', status=302,
-                          extra_environ={'REMOTE_USER': 'testsysadmin'})
-
-        group = model.Group.by_name(group_name)
-        assert_equal(group.state, 'deleted')
-
-        parent = model.Group.by_name("parent_group")
-        assert_equal(len(parent.get_children_groups()), 0)
-
     def test_sorting(self):
         model.repo.rebuild_db()
 
@@ -154,103 +109,11 @@ def test_sorting(self):
         assert results[0]['name'] == u'beta', results[0]['name']
         assert results[1]['name'] == u'delta', results[1]['name']
 
-    def test_mainmenu(self):
-        # the home page does a package search so have to skip this test if
-        # search is not supported
-        if not is_search_supported():
-            from nose import SkipTest
-            raise SkipTest("Search not supported")
-
-        offset = url_for(controller='home', action='index')
-        res = self.app.get(offset)
-        assert 'Groups' in res, res
-        assert 'Groups</a>' in res, res
-        res = res.click(href='/group', index=0)
-        assert "Dave's books" in res, res
-
-    def test_index(self):
-        offset = url_for(controller='group', action='index')
-        res = self.app.get(offset)
-        assert re.search('<h1(.*)>\s*Groups', res.body)
-        groupname = 'david'
-        group = model.Group.by_name(unicode(groupname))
-        group_title = group.title
-        group_packages_count = len(group.packages())
-        group_description = group.description
-        self.check_named_element(res, 'tr', group_title,
-                                 group_packages_count,
-                                 group_description)
-        res = res.click(group_title)
-        assert groupname in res
-
     def test_read_non_existent(self):
         name = u'group_does_not_exist'
         offset = url_for(controller='group', action='read', id=name)
         res = self.app.get(offset, status=404)
 
-    def test_read_plugin_hook(self):
-        plugins.load('test_group_plugin')
-        name = u'david'
-        offset = url_for(controller='group', action='read', id=name)
-        res = self.app.get(offset, status=200,
-                           extra_environ={'REMOTE_USER': 'testsysadmin'})
-        p = plugins.get_plugin('test_group_plugin')
-        assert p.calls['read'] == 1, p.calls
-        plugins.unload('test_group_plugin')
-
-    def test_read_and_authorized_to_edit(self):
-        name = u'david'
-        title = u'Dave\'s books'
-        pkgname = u'warandpeace'
-        offset = url_for(controller='group', action='read', id=name)
-        res = self.app.get(offset,
-                           extra_environ={'REMOTE_USER': 'testsysadmin'})
-        assert title in res, res
-        assert 'edit' in res
-        assert name in res
-
-    def test_new_page(self):
-        offset = url_for(controller='group', action='new')
-        res = self.app.get(offset,
-                           extra_environ={'REMOTE_USER': 'testsysadmin'})
-        assert 'Add A Group' in res, res
-
-
-class TestGroupWithSearch(FunctionalTestCase):
-
-    @classmethod
-    def setup_class(self):
-        setup_test_search_index()
-        model.Session.remove()
-        CreateTestData.create()
-
-    @classmethod
-    def teardown_class(self):
-        model.repo.rebuild_db()
-
-    def test_read(self):
-        # Relies on the search index being available
-        name = u'david'
-        title = u'Dave\'s books'
-        pkgname = u'warandpeace'
-        group = model.Group.by_name(name)
-        for group_ref in (group.name, group.id):
-            offset = url_for(controller='group', action='read', id=group_ref)
-            res = self.app.get(offset)
-            main_res = self.main_div(res)
-            assert title in res, res
-            #assert 'edit' not in main_res, main_res
-           # Administrator no longer exists for the group due to auth changes
-           # assert 'Administrators' in res, res
-           # assert 'russianfan' in main_res, main_res
-            assert name in res, res
-            no_datasets_found = int(re.search('(\d*) datasets found',
-                                    main_res).groups()[0])
-            assert_equal(no_datasets_found, 2)
-            pkg = model.Package.by_name(pkgname)
-            res = res.click(pkg.title)
-            assert '%s - Datasets' % pkg.title in res
-
 
 class TestEdit(FunctionalTestCase):
 
@@ -278,178 +141,11 @@ def test_0_not_authz(self):
         res = res.follow()
         assert res.request.url.startswith('/user/login')
 
-    def test_2_edit(self):
-        group = model.Group.by_name(self.groupname)
-        offset = url_for(controller='group', action='edit', id=self.groupname)
-        print offset
-        res = self.app.get(offset, status=200,
-                           extra_environ={'REMOTE_USER': 'testsysadmin'})
-        assert 'Edit: %s' % group.title in res, res
-
-        form = res.forms['group-edit']
-        titlefn = 'title'
-        descfn = 'description'
-        newtitle = 'xxxxxxx'
-        newdesc = '''### Lots of stuff here
-
-Ho ho ho
-'''
-
-        form[titlefn] = newtitle
-        form[descfn] = newdesc
-        pkg = model.Package.by_name(self.packagename)
-        form['packages__2__name'] = pkg.name
-
-        res = form.submit('save', status=302,
-                          extra_environ={'REMOTE_USER': 'testsysadmin'})
-        # should be read page
-        # assert 'Groups - %s' % self.groupname in res, res
-
-        model.Session.remove()
-        group = model.Group.by_name(self.groupname)
-        assert group.title == newtitle, group
-        assert group.description == newdesc, group
-
-        # now look at datasets
-        assert len(group.packages()) == 3
-
-    def test_4_new_duplicate_package(self):
-        prefix = ''
-
-        # Create group
-        group_name = u'testgrp4'
-        CreateTestData.create_groups([{'name': group_name,
-                                       'packages': [self.packagename]}],
-                                     admin_user_name='testsysadmin')
-
-        # Add same package again
-        offset = url_for(controller='group', action='edit', id=group_name)
-        res = self.app.get(offset, status=200,
-                           extra_environ={'REMOTE_USER': 'testsysadmin'})
-        fv = res.forms['group-edit']
-        fv['packages__1__name'] = self.packagename
-        res = fv.submit('save', status=302,
-                        extra_environ={'REMOTE_USER': 'testsysadmin'})
-        res = res.follow()
-        assert group_name in res, res
-        model.Session.remove()
-
-        # check package only added to the group once
-        group = model.Group.by_name(group_name)
-        pkg_names = [pkg.name for pkg in group.packages()]
-        assert_equal(pkg_names, [self.packagename])
-
-    def test_edit_plugin_hook(self):
-        plugins.load('test_group_plugin')
-        offset = url_for(controller='group', action='edit', id=self.groupname)
-        res = self.app.get(offset, status=200,
-                           extra_environ={'REMOTE_USER': 'testsysadmin'})
-        form = res.forms['group-edit']
-        group = model.Group.by_name(self.groupname)
-        form['title'] = "huhuhu"
-        res = form.submit('save', status=302,
-                          extra_environ={'REMOTE_USER': 'testsysadmin'})
-        p = plugins.get_plugin('test_group_plugin')
-        assert p.calls['edit'] == 1, p.calls
-        plugins.unload('test_group_plugin')
-
-    def test_edit_image_url(self):
-        group = model.Group.by_name(self.groupname)
-        offset = url_for(controller='group', action='edit', id=self.groupname)
-        res = self.app.get(offset, status=200,
-                           extra_environ={'REMOTE_USER': 'testsysadmin'})
-
-        form = res.forms['group-edit']
-        image_url = u'http://url.to/image_url'
-        form['image_url'] = image_url
-        res = form.submit('save', status=302,
-                          extra_environ={'REMOTE_USER': 'testsysadmin'})
-
-        model.Session.remove()
-        group = model.Group.by_name(self.groupname)
-        assert group.image_url == image_url, group
-
-    def test_edit_change_name(self):
-        group = model.Group.by_name(self.groupname)
-        offset = url_for(controller='group', action='edit', id=self.groupname)
-        res = self.app.get(offset, status=200,
-                           extra_environ={'REMOTE_USER': 'testsysadmin'})
-        assert 'Edit: %s' % group.title in res, res
-
-        def update_group(res, name, with_pkg=True):
-            form = res.forms['group-edit']
-            titlefn = 'title'
-            descfn = 'description'
-            newtitle = 'xxxxxxx'
-            newdesc = '''### Lots of stuff here
-
-    Ho ho ho
-    '''
-            form[titlefn] = newtitle
-            form[descfn] = newdesc
-            form['name'] = name
-            if with_pkg:
-                pkg = model.Package.by_name(self.packagename)
-                form['packages__2__name'] = pkg.name
-
-            res = form.submit('save', status=302,
-                              extra_environ={'REMOTE_USER': 'testsysadmin'})
-        update_group(res, self.groupname, True)
-        update_group(res, 'newname', False)
-
-        model.Session.remove()
-        group = model.Group.by_name('newname')
-
-        # We have the datasets in the DB, but we should also see that many
-        # on the group read page.
-        assert len(group.packages()) == 3
-
-        offset = url_for(controller='group', action='read', id='newname')
-        res = self.app.get(offset, status=200,
-                           extra_environ={'REMOTE_USER': 'testsysadmin'})
-
-        ds = res.body
-        ds = ds[ds.index('datasets') - 10: ds.index('datasets') + 10]
-        assert '3 datasets found' in res, ds
-
-        # reset the group to how we found it
-        offset = url_for(controller='group', action='edit', id='newname')
-        res = self.app.get(offset, status=200,
-                           extra_environ={'REMOTE_USER': 'testsysadmin'})
-
-        update_group(res, self.groupname, True)
-
     def test_edit_non_existent(self):
         name = u'group_does_not_exist'
         offset = url_for(controller='group', action='edit', id=name)
         res = self.app.get(offset, status=404)
 
-    def test_delete(self):
-        group_name = 'deletetest'
-        CreateTestData.create_groups([{'name': group_name,
-                                       'packages': [self.packagename]}],
-                                     admin_user_name='testsysadmin')
-
-        group = model.Group.by_name(group_name)
-        offset = url_for(controller='group', action='edit', id=group_name)
-        res = self.app.get(offset, status=200,
-                           extra_environ={'REMOTE_USER': 'testsysadmin'})
-        main_res = self.main_div(res)
-        assert 'Edit: %s' % group.title in main_res, main_res
-        assert 'value="active" selected' in main_res, main_res
-
-        # delete
-        form = res.forms['group-edit']
-        form['state'] = 'deleted'
-        res = form.submit('save', status=302,
-                          extra_environ={'REMOTE_USER': 'testsysadmin'})
-
-        group = model.Group.by_name(group_name)
-        assert_equal(group.state, 'deleted')
-        res = self.app.get(offset, status=302)
-        res = res.follow()
-        assert res.request.url.startswith('/user/login'), res.request.url
-
 
 class TestNew(FunctionalTestCase):
     groupname = u'david'
@@ -477,90 +173,6 @@ def test_1_not_authz(self):
         res = res.follow()
         assert res.request.url.startswith('/user/login')
 
-    def test_2_new(self):
-        prefix = ''
-        group_name = u'testgroup'
-        group_title = u'Test Title'
-        group_description = u'A Description'
-
-        # Open 'Add A Group' page
-        offset = url_for(controller='group', action='new')
-        res = self.app.get(offset, status=200,
-                           extra_environ={'REMOTE_USER': 'testsysadmin'})
-        assert 'Add A Group' in res, res
-        fv = res.forms['group-edit']
-        assert fv[prefix + 'name'].value == '', fv.fields
-        assert fv[prefix + 'title'].value == ''
-        assert fv[prefix + 'description'].value == ''
-        assert fv['packages__0__name'].value == '', \
-            fv['Member--package_name'].value
-
-        # Edit form
-        fv[prefix + 'name'] = group_name
-        fv[prefix + 'title'] = group_title
-        fv[prefix + 'description'] = group_description
-        pkg = model.Package.by_name(self.packagename)
-        fv['packages__0__name'] = pkg.name
-        res = fv.submit('save', status=302,
-                        extra_environ={'REMOTE_USER': 'testsysadmin'})
-        res = res.follow()
-        assert '%s' % group_title in res, res
-
-        model.Session.remove()
-        group = model.Group.by_name(group_name)
-        assert group.title == group_title, group
-        assert group.description == group_description, group
-        assert len(group.packages()) == 1
-        pkg = model.Package.by_name(self.packagename)
-        assert group.packages() == [pkg]
-
-    def test_3_new_duplicate_group(self):
-        prefix = ''
-
-        # Create group
-        group_name = u'testgrp1'
-        offset = url_for(controller='group', action='new')
-        res = self.app.get(offset, status=200,
-                           extra_environ={'REMOTE_USER': 'testsysadmin'})
-        assert 'Add A Group' in res, res
-        fv = res.forms['group-edit']
-        assert fv[prefix + 'name'].value == '', fv.fields
-        fv[prefix + 'name'] = group_name
-        res = fv.submit('save', status=302,
-                        extra_environ={'REMOTE_USER': 'testsysadmin'})
-        res = res.follow()
-        assert group_name in res, res
-        model.Session.remove()
-
-        # Create duplicate group
-        group_name = u'testgrp1'
-        offset = url_for(controller='group', action='new')
-        res = self.app.get(offset, status=200,
-                           extra_environ={'REMOTE_USER': 'testsysadmin'})
-        assert 'Add A Group' in res, res
-        fv = res.forms['group-edit']
-        assert fv[prefix + 'name'].value == '', fv.fields
-        fv[prefix + 'name'] = group_name
-        res = fv.submit('save', status=200,
-                        extra_environ={'REMOTE_USER': 'testsysadmin'})
-        assert 'Group name already exists' in res, res
-        self.check_tag(res, '<form', 'has-errors')
-        assert 'class="field_error"' in res, res
-
-    def test_new_plugin_hook(self):
-        plugins.load('test_group_plugin')
-        offset = url_for(controller='group', action='new')
-        res = self.app.get(offset, status=200,
-                           extra_environ={'REMOTE_USER': 'testsysadmin'})
-        form = res.forms['group-edit']
-        form['name'] = "hahaha"
-        form['title'] = "huhuhu"
-        res = form.submit('save', status=302,
-                          extra_environ={'REMOTE_USER': 'testsysadmin'})
-        p = plugins.get_plugin('test_group_plugin')
-        assert p.calls['create'] == 1, p.calls
-        plugins.unload('test_group_plugin')
-
     def test_new_bad_param(self):
         offset = url_for(controller='group', action='new',
                          __bad_parameter='value')
@@ -602,40 +214,6 @@ def teardown_class(self):
         self.purge_packages([self.name])
         model.repo.rebuild_db()
 
-    def test_0_read_history(self):
-        offset = url_for(controller='group', action='history',
-                         id=self.grp.name)
-        res = self.app.get(offset)
-        main_res = self.main_div(res)
-        assert self.grp.name in main_res, main_res
-        assert 'radio' in main_res, main_res
-        latest_rev = self.grp.all_revisions[0]
-        oldest_rev = self.grp.all_revisions[-1]
-        first_radio_checked_html = \
-            '<input checked="checked" id="selected1_%s"' % \
-            latest_rev.revision_id
-        assert first_radio_checked_html in main_res, '%s %s' % \
-            (first_radio_checked_html, main_res)
-        last_radio_checked_html = \
-            '<input checked="checked" id="selected2_%s"' % \
-            oldest_rev.revision_id
-        assert last_radio_checked_html in main_res, '%s %s' % \
-            (last_radio_checked_html, main_res)
-
-    def test_1_do_diff(self):
-        offset = url_for(controller='group', action='history',
-                         id=self.grp.name)
-        res = self.app.get(offset)
-        form = res.forms['group-revisions']
-        res = form.submit()
-        res = res.follow()
-        main_res = self.main_div(res)
-        assert 'form-errors' not in main_res.lower(), main_res
-        assert 'Revision Differences' in main_res, main_res
-        assert self.grp.name in main_res, main_res
-        assert "<tr><td>description</td><td><pre>- Written by Puccini\n+" + \
-               " Written off</pre></td></tr>" in main_res, main_res
-
     def test_2_atom_feed(self):
         offset = url_for(controller='group', action='history',
                          id=self.grp.name)
diff --git a/ckan/tests/functional/test_home.py b/ckan/tests/functional/test_home.py
index 248810b56ab..a7198241085 100644
--- a/ckan/tests/functional/test_home.py
+++ b/ckan/tests/functional/test_home.py
@@ -18,26 +18,11 @@ def setup_class(cls):
         PylonsTestCase.setup_class()
         model.repo.init_db()
         CreateTestData.create()
-        
+
     @classmethod
     def teardown_class(self):
         model.repo.rebuild_db()
 
-    def test_home_page(self):
-        offset = url_for('home')
-        res = self.app.get(offset)
-        # Non logged in users can no longer add datasets
-        assert not 'Add a dataset' in res
-        assert 'Could not change language' not in res
-        assert "Dave's books has 2 datasets" in res, res
-        assert "Roger's books has 1 datasets" in res, res
-
-    @search_related
-    def test_packages_link(self):
-        offset = url_for('home')
-        res = self.app.get(offset)
-        res.click('Search', index=0)
-        
     def test_template_head_end(self):
         offset = url_for('home')
         res = self.app.get(offset)
@@ -48,72 +33,6 @@ def test_template_footer_end(self):
         res = self.app.get(offset)
         assert '<strong>TEST TEMPLATE_FOOTER_END TEST</strong>'
 
-## disabled as I18nMiddlewhare does not get used FIXME
-##
-##    def test_locale_change(self):
-##        offset = url_for('home')
-##        res = self.app.get(offset)
-##        res = res.click('Deutsch')
-##        try:
-##            res = res.follow()
-##            assert 'Willkommen' in res.body
-##        finally:
-##            self.clear_language_setting()
-
-##    def test_locale_change(self):
-##        offset = url_for('home')
-##        res = self.app.get(offset)
-##        res = res.click('Deutsch')
-##        try:
-##            res = res.follow()
-##            # Language of the page
-##            assert 'Willkommen' in res.body
-##            # Flash message
-##            assert 'Die Sprache ist jetzt: Deutsch' in res.body
-##
-##            res = res.click('English')
-##            res = res.follow()
-##            # Language of the page
-##            assert 'Welcome' in res.body
-##            # Flash message
-##            assert 'Language has been set to: English' in res.body, res.body
-##        finally:
-##            self.clear_language_setting()
-##
-##    def test_locale_change_invalid(self):
-##        offset = url_for(controller='home', action='locale', locale='')
-##        res = self.app.get(offset, status=400)
-##        main_res = self.main_div(res)
-##        assert 'Invalid language specified' in main_res, main_res
-##
-##    def test_locale_change_blank(self):
-##        offset = url_for(controller='home', action='locale')
-##        res = self.app.get(offset, status=400)
-##        main_res = self.main_div(res)
-##        assert 'No language given!' in main_res, main_res
-##
-##    def test_locale_change_with_false_hash(self):
-##        offset = url_for('home')
-##        res = self.app.get(offset)
-##        found_html, found_desc, found_attrs = res._find_element(
-##            tag='a', href_attr='href',
-##            href_extract=None,
-##            content='Deutsch',
-##            id=None, 
-##            href_pattern=None,
-##            html_pattern=None,
-##            index=None, verbose=False)
-##        href = found_attrs['uri']
-##        assert href
-##        res = res.goto(href)
-##        try:
-##            assert res.status == 302, res.status # redirect
-##
-##            href = href.replace('return_to=%2F&', 'return_to=%2Fhackedurl&')
-##            res = res.goto(href)
-##            assert res.status == 200, res.status # doesn't redirect
-##        finally:
-##            self.clear_language_setting()
 
     def test_update_profile_notice(self):
         edit_url = url_for(controller='user', action='edit')
@@ -217,36 +136,3 @@ def test_update_profile_notice(self):
             assert fullname_notice not in response
             assert email_and_fullname_notice not in response
 
-class TestHomeControllerWithoutSearch(TestController, PylonsTestCase, HtmlCheckMethods):
-    @classmethod
-    def setup_class(cls):
-        PylonsTestCase.setup_class()
-        
-    @classmethod
-    def teardown_class(self):
-        model.repo.rebuild_db()
-        
-    def test_404(self):
-        offset = '/some_nonexistent_url'
-        res = self.app.get(offset, status=404)
-
-    def test_about(self):
-        offset = url_for(controller='home', action='about')
-        res = self.app.get(url_for('about'))
-        assert 'CKAN is a community-run catalogue' in res.body, res.body
-
-
-class TestDatabaseNotInitialised(TestController):
-    @classmethod
-    def setup_class(cls):
-        PylonsTestCase.setup_class()
-        model.repo.clean_db()
-
-    @classmethod
-    def teardown_class(self):
-        model.repo.rebuild_db()
-
-    def test_home_page(self):
-        offset = url_for('home')
-        res = self.app.get(offset, status=503)
-        assert 'This site is currently off-line. Database is not initialised.' in res
diff --git a/ckan/tests/functional/test_package.py b/ckan/tests/functional/test_package.py
index fbb92fac421..12a1a5a7239 100644
--- a/ckan/tests/functional/test_package.py
+++ b/ckan/tests/functional/test_package.py
@@ -211,62 +211,6 @@ def setup_class(cls):
     def teardown_class(cls):
         model.repo.rebuild_db()
 
-    def test_read(self):
-        name = u'annakarenina'
-        c.hide_welcome_message = True
-        offset = url_for(controller='package', action='read', id=name)
-        res = self.app.get(offset)
-        # check you get the same html when specifying the pkg by id
-        # instead of by name
-        offset = url_for(controller='package', action='read', id=self.anna.id)
-        res_by_id = self.app.get(offset)
-        # just check the stuff in the package div
-        pkg_by_name_main = self.named_div('dataset', res)
-        pkg_by_id_main = self.named_div('dataset', res_by_id)
-        # rename some things which may be in the wrong order sometimes
-        txt_order_non_deterministic = (u'Flexible \u30a1', 'russian', 'tolstoy', 'david', 'roger')
-        for txt in txt_order_non_deterministic:
-            for pkg_ in (pkg_by_name_main, pkg_by_id_main):
-                pkg_ = pkg_.replace(txt, 'placeholder')
-        print pkg_by_name_main
-        res_diff = self.diff_html(pkg_by_name_main, pkg_by_id_main)
-        assert not res_diff, res_diff.encode('utf8')
-        # not true as language selection link return url differs:
-        #assert len(res_by_id.body) == len(res.body)
-
-        # only retrieve after app has been called
-        anna = self.anna
-        assert name in res
-        assert anna.version in res
-        assert anna.url in res
-        assert 'Some test notes' in res
-        assert '<strong>Some bolded text.</strong>' in res
-        self.check_tag_and_data(res, 'left arrow', '&lt;')
-        self.check_tag_and_data(res, 'umlaut', u'\xfc')
-        #assert 'OKD Compliant::' in res
-        assert u'Flexible \u30a1' in res, res
-        assert 'russian' in res
-        assert 'david' in res
-        assert 'roger' in res
-        assert 'genre' in res, res
-        assert 'romantic novel' in res, res
-        assert 'original media' in res, res
-        assert 'book' in res, res
-        assert 'This dataset satisfies the Open Definition' in res, res
-
-    def test_read_war_rdf(self):
-        name = u'warandpeace'
-        offset = url_for(controller='package', action='read', id=name + ".rdf")
-        res = self.app.get(offset)
-        assert '<dct:title>A Wonderful Story</dct:title>' in res, res
-
-
-    def test_read_war(self):
-        name = u'warandpeace'
-        c.hide_welcome_message = True
-        offset = url_for(controller='package', action='read', id=name)
-        res = self.app.get(offset)
-        assert 'This dataset is Not Open' in res, res
 
     def test_read_nonexistentpackage(self):
         name = 'anonexistentpackage'
@@ -294,24 +238,6 @@ def check_link(res, controller, id):
         assert 'decoy</a>' not in res, res
         assert 'decoy"' not in res, res
 
-        #res = self.app.get(offset)
-        #assert 'Datasets' in res
-        #name = u'annakarenina'
-        #title = u'A Novel By Tolstoy'
-        #assert title in res
-        #res = res.click(title)
-        #assert '%s - Datasets' % title in res, res
-        #main_div = self.main_div(res)
-        #assert title in main_div, main_div.encode('utf8')
-
-    def test_history(self):
-        name = 'annakarenina'
-        offset = url_for(controller='package', action='history', id=name)
-        res = self.app.get(offset)
-        assert 'History' in res
-        assert 'Revisions' in res
-        assert name in res
-
     def test_read_plugin_hook(self):
         plugins.load('test_package_controller_plugin')
         plugin = plugins.get_plugin('test_package_controller_plugin')
@@ -391,56 +317,6 @@ def setup_class(cls):
     def teardown_class(cls):
         model.repo.rebuild_db()
 
-    def test_read_normally(self):
-        res = self.app.get(self.offset, status=200)
-        pkg_html = self.named_div('dataset', res)
-        side_html = self.named_div('sidebar', res)
-        print 'PKG', pkg_html
-        assert 'title3' in res
-        assert 'key2' in pkg_html
-        assert 'value3' in pkg_html
-        print 'SIDE', side_html
-        assert 'tag3.' in side_html
-        assert 'tag 2' in side_html
-
-    def test_read_date1(self):
-        offset = self.offset + self.date1.strftime('@%Y-%m-%d')
-        res = self.app.get(offset, status=200)
-        pkg_html = self.named_div('dataset', res)
-        side_html = self.named_div('sidebar', res)
-        assert 'title1' in res, res
-        assert 'key2' not in pkg_html, pkg_html
-        assert 'value3' not in pkg_html, pkg_html
-        assert 'tag3.' not in side_html, side_html
-        assert 'tag 2' not in side_html, side_html
-
-    def test_read_date2(self):
-        date2_plus_3h = self.date2 + datetime.timedelta(hours=3)
-        offset = self.offset + date2_plus_3h.strftime('@%Y-%m-%d')
-        res = self.app.get(offset, status=200)
-        pkg_html = self.named_div('dataset', res)
-        side_html = self.named_div('sidebar', res)
-        print 'PKG', pkg_html
-        assert 'title2' in res
-        assert 'key2' in pkg_html
-        assert 'value2' in pkg_html
-        print 'SIDE', side_html
-        assert 'tag3.' not in side_html
-        assert 'tag 2' in side_html
-
-    def test_read_date3(self):
-        offset = self.offset + self.date3.strftime('@%Y-%m-%d-%H-%M')
-        res = self.app.get(offset, status=200)
-        pkg_html = self.named_div('dataset', res)
-        side_html = self.named_div('sidebar', res)
-        print 'PKG', pkg_html
-        assert 'title3' in res
-        assert 'key2' in pkg_html
-        assert 'value3' in pkg_html
-        print 'SIDE', side_html
-        assert 'tag3.' in side_html
-        assert 'tag 2' in side_html
-
     def test_read_date_before_created(self):
         offset = self.offset + self.before.strftime('@%Y-%m-%d')
         res = self.app.get(offset, status=404)
@@ -453,61 +329,6 @@ def test_read_date_invalid(self):
         res = self.app.get(self.offset + self.date3.strftime('@%Y@%m'),
                            status=400)
 
-    def test_read_revision1(self):
-        offset = self.offset + '@%s' % self.revision_ids[0]
-        res = self.app.get(offset, status=200)
-        main_html = self.main_div(res)
-        pkg_html = self.named_div('dataset', res)
-        side_html = self.named_div('sidebar', res)
-        print 'MAIN', main_html
-        assert 'This is an old revision of this dataset' in main_html
-        assert 'at January 1, 2011, 00:00' in main_html
-        self.check_named_element(main_html, 'a', 'href="/dataset/%s"' % self.pkg_name)
-        print 'PKG', pkg_html
-        assert 'title1' in res
-        assert 'key2' not in pkg_html
-        assert 'value3' not in pkg_html
-        print 'SIDE', side_html
-        assert 'tag3.' not in side_html
-        assert 'tag 2' not in side_html
-
-    def test_read_revision2(self):
-        offset = self.offset + '@%s' % self.revision_ids[1]
-        res = self.app.get(offset, status=200)
-        main_html = self.main_div(res)
-        pkg_html = self.named_div('dataset', res)
-        side_html = self.named_div('sidebar', res)
-        print 'MAIN', main_html
-        assert 'This is an old revision of this dataset' in main_html
-        assert 'at January 2, 2011, 00:00' in main_html
-        self.check_named_element(main_html, 'a', 'href="/dataset/%s"' % self.pkg_name)
-        print 'PKG', pkg_html
-        assert 'title2' in res
-        assert 'key2' in pkg_html
-        assert 'value2' in pkg_html
-        print 'SIDE', side_html
-        assert 'tag3.' not in side_html
-        assert 'tag 2' in side_html
-
-    def test_read_revision3(self):
-        offset = self.offset + '@%s' % self.revision_ids[2]
-        res = self.app.get(offset, status=200)
-        main_html = self.main_div(res)
-        pkg_html = self.named_div('dataset', res)
-        side_html = self.named_div('sidebar', res)
-        print 'MAIN', main_html
-        assert 'This is an old revision of this dataset' not in main_html
-        assert 'This is the current revision of this dataset' in main_html
-        assert 'at January 3, 2011, 00:00' in main_html
-        self.check_named_element(main_html, 'a', 'href="/dataset/%s"' % self.pkg_name)
-        print 'PKG', pkg_html
-        assert 'title3' in res
-        assert 'key2' in pkg_html
-        assert 'value3' in pkg_html
-        print 'SIDE', side_html
-        assert 'tag3.' in side_html
-        assert 'tag 2' in side_html
-
     def test_read_bad_revision(self):
         # this revision doesn't exist in the db
         offset = self.offset + '@ccab6798-1f4b-4a22-bcf5-462703aa4594'
@@ -558,119 +379,12 @@ def _reset_data(self):
     def teardown_class(self):
         model.repo.rebuild_db()
 
-    def test_edit_basic(self):
-        # just the absolute basics
-        try:
-            self.res = self.app.get(self.offset,extra_environ=self.extra_environ_admin)
-            assert 'Edit - Datasets' in self.res, self.res
-            new_name = u'new-name'
-            new_title = u'New Title'
-            fv = self.res.forms['dataset-edit']
-            prefix = ''
-            fv[prefix + 'name'] = new_name
-            fv[prefix + 'title'] = new_title
-            res = fv.submit('save',extra_environ=self.extra_environ_admin)
-            # get redirected ...
-            res = res.follow()
-            offset = url_for(controller='package', action='read', id=new_name)
-            res = self.app.get(offset)
-            assert '%s - Datasets' % new_title in res, res
-            pkg = model.Package.by_name(new_name)
-            assert pkg
-            assert pkg.title == new_title
-        finally:
-            self._reset_data()
-
-    def test_edit(self):
-        # just the key fields
-        try:
-            self.res = self.app.get(self.offset,extra_environ=self.extra_environ_admin)
-            assert 'Edit - Datasets' in self.res, self.res
-            assert self.editpkg.notes in self.res
-
-            new_name = u'new-name'
-            new_title = u'A Short Description of this Dataset'
-            newurl = u'http://www.editpkgnewurl.com'
-            new_download_url = newurl + u'/download/'
-            newlicense_id = u'cc-by'
-            newversion = u'0.9b'
-            fv = self.res.forms['dataset-edit']
-            prefix = ''
-            fv[prefix + 'name'] = new_name
-            fv[prefix + 'title'] =  new_title
-            fv[prefix + 'url'] =  newurl
-            #fv[prefix + 'resources__0__url'] =  new_download_url
-            fv[prefix + 'license_id'] =  newlicense_id
-            fv[prefix + 'version'] = newversion
-            res = fv.submit('save',extra_environ=self.extra_environ_admin)
-            # get redirected ...
-            res = res.follow()
-            model.Session.remove()
-            offset = url_for(controller='package', action='read', id=new_name)
-            res = self.app.get(offset)
-            assert '%s - Datasets' % new_title in res, res
-            pkg = model.Package.by_name(new_name)
-            assert pkg.title == new_title
-            assert pkg.url == newurl
-            #assert pkg.resources[0].url == new_download_url
-            assert pkg.version == newversion
-            assert newlicense_id == pkg.license.id
-        finally:
-            self._reset_data()
-
-    def test_edit_basic_pkg_by_id(self):
-        try:
-            pkg = model.Package.by_name(u'editpkgtest')
-            offset = url_for(controller='package', action='edit', id=pkg.id)
-            res = self.app.get(offset, extra_environ=self.extra_environ_admin)
-            #assert res.body == self.res.body, self.diff_responses(res, self.res)
-            assert 'Edit - Datasets' in res, res
-            assert pkg.name in res
-            new_name = u'new-name'
-            new_title = u'A Short Description of this Dataset'
-            fv = self.res.forms['dataset-edit']
-            prefix = ''
-            fv[prefix + 'name'] = new_name
-            fv[prefix + 'title'] =  new_title
-            res = fv.submit('save', extra_environ=self.extra_environ_admin)
-            # get redirected ...
-            res = res.follow()
-            offset = url_for(controller='package', action='read', id=new_name)
-            res = self.app.get(offset)
-            assert '%s - Datasets' % new_title in res, res
-            pkg = model.Package.by_name(new_name)
-            assert pkg
-        finally:
-            self._reset_data()
-
     def test_edit_2_not_groups(self):
         # not allowed to edit groups for now
         prefix = 'Dataset-%s-' % self.pkgid
         fv = self.res.forms['dataset-edit']
         assert not fv.fields.has_key(prefix + 'groups')
 
-    def test_edit_2_tags_and_groups(self):
-        # testing tag updating
-        newtagnames = [u'russian', u'tolstoy', u'superb book']
-        newtags = newtagnames
-        tagvalues = ','.join(newtags)
-        fv = self.res.forms['dataset-edit']
-        prefix = ''
-        fv[prefix + 'tag_string'] = tagvalues
-        exp_log_message = 'test_edit_2: making some changes'
-        fv['log_message'] =  exp_log_message
-        res = fv.submit('save', extra_environ=self.extra_environ_admin)
-        # get redirected ...
-        res = res.follow()
-        assert '%s - Datasets' % self.editpkg_name in res
-        pkg = model.Package.by_name(self.editpkg.name)
-        assert len(pkg.get_tags()) == len(newtagnames)
-        outtags = [ tag.name for tag in pkg.get_tags() ]
-        for tag in newtags:
-            assert tag in outtags
-        rev = model.Revision.youngest(model.Session)
-        assert rev.author == self.admin.name
-        assert rev.message == exp_log_message
 
     def test_redirect_after_edit_using_param(self):
         return_url = 'http://random.site.com/dataset/<NAME>?test=param'
@@ -686,178 +400,6 @@ def test_redirect_after_edit_using_config(self):
         self._check_redirect(return_url, expected_redirect,
                              pkg_name_to_edit=self.editpkg_name, extra_environ=self.extra_environ_admin)
 
-    def test_edit_all_fields(self):
-        try:
-            # Create new item
-            rev = model.repo.new_revision()
-            pkg_name = u'new_editpkgtest'
-            pkg = model.Package(name=pkg_name)
-            pkg.title = u'This is a Test Title'
-            pkg.url = u'editpkgurl.com'
-            pr1 = model.Resource(url=u'editpkgurl1',
-                  format=u'plain text', description=u'Full text',
-                  hash=u'123abc')
-            pr2 = model.Resource(url=u'editpkgurl2',
-                  format=u'plain text2', description=u'Full text2',
-                  hash=u'456abc')
-            pkg.resources_all.append(pr1)
-            pkg.resources_all.append(pr2)
-            pkg.notes= u'this is editpkg'
-            pkg.version = u'2.2'
-            t1 = model.Tag(name=u'one')
-            t2 = model.Tag(name=u'two words')
-            pkg.add_tags([t1, t2])
-            pkg.state = model.State.DELETED
-            pkg.license_id = u'other-open'
-            extras = {'key1':'value1', 'key2':'value2', 'key3':'value3'}
-            for key, value in extras.items():
-                pkg.extras[unicode(key)] = unicode(value)
-            for obj in [pkg, t1, t2, pr1, pr2]:
-                model.Session.add(obj)
-            model.repo.commit_and_remove()
-            pkg = model.Package.by_name(pkg_name)
-            model.setup_default_user_roles(pkg, [self.admin])
-            model.repo.commit_and_remove()
-
-            # Edit it
-            offset = url_for(controller='package', action='edit', id=pkg.name)
-            res = self.app.get(offset, status=200, extra_environ={'REMOTE_USER':'testsysadmin'})
-            assert 'Edit - Datasets' in res, res
-
-            # Check form is correctly filled
-            pkg = model.Package.by_name(pkg_name)
-            self.check_form_filled_correctly(res, pkg=pkg, log_message='')
-
-            # Amend form
-            name = u'test_name'
-            title = u'Test Title'
-            version = u'1.1'
-            url = u'http://something.com/somewhere.zip'
-            resources = ((u'http://something.com/somewhere-else.xml', u'xml', u'Best', u'hash1', 'alt'),
-                         (u'http://something.com/somewhere-else2.xml', u'xml2', u'Best2', u'hash2', 'alt'),
-                         )
-            assert len(resources[0]) == 5
-            notes = u'Very important'
-            license_id = u'odc-by'
-            state = model.State.ACTIVE
-            tags = (u'tag1', u'tag2', u'tag 3')
-            tags_txt = u','.join(tags)
-            extra_changed = 'key1', self.value1 + ' CHANGED', False
-            extra_new = 'newkey', 'newvalue', False
-            log_message = 'This is a comment'
-            assert not model.Package.by_name(name)
-            fv = res.forms['dataset-edit']
-            prefix = ''
-            fv[prefix+'name'] = name
-            fv[prefix+'title'] = title
-            fv[prefix+'version'] = version
-            fv[prefix+'url'] = url
-            # TODO consider removing this test entirely, or hardcoding column names
-            #for res_index, resource in enumerate(resources):
-            #    for field_index, res_field in enumerate(model.Resource.get_columns()):
-            #        fv[prefix+'resources__%s__%s' % (res_index, res_field)] = resource[field_index]
-            fv[prefix+'notes'] = notes
-            fv[prefix+'license_id'] = license_id
-            fv[prefix+'tag_string'] = tags_txt
-            fv[prefix+'state'] = state
-            fv[prefix+'extras__0__value'] = extra_changed[1].encode('utf8')
-            fv[prefix+'extras__3__key'] = extra_new[0].encode('utf8')
-            fv[prefix+'extras__3__value'] = extra_new[1].encode('utf8')
-            fv[prefix+'extras__2__deleted'] = True
-            fv['log_message'] = log_message
-
-            extras = (('key2', extras['key2'], False),
-                       extra_changed,
-                       extra_new,
-                       ('key3', extras['key3'], True))
-
-            res = fv.submit('save', extra_environ={'REMOTE_USER':'testsysadmin'})
-
-            # Check dataset page
-            assert not 'Error' in res, res
-
-            # Check dataset object
-            pkg = model.Package.by_name(name)
-            assert pkg.name == name
-            assert pkg.title == title
-            assert pkg.version == version
-            assert pkg.url == url
-            # TODO consider removing this test entirely, or hardcoding column names
-            #for res_index, resource in enumerate(resources):
-            #    for field_index, res_field in enumerate(model.Resource.get_columns()):
-            #        assert getattr(pkg.resources[res_index], res_field) == resource[field_index]
-            assert pkg.notes == notes
-            assert pkg.license.id == license_id
-            saved_tagnames = [str(tag.name) for tag in pkg.get_tags()]
-            saved_tagnames.sort()
-            expected_tagnames = list(tags)
-            expected_tagnames.sort()
-            assert saved_tagnames == expected_tagnames
-            assert pkg.state == state
-            assert len(pkg.extras) == len([extra for extra in extras if not extra[-1]])
-            for key, value, deleted in extras:
-                if not deleted:
-                    assert pkg.extras[key] == value
-
-            # for some reason environ['REMOTE_ADDR'] is undefined
-            rev = model.Revision.youngest(model.Session)
-            assert rev.author == 'testsysadmin', rev.author
-            assert rev.message == log_message
-            # TODO: reinstate once fixed in code
-            exp_log_message = u'Creating dataset %s' % name
-            #assert rev.message == exp_log_message
-        finally:
-            self._reset_data()
-
-    # NB: Cannot test resources now because it is all javascript!
-##    def test_edit_invalid_resource(self):
-##        try:
-##            # Create new dataset
-##            pkg_name = u'test_res'
-##            CreateTestData.create_arbitrary({'name': pkg_name,
-##                                             'resources': [{'url': '1.pdf'}]})
-
-##            # Edit it
-##            pkg = model.Package.by_name(pkg_name)
-##            offset = url_for(controller='package', action='edit', id=pkg.name)
-##            res = self.app.get(offset, status=200, extra_environ={'REMOTE_USER':'testadmin'})
-##            assert 'Edit - Datasets' in res, res
-
-##            pkg = model.Package.by_name(pkg_name)
-
-##            # Amend form
-##            fv = res.forms['dataset-edit']
-
-##            fv['resources__0__size'] = 'abc'
-##            res = fv.submit('save', extra_environ={'REMOTE_USER':'testadmin'})
-
-##            # Check dataset page
-##            assert 'Errors in form' in res, res
-##            assert 'Package resource(s) invalid' in res, res
-##            assert 'Resource 1' in res, res
-##        finally:
-##            self._reset_data()
-
-    def test_edit_bad_log_message(self):
-        fv = self.res.forms['dataset-edit']
-        prefix = ''
-        fv['log_message'] = u'Free enlargements: http://drugs.com/' # spam
-        res = fv.submit('save', extra_environ=self.extra_environ_admin)
-        assert 'Error' in res, res
-        self.check_tag(res, '<form', 'has-errors')
-        assert 'No links are allowed' in res, res
-
-    def test_edit_bad_name(self):
-        fv = self.res.forms['dataset-edit']
-        prefix = ''
-        fv[prefix + 'name'] = u'a' # invalid name
-        res = fv.submit('save', extra_environ=self.extra_environ_admin)
-        assert 'Error' in res, res
-        assert 'Name must be at least 2 characters long' in res, res
-        # Ensure there is an error at the top of the form and by the field
-        self._assert_form_errors(res)
-
-
     def test_edit_plugin_hook(self):
         # just the absolute basics
         try:
@@ -897,67 +439,11 @@ def test_after_update_plugin_hook(self):
         finally:
             self._reset_data()
 
-    def test_edit_700_groups_add(self):
-        try:
-            pkg = model.Package.by_name(u'editpkgtest')
-            grp = model.Group.by_name(u'roger')
-            assert len(pkg.get_groups()) == 0
-            offset = url_for(controller='package', action='edit', id=pkg.name)
-
-            res = self.app.get(offset, extra_environ=self.extra_environ_admin)
-            prefix = ''
-            field_name = prefix + "groups__0__id"
-            assert field_name in res
-            fv = res.forms['dataset-edit']
-            fv[prefix + 'groups__0__id'] = grp.id
-            res = fv.submit('save', extra_environ=self.extra_environ_admin)
-            res = res.follow()
-            pkg = model.Package.by_name(u'editpkgtest')
-            assert len(pkg.get_groups()) == 1, pkg.get_groups()
-            assert 'roger' in res, res
-        finally:
-            self._reset_data()
-
-    def test_edit_700_groups_remove(self):
-        try:
-            pkg = model.Package.by_name(u'editpkgtest')
-            assert len(pkg.get_groups()) == 0
-            grp = model.Group.by_name(u'roger')
-            model.repo.new_revision()
-            model.Session.add(model.Member(table_id=pkg.id, table_name='package', group=grp))
-            model.repo.commit_and_remove()
-            pkg = model.Package.by_name(u'editpkgtest')
-            assert len(pkg.get_groups()) == 1
-            offset = url_for(controller='package', action='edit', id=pkg.name)
-            res = self.app.get(offset, extra_environ=self.extra_environ_admin)
-            prefix = ''
-            field_name = prefix + "groups__0__id"
-            fv = res.forms['dataset-edit']
-            print field_name
-            fv[field_name] = False
-            res = fv.submit('save', extra_environ=self.extra_environ_admin)
-            model.repo.commit_and_remove()
-            pkg = model.Package.by_name(u'editpkgtest')
-            assert len(pkg.get_groups()) == 0
-        finally:
-            self._reset_data()
 
     def test_edit_404(self):
         self.offset = url_for(controller='package', action='edit', id='random_name')
         self.res = self.app.get(self.offset, status=404)
 
-    def test_edit_indexerror(self):
-        bad_solr_url = 'http://127.0.0.1/badsolrurl'
-        solr_url = SolrSettings.get()[0]
-        try:
-            SolrSettings.init(bad_solr_url)
-
-            fv = self.res.forms['dataset-edit']
-            fv['log_message'] = u'Test log message'
-            res = fv.submit('save', status=500, extra_environ=self.extra_environ_admin)
-            assert 'Unable to update search index' in res, res
-        finally:
-            SolrSettings.init(solr_url)
 
     def test_edit_pkg_with_relationships(self):
         # 1786
@@ -1044,181 +530,6 @@ def teardown_class(self):
         self.purge_packages(self.pkg_names)
         model.repo.rebuild_db()
 
-    def test_new_with_params_1(self):
-        offset = url_for(controller='package', action='new',
-                url='http://xxx.org', name='xxx.org')
-        res = self.app.get(offset, extra_environ=self.extra_environ_tester)
-        form = res.forms['dataset-edit']
-        assert_equal(form['url'].value, 'http://xxx.org')
-        assert_equal(form['name'].value, 'xxx.org')
-
-    def test_new_without_resource(self):
-        # new dataset
-        prefix = ''
-        name = u'test_no_res'
-        offset = url_for(controller='package', action='new')
-        res = self.app.get(offset, extra_environ=self.extra_environ_tester)
-        fv = res.forms['dataset-edit']
-        fv[prefix+'name'] = name
-        # submit
-        self.pkg_names.append(name)
-        res = fv.submit('save', extra_environ=self.extra_environ_tester)
-
-        # check dataset page
-        assert not 'Error' in res, res
-        res = res.follow()
-        res1 = self.main_div(res).replace('</strong>', '')
-        assert '<td><a href="">' not in res1, res1
-
-        # check object created
-        pkg = model.Package.by_name(name)
-        assert pkg
-        assert pkg.name == name
-        assert not pkg.resources, pkg.resources
-
-    def test_new(self):
-        assert not model.Package.by_name(u'annakarenina')
-        offset = url_for(controller='package', action='new')
-        res = self.app.get(offset, extra_environ=self.extra_environ_tester)
-        assert 'Add - Datasets' in res
-        fv = res.forms['dataset-edit']
-        prefix = ''
-        fv[prefix + 'name'] = 'annakarenina'
-        self.pkg_names.append('annakarenina')
-        res = fv.submit('save', extra_environ=self.extra_environ_tester)
-        assert not 'Error' in res, res
-
-    def test_new_bad_name(self):
-        offset = url_for(controller='package', action='new', id=None)
-        res = self.app.get(offset, extra_environ=self.extra_environ_tester)
-        assert 'Add - Datasets' in res
-        fv = res.forms['dataset-edit']
-        prefix = ''
-        fv[prefix + 'name'] = u'a' # invalid name
-        self.pkg_names.append('a')
-        res = fv.submit('save', extra_environ=self.extra_environ_tester)
-        assert 'Error' in res, res
-        assert 'Name must be at least 2 characters long' in res, res
-        self._assert_form_errors(res)
-
-    def test_new_no_name(self):
-        offset = url_for(controller='package', action='new', id=None)
-        res = self.app.get(offset, extra_environ=self.extra_environ_tester)
-        assert 'Add - Datasets' in res
-        fv = res.forms['dataset-edit']
-        prefix = ''
-        # don't set a name
-        res = fv.submit('save', extra_environ=self.extra_environ_tester)
-        assert 'Error' in res, res
-        assert 'URL: Missing value' in res, res
-        self._assert_form_errors(res)
-
-    def test_redirect_after_new_using_param(self):
-        return_url = 'http://random.site.com/dataset/<NAME>?test=param'
-        # It's useful to know that this url encodes to:
-        # 'http%3A%2F%2Frandom.site.com%2Fdataset%2F%3CNAME%3E%3Ftest%3Dparam'
-        expected_redirect = return_url
-        self._check_redirect(return_url, expected_redirect,
-                             pkg_name_to_edit='', extra_environ=self.extra_environ_tester)
-
-    def test_redirect_after_new_using_config(self):
-        return_url = '' # redirect comes from test.ini setting
-        expected_redirect = config['package_new_return_url']
-        self._check_redirect(return_url, expected_redirect,
-                             pkg_name_to_edit='', extra_environ=self.extra_environ_tester)
-
-    def test_new_all_fields(self):
-        name = u'test_name2'
-        title = u'Test Title'
-        version = u'1.1'
-        url = u'http://something.com/somewhere.zip'
-        download_url = u'http://something.com/somewhere-else.zip'
-        notes = u'Very important'
-        license_id = u'odc-by'
-        tags = (u'tag1', u'tag2.', u'tag 3', u'SomeCaps')
-        tags_txt = u','.join(tags)
-        extras = {self.key1:self.value1, 'key2':'value2', 'key3':'value3'}
-        log_message = 'This is a comment'
-        assert not model.Package.by_name(name)
-        offset = url_for(controller='package', action='new')
-        res = self.app.get(offset, extra_environ=self.extra_environ_tester)
-        assert 'Add - Datasets' in res
-        fv = res.forms['dataset-edit']
-        prefix = ''
-        fv[prefix+'name'] = name
-        fv[prefix+'title'] = title
-        fv[prefix+'version'] = version
-        fv[prefix+'url'] = url
-        #fv[prefix+'resources__0__url'] = download_url
-        #fv[prefix+'resources__0__description'] = u'description escape: & umlaut: \xfc quote "'.encode('utf8')
-        fv[prefix+'notes'] = notes
-        fv[prefix+'license_id'] = license_id
-        fv[prefix+'tag_string'] = tags_txt
-        for i, extra in enumerate(sorted(extras.items())):
-            fv[prefix+'extras__%s__key' % i] = extra[0].encode('utf8')
-            fv[prefix+'extras__%s__value' % i] = extra[1].encode('utf8')
-        fv['log_message'] = log_message
-        # Submit
-        fv = res.forms['dataset-edit']
-        self.pkg_names.append(name)
-        res = fv.submit('save', extra_environ=self.extra_environ_tester)
-
-        # Check dataset page
-        assert not 'Error' in res, res
-
-        # Check dataset object
-        pkg = model.Package.by_name(name)
-        assert pkg.name == name
-        assert pkg.title == title
-        assert pkg.version == version
-        assert pkg.url == url
-        #assert pkg.resources[0].url == download_url
-        assert pkg.notes == notes
-        assert pkg.license.id == license_id
-        saved_tagnames = [str(tag.name) for tag in pkg.get_tags()]
-        saved_tagnames.sort()
-        expected_tagnames = sorted(tags)
-        assert saved_tagnames == expected_tagnames, '%r != %r' % (saved_tagnames, expected_tagnames)
-        saved_groupnames = [str(group.name) for group in pkg.get_groups()]
-        assert len(pkg.extras) == len(extras)
-        for key, value in extras.items():
-            assert pkg.extras[key] == value
-
-        # for some reason environ['REMOTE_ADDR'] is undefined
-        rev = model.Revision.youngest(model.Session)
-        assert rev.author == 'tester'
-        assert rev.message == log_message
-        # TODO: reinstate once fixed in code
-        exp_log_message = u'Creating dataset %s' % name
-        # assert rev.message == exp_log_message
-
-    def test_new_existing_name(self):
-        # test creating a dataset with an existing name results in error'
-        # create initial dataset
-        pkgname = u'testpkg'
-        pkgtitle = u'mytesttitle'
-        assert not model.Package.by_name(pkgname)
-        offset = url_for(controller='package', action='new', id=None)
-        res = self.app.get(offset, extra_environ=self.extra_environ_tester)
-        assert 'Add - Datasets' in res
-        fv = res.forms['dataset-edit']
-        prefix = ''
-        fv[prefix + 'name'] = pkgname
-        self.pkg_names.append(pkgname)
-        res = fv.submit('save', extra_environ=self.extra_environ_tester)
-        assert not 'Error' in res, res
-        assert model.Package.by_name(pkgname)
-        # create duplicate dataset
-        res = self.app.get(offset, extra_environ=self.extra_environ_tester)
-        assert 'Add - Datasets' in res
-        fv = res.forms['dataset-edit']
-        fv[prefix+'name'] = pkgname
-        fv[prefix+'title'] = pkgtitle
-        res = fv.submit('save', extra_environ=self.extra_environ_tester)
-        assert 'Error' in res, res
-        assert 'That URL is already in use.' in res, res
-        self._assert_form_errors(res)
-
     def test_new_plugin_hook(self):
         plugins.load('test_package_controller_plugin')
         plugin = plugins.get_plugin('test_package_controller_plugin')
@@ -1387,29 +698,6 @@ def setup_class(cls):
     def teardown_class(cls):
         model.repo.rebuild_db()
 
-    def test_0_read_history(self):
-        res = self.app.get(self.offset)
-        main_res = self.main_div(res)
-        assert self.pkg1.name in main_res, main_res
-        assert 'radio' in main_res, main_res
-        latest_rev = self.pkg1.all_revisions[0]
-        oldest_rev = self.pkg1.all_revisions[-1]
-        first_radio_checked_html = '<input checked="checked" id="selected1_%s"' % latest_rev.revision_id
-        assert first_radio_checked_html in main_res, '%s %s' % (first_radio_checked_html, main_res)
-        last_radio_checked_html = '<input checked="checked" id="selected2_%s"' % oldest_rev.revision_id
-        assert last_radio_checked_html in main_res, '%s %s' % (last_radio_checked_html, main_res)
-
-    def test_1_do_diff(self):
-        res = self.app.get(self.offset)
-        form = res.forms['dataset-revisions']
-        res = form.submit()
-        res = res.follow()
-        main_res = self.main_div(res)
-        assert 'form-errors' not in main_res.lower(), main_res
-        assert 'Revision Differences' in main_res, main_res
-        assert self.pkg1.name in main_res, main_res
-        assert '<tr><td>notes</td><td><pre>- Written by Puccini\n+ Written off</pre></td></tr>' in main_res, main_res
-
     def test_2_atom_feed(self):
         offset = "%s?format=atom" % self.offset
         res = self.app.get(offset)
@@ -1417,78 +705,6 @@ def test_2_atom_feed(self):
         assert 'xmlns="http://www.w3.org/2005/Atom"' in res, res
         assert '</feed>' in res, res
 
-    def test_3_history_revision_link(self):
-        res = self.app.get(self.offset)
-        res = res.click('%s' % self.revision_ids[2][:4])
-        main_res = self.main_div(res)
-        assert 'Revision: %s' % self.revision_ids[2] in main_res
-
-    def test_4_history_revision_package_link(self):
-        res = self.app.get(self.offset)
-        url = str(self.revision_timestamps[1])[-6:]
-        res = res.click(href=url)
-        main_html = self.main_div(res)
-        assert 'This is an old revision of this dataset' in main_html
-
-
-class TestMarkdownHtmlWhitelist(TestPackageForm):
-
-    pkg_name = u'markdownhtmlwhitelisttest'
-    pkg_notes = u'''
-<table width="100%" border="1">
-<tr>
-<td rowspan="2"><b>Description</b></td>
-<td rowspan="2"><b>Documentation</b></td>
-
-<td colspan="2"><b><center>Data -- Pkzipped</center></b> </td>
-</tr>
-<tr>
-<td><b>SAS .tpt</b></td>
-<td><b>ASCII CSV</b> </td>
-</tr>
-<tr>
-<td><b>Overview</b></td>
-<td><A HREF="http://www.nber.org/patents/subcategories.txt">subcategory.txt</A></td>
-<td colspan="2"><center>--</center></td>
-</tr>
-<script><!--
-alert('Hello world!');
-//-->
-</script>
-
-'''
-
-    def setup(self):
-        model.Session.remove()
-        model.repo.init_db()
-        rev = model.repo.new_revision()
-        CreateTestData.create_arbitrary(
-            {'name':self.pkg_name,
-             'notes':self.pkg_notes,
-             'admins':[u'testadmin']}
-            )
-        self.pkg = model.Package.by_name(self.pkg_name)
-        self.pkg_id = self.pkg.id
-
-        offset = url_for(controller='package', action='read', id=self.pkg_name)
-        self.res = self.app.get(offset)
-
-    def teardown(self):
-        model.repo.rebuild_db()
-
-    def test_markdown_html_whitelist(self):
-        self.body = str(self.res)
-        self.fail_if_fragment('<table width="100%" border="1">')
-        self.fail_if_fragment('<td rowspan="2"><b>Description</b></td>')
-        self.fail_if_fragment('<a href="http://www.nber.org/patents/subcategories.txt" target="_blank" rel="nofollow">subcategory.txt</a>')
-        self.fail_if_fragment('<td colspan="2"><center>--</center></td>')
-        self.fail_if_fragment('<script>')
-
-    def assert_fragment(self, fragment):
-        assert fragment in self.body, (fragment, self.body)
-
-    def fail_if_fragment(self, fragment):
-        assert fragment not in self.body, (fragment, self.body)
 
 
 class TestResourceListing(TestPackageBase):
diff --git a/ckan/tests/functional/test_package_relationships.py b/ckan/tests/functional/test_package_relationships.py
deleted file mode 100644
index c44ecc32c9a..00000000000
--- a/ckan/tests/functional/test_package_relationships.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from ckan.tests import *
-import ckan.model as model
-from ckan.lib.create_test_data import CreateTestData
-from base import FunctionalTestCase
-
-class TestRelationships(FunctionalTestCase):
-    @classmethod
-    def setup_class(self):
-        create = CreateTestData
-        create.create_family_test_data()
-
-    @classmethod
-    def teardown_class(self):
-        model.repo.rebuild_db()
-
-    def test_read_package(self):
-        def read_package(pkg_name):
-            offset = url_for(controller='package', action='read', id=pkg_name)
-            res = self.app.get(offset)
-            pkg = model.Package.by_name(pkg_name)
-            assert '%s - Datasets' % pkg.title in res
-            return res
-        res = read_package(u'homer')
-        self.check_named_element(res, 'li', 'is a child of', 'abraham')
-        self.check_named_element(res, 'li', 'is a child of', '<a href="/dataset/abraham">abraham</a>')
-        self.check_named_element(res, 'li', 'is a parent of', 'bart')
-        self.check_named_element(res, 'li', 'is a parent of', 'lisa')
-        self.check_named_element(res, 'li', 'has derivation', 'homer_derived')
-        self.check_named_element(res, 'li', 'depends on', 'beer')
-        
-        res = read_package(u'bart')
-        self.check_named_element(res, 'li', 'has sibling', 'lisa')
-        self.check_named_element(res, 'li', 'is a child of', 'homer')
-
-        res = read_package(u'lisa')
-        self.check_named_element(res, 'li', 'has sibling', 'bart')
diff --git a/ckan/tests/functional/test_revision.py b/ckan/tests/functional/test_revision.py
index bdf0b1510a3..afac67a123d 100644
--- a/ckan/tests/functional/test_revision.py
+++ b/ckan/tests/functional/test_revision.py
@@ -22,57 +22,6 @@ def create_40_revisions(self):
             rev.author = "Test Revision %s" % i
             model.repo.commit()
 
-    def test_paginated_list(self):
-        # Ugh. Why is the number of items per page hard-coded? A designer might
-        # decide that 20 is the right number of revisions to display per page,
-        # (in fact I did) but would be forced to stick to 50 because changing
-        # this test is so laborious.
-        #
-        # TODO: do we even need to test pagination in such excruciating detail
-        # every time we use it? It's the same (hard-coded) test code N times over.
-        #
-        # </rant> -- NS 2009-12-17
-
-        self.create_40_revisions()
-        revisions = model.repo.history().all()
-        revision1 = revisions[0]
-        revision2 = revisions[20]
-        revision3 = revisions[40]
-        revision4 = revisions[-1]
-        # Revisions are most recent first, with first rev on last page.
-        # Todo: Look at the model to see which revision is last.
-        # Todo: Test for last revision on first page.
-        # Todo: Test for first revision on last page.
-        # Todo: Test for last revision minus 50 on second page.
-        # Page 1.   (Implied id=1)
-        offset = url_for(controller='revision', action='list')
-        res = self.app.get(offset)
-        self.assert_click(res, revision1.id, 'Revision: %s' % revision1.id)
-
-        # Page 1.
-        res = self.app.get(offset, params={'page':1})
-        self.assert_click(res, revision1.id, 'Revision: %s' % revision1.id)
-
-        # Page 2.
-        res = self.app.get(offset, params={'page':2})
-        self.assert_click(res, revision2.id, 'Revision: %s' % revision2.id)
-
-        # Page 3.
-        res = self.app.get(offset, params={'page':3})
-        self.assert_click(res, revision3.id, 'Revision: %s' % revision3.id)
-
-        # Last page.
-        last_id = 1 + len(revisions) / 20
-        res = self.app.get(offset, params={'page':last_id})
-
-        assert 'Revision History' in res
-        assert '1' in res
-        assert 'Author' in res
-        assert 'tester' in res
-        assert 'Log Message' in res
-        assert 'Creating test data.' in res
-
-
     def assert_click(self, res, link_exp, res2_exp):
         try:
             # paginate links are also just numbers
diff --git a/ckan/tests/functional/test_search.py b/ckan/tests/functional/test_search.py
deleted file mode 100644
index 47e14697e5b..00000000000
--- a/ckan/tests/functional/test_search.py
+++ /dev/null
@@ -1,164 +0,0 @@
-# These only test that the controller is passing on queries correctly
-# to the search library. The search library is tested in:
-# ckan/tests/lib/test_solr_package_search.py
-
-import re
-from nose.tools import assert_equal
-
-from ckan.tests import CreateTestData, setup_test_search_index, search_related
-from ckan.tests.pylons_controller import PylonsTestCase
-from base import FunctionalTestCase
-from ckan import model
-import ckan.lib.search as search
-import ckan.lib.helpers as h
-
-class TestSearch(FunctionalTestCase):
-    # 'penguin' is in all test search packages
-    q_all = u'penguin'
-
-    @classmethod
-    def setup_class(cls):
-        model.Session.remove()
-        setup_test_search_index()
-        CreateTestData.create_search_test_data()
-        cls.count_re = re.compile('<strong>(\d)</strong> datasets found')
-
-    @classmethod
-    def teardown_class(cls):
-        model.repo.rebuild_db()
-        search.clear()
-
-    def _pkg_names(self, result):
-        return ' '.join(result['results'])
-
-    def _check_results(self, res, expected_count, expected_package_names=[]):
-        '''Takes a search result web page and determines whether the
-        search results displayed match the expected count and names
-        of packages.'''
-        # get count
-        content = self.named_div('content', res)
-        count_match = self.count_re.search(content)
-        assert count_match
-        assert_equal(len(count_match.groups()), 1)
-        count = int(count_match.groups()[0])
-        assert_equal(count, expected_count)
-
-        # check package names
-        if isinstance(expected_package_names, basestring):
-            expected_package_names = [expected_package_names]
-        for expected_name in expected_package_names:
-            expected_html = '<a href="/dataset/%s">' % expected_name
-            assert expected_html in res.body, \
-                   'Could not find package name %r in the results page'
-
-    def test_1_all_records(self):
-        res = self.app.get('/dataset?q')
-        result = self._check_results(res, 6, 'gils')
-
-    def test_1_name(self):
-        # exact name
-        res = self.app.get('/dataset?q=gils')
-        result = self._check_results(res, 1, 'gils')
-
-    def test_2_title(self):
-        # exact title, one word
-        res = self.app.get('/dataset?q=Opengov')
-        result = self._check_results(res, 1, 'se-opengov')
-
-        # multiple words
-        res = self.app.get('/dataset?q=Government%20Expenditure')
-        result = self._check_results(res, 1, 'uk-government-expenditure')
-
-class TestSearch2(FunctionalTestCase, PylonsTestCase):#, TestPackageForm):
-
-    @classmethod
-    def setup_class(cls):
-        PylonsTestCase.setup_class()
-        setup_test_search_index()
-        CreateTestData.create()
-
-    @classmethod
-    def teardown_class(cls):
-        model.repo.rebuild_db()
-        search.clear()
-
-    @search_related
-    def test_search(self):
-        offset = h.url_for(controller='package', action='search')
-        print offset
-        res = self.app.get(offset)
-        assert 'Search - ' in res
-        self._check_search_results(res, 'annakarenina', ['<strong>1</strong>', 'A Novel By Tolstoy'] )
-        self._check_search_results(res, 'warandpeace', ['<strong>1</strong>'])
-        self._check_search_results(res, 'warandpeace', ['<strong>1</strong>'])
-        self._check_search_results(res, 'annakarenina', ['<strong>1</strong>'])
-        # check for something that also finds tags ...
-        self._check_search_results(res, 'russian', ['<strong>2</strong>'])
-
-    @search_related
-    def test_search_foreign_chars(self):
-        offset = h.url_for(controller='package', action='search')
-        res = self.app.get(offset)
-        assert 'Search - ' in res
-        self._check_search_results(res, u'th\xfcmb', ['<strong>1</strong>'])
-        self._check_search_results(res, 'thumb', ['<strong>1</strong>'])
-
-    @search_related
-    def test_search_escape_chars(self):
-        payload = '?q=fjdkf%2B%C2%B4gfhgfkgf%7Bg%C2%B4pk&search=Search+Packages+%C2%BB'
-        offset = h.url_for(controller='package', action='search') + payload
-        results_page = self.app.get(offset)
-        assert 'Search - ' in results_page, results_page
-        results_page = self.main_div(results_page)
-        # solr's edismax parser won't throw an error, so this should return 0 results
-        assert '>0<' in results_page, results_page
-
-    def _check_search_results(self, page, terms, requireds):
-        form = page.forms['dataset-search']
-        form['q'] = terms.encode('utf8') # paste doesn't handle this!
-        results_page = form.submit()
-        assert 'Search - ' in results_page, results_page
-        results_page = self.main_div(results_page)
-        for required in requireds:
-            if required not in results_page:
-                print results_page
-                print 'Could not find %r' % required
-                raise AssertionError
-
-class TestNonActivePackages(FunctionalTestCase):
-    @classmethod
-    def setup_class(self):
-        setup_test_search_index()
-        CreateTestData.create()
-        self.non_active_name = u'test_nonactive'
-        pkg = model.Package(name=self.non_active_name)
-        model.repo.new_revision()
-        model.Session.add(pkg)
-        model.repo.commit_and_remove()
-
-        pkg = model.Session.query(model.Package).filter_by(name=self.non_active_name).one()
-        admin = model.User.by_name(u'joeadmin')
-        model.setup_default_user_roles(pkg, [admin])
-        model.repo.commit_and_remove()
-
-        model.repo.new_revision()        
-        pkg = model.Session.query(model.Package).filter_by(name=self.non_active_name).one()
-        pkg.delete() # becomes non active
-        model.repo.commit_and_remove()
-        
-
-    @classmethod
-    def teardown_class(self):
-        model.repo.rebuild_db()
-        search.clear()
-
-    @search_related
-    def test_search(self):
-        offset = h.url_for(controller='package', action='search')
-        res = self.app.get(offset)
-        assert 'Search - ' in res
-        form = res.forms['dataset-search']
-        form['q'] =  'name:' + str(self.non_active_name)
-        results_page = form.submit()
-        assert 'Search - ' in results_page, results_page
-        assert '<strong>0</strong> datasets found' in results_page, (self.non_active_name, results_page)
diff --git a/ckan/tests/functional/test_tag.py b/ckan/tests/functional/test_tag.py
index 1c19e8f021f..553ca69f9b0 100644
--- a/ckan/tests/functional/test_tag.py
+++ b/ckan/tests/functional/test_tag.py
@@ -16,76 +16,6 @@ def setup_class(self):
     def teardown_class(self):
         model.repo.rebuild_db()
 
-    def test_index(self):
-        offset = url_for(controller='tag', action='index')
-        res = self.app.get(offset)
-        assert 'Tags' in res
-        assert 'There are' in res
-
-    def test_read_moved(self):
-        name = 'tolstoy'
-        offset = '/tag/read/%s' % name
-        res = self.app.get(offset, status=HTTP_MOVED_PERMANENTLY)
-        res = res.follow()
-        assert '%s - Tags' % name in res
-        assert name in res
-        # res = res.click(pkgname)
-        # assert '%s - Data Packages' % pkgname in res
-
-    def test_read(self):
-        name = 'tolstoy'
-        pkgname = 'warandpeace'
-        offset = url_for(controller='tag', action='read', id=name)
-        assert offset == '/tag/tolstoy', offset
-        res = self.app.get(offset)
-        assert '%s - Tags' % name in res
-        assert name in res
-        # res = res.click(pkgname)
-        # assert '%s - Data Packages' % pkgname in res
-
-    def test_list_short(self):
-        offset = url_for(controller='tag', action='index')
-        res = self.app.get(offset)
-        tagname = 'tolstoy'
-        assert tagname in res
-        #assert '(2 packages)' in res
-        res = res.click(tagname)
-        assert tagname in res
-        offset = url_for(controller='tag', action='index')
-        res = self.app.get(offset)
-        assert tagname in res
-        #assert '(2 packages)' in res
-        tag_count = model.Session.query(model.Tag).count()
-        assert 'There are <strong>%s</strong> results for tags.' % tag_count in res
-        offset = url_for(controller='tag', action='index')
-        res = self.app.get(offset)
-        assert tagname in res
-        tag_count = model.Session.query(model.Tag).count()
-        assert 'There are <strong>%s</strong> results for tags.' % tag_count in res
-        # Avoid interactions.
-        offset = url_for(controller='tag', action='index')
-    
-    def test_search(self):
-        offset = url_for(controller='tag', action='index', id=None)
-        res = self.app.get(offset)
-        search_term = 's'
-        fv = res.forms['tag-search']
-        fv['q'] =  str(search_term)
-        res = fv.submit()
-        assert 'There are <strong>2</strong> results' in res, res
-        assert 'russian' in res, res
-        assert 'tolstoy' in res, res
-
-    def test_search_with_unicode_term(self):
-        offset = url_for(controller='tag', action='index', id=None)
-        res = self.app.get(offset)
-        search_term = u' \u30a1'.encode('utf8')
-        fv = res.forms['tag-search']
-        fv['q'] =  str(search_term)
-        res = fv.submit()
-        assert 'There are <strong>1</strong> results' in res, res
-        assert u'Flexible \u30a1' in res, res
-
     def test_autocomplete(self):
         controller = 'api'
         action = 'tag_autocomplete'
@@ -108,7 +38,7 @@ def test_autocomplete_with_capital_letter_in_search_term(self):
         res = self.app.get(offset)
         data = json.loads(res.body)
         assert u'Flexible \u30a1' in data['ResultSet']['Result'][0].values()
-        
+
     def test_autocomplete_with_space_in_search_term(self):
         controller = 'api'
         action = 'tag_autocomplete'
@@ -116,7 +46,7 @@ def test_autocomplete_with_space_in_search_term(self):
         res = self.app.get(offset)
         data = json.loads(res.body)
         assert u'Flexible \u30a1' in data['ResultSet']['Result'][0].values()
-        
+
     def test_autocomplete_with_unicode_in_search_term(self):
         controller = 'api'
         action = 'tag_autocomplete'
diff --git a/ckan/tests/functional/test_tag_vocab.py b/ckan/tests/functional/test_tag_vocab.py
deleted file mode 100644
index 04ca960a7bf..00000000000
--- a/ckan/tests/functional/test_tag_vocab.py
+++ /dev/null
@@ -1,225 +0,0 @@
-import json
-import paste.fixture
-from ckan import model
-from ckan.lib.create_test_data import CreateTestData
-import ckan.lib.helpers as h
-from ckan.tests import WsgiAppCase
-import ckan.plugins as plugins
-
-TEST_VOCAB_NAME = 'test-vocab'
-
-
-
-# paste.fixture.Field.Select does not handle multiple selects currently,
-# so replace with our own implementations of Form and Select
-class Form(paste.fixture.Form):
-    def __init__(self, response, text):
-        paste.fixture.Form.__init__(self, response, text)
-
-    def submit_fields(self, name=None, index=None):
-        """
-        Return a list of ``[(name, value), ...]`` for the current
-        state of the form.
-        """
-        submit = []
-        if name is not None:
-            field = self.get(name, index=index)
-            submit.append((field.name, field.value_if_submitted()))
-        for name, fields in self.fields.items():
-            if name is None:
-                continue
-            for field in fields:
-                value = field.value
-                if value is None:
-                    continue
-                if isinstance(value, list):
-                    for v in value:
-                        submit.append((name, v))
-                else:
-                    submit.append((name, value))
-        return submit
-
-
-class Select(paste.fixture.Field):
-    def __init__(self, *args, **attrs):
-        paste.fixture.Field.__init__(self, *args, **attrs)
-        self.options = []
-        self.selectedIndex = None
-
-    def value__set(self, value):
-        if not value:
-            self.selectedIndex = None
-            self.options = [(option, False) for (option, checked) in self.options]
-            return
-
-        for v in value:
-            if not v in [option for (option, checked) in self.options]:
-                raise ValueError("Option %r not found (from %s)"
-                    % (value, ', '.join(
-                    [repr(o) for o, checked in self.options]))
-                )
-
-        new_options = [(option, True) for (option, checked) in self.options if option in value]
-        new_options += [(option, False) for (option, checked) in self.options if not option in value]
-        self.options = new_options
-
-    def value__get(self):
-        return [option for (option, checked) in self.options if checked]
-
-    value = property(value__get, value__set)
-
-class TestWUI(WsgiAppCase):
-    @classmethod
-    def setup_class(cls):
-        plugins.load('test_tag_vocab_plugin')
-        CreateTestData.create(package_type='mock_vocab_tags_plugin')
-        cls.sysadmin_user = model.User.get('testsysadmin')
-        cls.dset = model.Package.get('warandpeace')
-        cls.tag1_name = 'vocab-tag-1'
-        cls.tag2_name = 'vocab-tag-2'
-
-        # use our custom select class for this test suite
-        cls.old_select = paste.fixture.Field.classes['select']
-        paste.fixture.Field.classes['select'] = Select
-
-        # create a test vocab
-        params = json.dumps({'name': TEST_VOCAB_NAME})
-        extra_environ = {'Authorization' : str(cls.sysadmin_user.apikey)}
-        cls.extra_environ = {'Authorization' : str(cls.sysadmin_user.apikey)}
-        response = cls.app.post('/api/action/vocabulary_create', params=params,
-                                extra_environ=extra_environ)
-        assert json.loads(response.body)['success']
-        vocab_id = json.loads(response.body)['result']['id']
-
-        # add tags to the vocab
-        extra_environ = {'Authorization' : str(cls.sysadmin_user.apikey)}
-        params = json.dumps({'name': cls.tag1_name, 'vocabulary_id': vocab_id})
-        response = cls.app.post('/api/action/tag_create', params=params,
-                                 extra_environ=extra_environ)
-        assert json.loads(response.body)['success']
-        params = json.dumps({'name': cls.tag2_name, 'vocabulary_id': vocab_id})
-        response = cls.app.post('/api/action/tag_create', params=params,
-                                 extra_environ=extra_environ)
-        assert json.loads(response.body)['success']
-
-    @classmethod
-    def teardown_class(cls):
-        plugins.unload('test_tag_vocab_plugin')
-        paste.fixture.Field.classes['select'] = cls.old_select
-        model.repo.rebuild_db()
-
-    def _get_vocab_id(self, vocab_name):
-        params = json.dumps({'id': vocab_name})
-        response = self.app.post('/api/action/vocabulary_show', params=params)
-        assert json.loads(response.body)['success']
-        return json.loads(response.body)['result']['id']
-
-    def _add_vocab_tag_to_dataset(self, dataset_id, vocab_id, tag_name):
-        params = json.dumps({'id': dataset_id})
-        response = self.app.post('/api/action/package_show', params=params)
-        dataset = json.loads(response.body)['result']
-        dataset['tags'] = []
-        dataset['tags'].append({'name': tag_name, 'vocabulary_id': vocab_id})
-        params = json.dumps(dataset)
-        response = self.app.post('/api/action/package_update', params=params,
-                                 extra_environ={'Authorization': str(self.sysadmin_user.apikey)})
-        assert json.loads(response.body)['success']
-
-    def _remove_vocab_tags(self, dataset_id, vocab_id, tag_name):
-        params = json.dumps({'id': dataset_id})
-        response = self.app.post('/api/action/package_show', params=params)
-        dataset = json.loads(response.body)['result']
-        dataset['vocab_tag_selected'] = []
-        params = json.dumps(dataset)
-        response = self.app.post('/api/action/package_update', params=params,
-                                 extra_environ={'Authorization': str(self.sysadmin_user.apikey)})
-        assert json.loads(response.body)['success']
-
-    def test_01_dataset_view(self):
-        vocab_id = self._get_vocab_id(TEST_VOCAB_NAME)
-        self._add_vocab_tag_to_dataset(self.dset.id, vocab_id, self.tag1_name)
-        response = self.app.get(h.url_for(controller='package', action='read',
-            id=self.dset.id))
-        assert self.tag1_name in response.body, self.tag1_name
-        self._remove_vocab_tags(self.dset.id, vocab_id, self.tag1_name)
-
-    def test_02_dataset_edit_add_vocab_tag(self):
-        vocab_id = self._get_vocab_id(TEST_VOCAB_NAME)
-        url = h.url_for(controller='package', action='edit', id=self.dset.id)
-        response = self.app.get(url, extra_environ=self.extra_environ)
-        fv = response.forms['dataset-edit']
-        fv = Form(fv.response, fv.text)
-        fv['vocab_tags'] = [self.tag2_name]
-        response = fv.submit('save', extra_environ=self.extra_environ)
-        response = response.follow()
-        assert not self.tag1_name in response.body
-        assert self.tag2_name in response.body
-        self._remove_vocab_tags(self.dset.id, vocab_id, self.tag1_name)
-        self._remove_vocab_tags(self.dset.id, vocab_id, self.tag2_name)
-
-    def test_02_dataset_edit_add_free_and_vocab_tags_then_edit_again(self):
-        vocab_id = self._get_vocab_id(TEST_VOCAB_NAME)
-        url = h.url_for(controller='package', action='edit', id=self.dset.id)
-        response = self.app.get(url, extra_environ=self.extra_environ)
-        fv = response.forms['dataset-edit']
-        fv = Form(fv.response, fv.text)
-
-        # Add a free tag with a space in its name.
-        fv['tag_string'] = 'water quality'
-
-        # Add a vocab tag.
-        fv['vocab_tags'] = [self.tag2_name]
-
-        # Save the dataset and visit the page again
-        response = fv.submit('save', extra_environ=self.extra_environ)
-        response = response.follow()
-        assert not self.tag1_name in response.body
-        assert self.tag2_name in response.body
-        url = h.url_for(controller='package', action='edit', id=self.dset.id)
-        response = self.app.get(url, extra_environ=self.extra_environ)
-        fv = response.forms['dataset-edit']
-        fv = Form(fv.response, fv.text)
-        assert fv['vocab_tags'].value == [self.tag2_name], fv['vocab_tags'].value
-        self._remove_vocab_tags(self.dset.id, vocab_id, self.tag2_name)
-
-    def test_03_dataset_edit_remove_vocab_tag(self):
-        vocab_id = self._get_vocab_id(TEST_VOCAB_NAME)
-        self._add_vocab_tag_to_dataset(self.dset.id, vocab_id, self.tag1_name)
-        url = h.url_for(controller='package', action='edit', id=self.dset.id)
-        response = self.app.get(url, extra_environ=self.extra_environ)
-        fv = response.forms['dataset-edit']
-        fv = Form(fv.response, fv.text)
-        fv['vocab_tags'] = []
-        response = fv.submit('save', extra_environ=self.extra_environ)
-        response = response.follow()
-        assert not self.tag1_name in response.body
-        self._remove_vocab_tags(self.dset.id, vocab_id, self.tag1_name)
-
-    def test_04_dataset_edit_change_vocab_tag(self):
-        vocab_id = self._get_vocab_id(TEST_VOCAB_NAME)
-        self._add_vocab_tag_to_dataset(self.dset.id, vocab_id, self.tag1_name)
-        url = h.url_for(controller='package', action='edit', id=self.dset.id)
-        response = self.app.get(url, extra_environ=self.extra_environ)
-        fv = response.forms['dataset-edit']
-        fv = Form(fv.response, fv.text)
-        fv['vocab_tags'] = [self.tag2_name]
-        response = fv.submit('save', extra_environ=self.extra_environ)
-        response = response.follow()
-        assert not self.tag1_name in response.body
-        assert self.tag2_name in response.body
-        self._remove_vocab_tags(self.dset.id, vocab_id, self.tag2_name)
-
-    def test_05_dataset_edit_add_multiple_vocab_tags(self):
-        vocab_id = self._get_vocab_id(TEST_VOCAB_NAME)
-        url = h.url_for(controller='package', action='edit', id=self.dset.id)
-        response = self.app.get(url, extra_environ=self.extra_environ)
-        fv = response.forms['dataset-edit']
-        fv = Form(fv.response, fv.text)
-        fv['vocab_tags'] = [self.tag1_name, self.tag2_name]
-        response = fv.submit('save', extra_environ=self.extra_environ)
-        response = response.follow()
-        assert self.tag1_name in response.body
-        assert self.tag2_name in response.body
-        self._remove_vocab_tags(self.dset.id, vocab_id, self.tag1_name)
-        self._remove_vocab_tags(self.dset.id, vocab_id, self.tag2_name)
-
diff --git a/ckan/tests/functional/test_upload.py b/ckan/tests/functional/test_upload.py
deleted file mode 100644
index fdfb094da7c..00000000000
--- a/ckan/tests/functional/test_upload.py
+++ /dev/null
@@ -1,50 +0,0 @@
-import os
-import paste.fixture
-from pylons import config
-
-from ckan.config.middleware import make_app
-from ckan.tests import conf_dir, url_for, CreateTestData
-import ckan.model as model
-
-
-class TestStorageController:
-    @classmethod
-    def setup_class(cls):
-        cls._original_config = config.copy()
-        config['ckan.storage.directory'] = '/tmp'
-        wsgiapp = make_app(config['global_conf'], **config)
-        cls.app = paste.fixture.TestApp(wsgiapp)
-        CreateTestData.create()
-
-    @classmethod
-    def teardown_class(cls):
-        config.clear()
-        config.update(cls._original_config)
-        model.Session.remove()
-        model.repo.rebuild_db()
-
-
-    def test_03_authorization_wui(self):
-        url = url_for('storage_upload')
-        res = self.app.get(url, status=[200] )
-        if res.status == 302:
-            res = res.follow()
-            assert 'Login' in res, res
-
-    def test_04_index(self):
-        extra_environ = {'REMOTE_USER': 'tester'}
-        url = url_for('storage_upload')
-        out = self.app.get(url, extra_environ=extra_environ)
-        assert 'Upload' in out, out
-        #assert 'action="https://commondatastorage.googleapis.com/ckan' in out, out
-        #assert 'key" value="' in out, out
-        #assert 'policy" value="' in out, out
-        #assert 'failure_action_redirect' in out, out
-        #assert 'success_action_redirect' in out, out
-
-        url = url_for('storage_upload', filepath='xyz.txt')
-        out = self.app.get(url, extra_environ=extra_environ)
-        assert 'file/xyz.txt' in out, out
-
-    # TODO: test file upload itself
-
diff --git a/ckan/tests/functional/test_user.py b/ckan/tests/functional/test_user.py
index df14063a992..53a3d9ae881 100644
--- a/ckan/tests/functional/test_user.py
+++ b/ckan/tests/functional/test_user.py
@@ -48,22 +48,6 @@ def teardown(self):
         # just ensure we're not logged in
         self.app.get('/user/logout')
 
-    def test_user_read(self):
-        user = model.User.by_name(u'annafan')
-        offset = '/user/%s' % user.id
-        res = self.app.get(offset, status=200)
-        main_res = self.main_div(res)
-        assert 'annafan' in res, res
-        assert 'Logged in' not in main_res, main_res
-        assert 'checkpoint:is-myself' not in main_res, main_res
-        assert 'about' in main_res, main_res
-        assert 'I love reading Annakarenina' in res, main_res
-        self.check_named_element(res, 'a',
-                                 'http://anna.com',
-                                 'target="_blank"',
-                                 'rel="nofollow"')
-        assert 'Edit Profile' not in main_res, main_res
-
     def test_user_delete_redirects_to_user_index(self):
         user = CreateTestData.create_user('a_user')
         url = url_for(controller='user', action='delete', id=user.id)
@@ -91,39 +75,6 @@ def test_user_read_me_without_id(self):
         offset = '/user/me'
         res = self.app.get(offset, status=302)
 
-    def test_user_read_without_id_but_logged_in(self):
-        user = model.User.by_name(u'annafan')
-        offset = '/user/annafan'
-        res = self.app.get(offset, status=200, extra_environ={'REMOTE_USER': str(user.name)})
-        main_res = self.main_div(res)
-        assert 'annafan' in main_res, main_res
-        assert 'checkpoint:is-myself' in main_res, main_res
-
-    def test_user_read_logged_in(self):
-        user = model.User.by_name(u'annafan')
-        offset = '/user/%s' % user.id
-        res = self.app.get(offset, extra_environ={'REMOTE_USER': str(user.name)})
-        main_res = self.main_div(res)
-        assert 'annafan' in res, res
-        assert 'checkpoint:is-myself' in main_res, main_res
-        assert 'Edit Profile' in main_res, main_res
-
-
-    def test_user_login_page(self):
-        offset = url_for(controller='user', action='login', id=None)
-        res = self.app.get(offset, status=200)
-        assert 'Login' in res, res
-        assert 'Please click your account provider' in res, res
-        assert 'Forgot your password?' in res, res
-        assert 'Don\'t have an OpenID' in res, res
-
-    def test_logout(self):
-        res = self.app.get('/user/_logout')
-        res2 = res.follow()
-        while res2.status == 302:
-            res2 = res2.follow()
-        assert 'You have logged out successfully.' in res2, res2
-
     def _get_cookie_headers(self, res):
         # For a request response, returns the Set-Cookie header values.
         cookie_headers = []
@@ -132,253 +83,6 @@ def _get_cookie_headers(self, res):
                 cookie_headers.append(value)
         return cookie_headers
 
-    def test_login(self):
-        # create test user
-        username = u'testlogin'
-        password = u'letmein'
-        CreateTestData.create_user(name=username,
-                                   password=password)
-        user = model.User.by_name(username)
-
-        # do the login
-        offset = url_for(controller='user', action='login')
-        res = self.app.get(offset)
-        fv = res.forms['login']
-        fv['login'] = str(username)
-        fv['password'] = str(password)
-        fv['remember'] = False
-        res = fv.submit()
-
-        # check cookies set
-        cookies = self._get_cookie_headers(res)
-        assert cookies
-        for cookie in cookies:
-            assert not 'max-age' in cookie.lower(), cookie
-
-        # first get redirected to user/logged_in
-        assert_equal(res.status, 302)
-        assert res.header('Location').startswith('http://localhost/user/logged_in') or \
-               res.header('Location').startswith('/user/logged_in')
-
-        # then get redirected to user's dashboard
-        res = res.follow()
-        res = res.follow()
-        assert_equal(res.status, 302)
-        assert res.header('Location').startswith('http://localhost/dashboard') or \
-               res.header('Location').startswith('/dashboard')
-        res = res.follow()
-        assert_equal(res.status, 200)
-        assert 'checkpoint:my-dashboard' in res.body
-
-        # check user object created
-        user = model.User.by_name(username)
-        assert user
-        assert_equal(user.name, username)
-        assert len(user.apikey) == 36
-
-        # check cookie created
-        cookie = res.request.environ['HTTP_COOKIE']
-        assert 'auth_tkt=' in cookie, cookie
-        assert 'testlogin!userid_type:unicode' in cookie, cookie
-
-        # navigate to another page and check username still displayed
-        res = res.click('Search')
-        assert 'testlogin' in res.body, res.body
-
-    def test_login_remembered(self):
-        # create test user
-        username = u'testlogin2'
-        password = u'letmein'
-        CreateTestData.create_user(name=username,
-                                   password=password)
-        user = model.User.by_name(username)
-
-        # do the login
-        offset = url_for(controller='user', action='login')
-        res = self.app.get(offset)
-        fv = res.forms['login']
-        fv['login'] = str(username)
-        fv['password'] = str(password)
-        fv['remember'] = True
-        res = fv.submit()
-
-        # check cookies set
-        cookies = self._get_cookie_headers(res)
-        assert cookies
-        # check cookie is remembered via Max-Age and Expires
-        # (both needed for cross-browser compatibility)
-        for cookie in cookies:
-            assert 'Max-Age=63072000;' in cookie, cookie
-            assert 'Expires=' in cookie, cookie
-
-    def test_login_wrong_password(self):
-        # create test user
-        username = u'testloginwrong'
-        password = u'letmein'
-        CreateTestData.create_user(name=username,
-                                   password=password)
-        user = model.User.by_name(username)
-
-        # do the login
-        offset = url_for(controller='user', action='login')
-        res = self.app.get(offset)
-        fv = res.forms['login']
-        fv['login'] = username
-        fv['password'] = 'wrong_password'
-        res = fv.submit()
-
-        # first get redirected to logged_in
-        assert_equal(res.status, 302)
-        assert res.header('Location').startswith('http://localhost/user/logged_in') or \
-               res.header('Location').startswith('/user/logged_in')
-
-        # then get redirected to login
-        res = res.follow()
-        res = res.follow()
-        assert_equal(res.status, 302)
-        assert res.header('Location').startswith('http://localhost/user/login') or \
-               res.header('Location').startswith('/user/login')
-        res = res.follow()
-        assert_equal(res.status, 200)
-        assert 'Login failed. Bad username or password.' in res.body
-        assert 'Login:' in res.body
-
-    def test_relogin(self):
-        '''Login as user A and then (try to) login as user B (without
-        logout). #1799.'''
-        # create test users A & B
-        password = u'letmein'
-        CreateTestData.create_user(name=u'user_a',
-                                   password=password)
-        CreateTestData.create_user(name=u'user_b',
-                                   password=password)
-        userA = model.User.by_name(u'user_a')
-        userB = model.User.by_name(u'user_b')
-
-        # do the login
-        offset = url_for(controller='user', action='login')
-        res = self.app.get(offset)
-        fv = res.forms['login']
-        fv['login'] = 'user_a'
-        fv['password'] = str(password)
-        res = fv.submit()
-        while res.status == 302:
-            res = res.follow()
-        assert_equal(res.status, 200)
-
-        # login as userB
-        offset = url_for(controller='user', action='login')
-        res = self.app.get(offset)
-        assert not res.forms.has_key('login') # i.e. no login box is presented
-        assert 'To register or log in as another user' in res.body, res.body
-        assert 'logout' in res.body, res.body
-
-        # Test code left commented - shows the problem if you
-        # let people try to login whilst still logged in. #1799
-##        fv['login'] = 'user_b'
-##        fv['password'] = str(password)
-##        res = fv.submit()
-##        while res.status == 302:
-##            res = res.follow()
-##        assert_equal(res.status, 200)
-
-##        offset = url_for(controller='user', action='me')
-##        res = self.app.get(offset)
-##        assert_equal(res.status, 302)
-##        res = res.follow()
-##        assert 'user_b' in res
-
-    def test_try_to_register_whilst_logged_in(self):
-        '''Login as user A and then (try to) register user B (without
-        logout). #1799.'''
-        # create user A
-        password = u'letmein'
-        CreateTestData.create_user(name=u'user_a_',
-                                   password=password)
-        userA = model.User.by_name(u'user_a_')
-
-        # do the login
-        offset = url_for(controller='user', action='login')
-        res = self.app.get(offset)
-        fv = res.forms['login']
-        fv['login'] = 'user_a_'
-        fv['password'] = str(password)
-        res = fv.submit()
-        while res.status == 302:
-            res = res.follow()
-        assert_equal(res.status, 200)
-
-        # try to register
-        offset = url_for(controller='user', action='register')
-        res = self.app.get(offset)
-        assert not res.forms.has_key('Password') # i.e. no registration form
-        assert 'To register or log in as another user' in res.body, res.body
-        assert 'logout' in res.body, res.body
-
-    def test_register_whilst_logged_in(self):
-        '''Start registration form as user B then in another window login
-        as user A, and then try and then submit form for user B. #1799.'''
-        # create user A
-        password = u'letmein'
-        CreateTestData.create_user(name=u'user_a__',
-                                   password=password)
-        userA = model.User.by_name(u'user_a__')
-        # make him a sysadmin, to ensure he is allowed to create a user
-        model.add_user_to_role(userA, model.Role.ADMIN, model.System())
-        model.repo.commit_and_remove()
-        userA = model.User.by_name(u'user_a__')
-
-        # start to register user B
-        offset = url_for(controller='user', action='register')
-        res = self.app.get(offset)
-        fvA = res.forms['user-edit']
-        fvA['name'] = 'user_b_'
-        fvA['fullname'] = 'User B'
-        fvA['email'] = 'user@b.com'
-        fvA['password1'] = password
-        fvA['password2'] = password
-
-        # login user A
-        offset = url_for(controller='user', action='login')
-        res = self.app.get(offset)
-        fvB = res.forms['login']
-        fvB['login'] = 'user_a__'
-        fvB['password'] = str(password)
-        res = fvB.submit()
-        while res.status == 302:
-            res = res.follow()
-        assert_equal(res.status, 200)
-
-        # finish registration of user B
-        res = fvA.submit('save')
-        assert_equal(res.status, 200)
-        assert 'user_a__</a> is currently logged in' in res.body, res.body
-        assert 'User "user_b_" is now registered but you are still logged in as "user_a__" from before'.replace('"', '&#34;') in res.body, res.body
-        assert 'logout' in res.body, res.body
-
-        # logout and login as user B
-        res = self.app.get('/user/_logout')
-        res2 = res.follow()
-        while res2.status == 302:
-            res2 = res2.follow()
-        assert 'You have logged out successfully.' in res2, res2
-        offset = url_for(controller='user', action='login')
-        res = self.app.get(offset)
-        fv = res.forms['login']
-        fv['login'] = 'user_b_'
-        fv['password'] = str(password)
-        res = fv.submit()
-        while res.status == 302:
-            res = res.follow()
-        assert_equal(res.status, 200)
-
-    @search_related
-    def test_home_login(self):
-        offset = url_for('home')
-        res = self.app.get(offset)
-        res = res.click('Login')
-        assert 'Login to CKAN' in res, res.body
-
     def test_apikey(self):
         username= u'okfntest'
         user = model.User.by_name(u'okfntest')
@@ -397,398 +101,6 @@ def test_apikey(self):
         res = self.app.get(offset, extra_environ={'REMOTE_USER': 'okfntest'})
         assert user.apikey in res, res
 
-    def test_user_create(self):
-        # create/register user
-        username = 'testcreate'
-        fullname = u'Test Create'
-        password = u'testpassword'
-        email = u'test@test.org'
-        assert not model.User.by_name(unicode(username))
-        rev_id_before_test = model.repo.youngest_revision().id
-
-        offset = url_for(controller='user', action='register')
-        res = self.app.get(offset, status=200)
-        main_res = self.main_div(res)
-        assert 'Register' in main_res, main_res
-        fv = res.forms['user-edit']
-        fv['name'] = username
-        fv['fullname'] = fullname
-        fv['email'] = email
-        fv['password1'] = password
-        fv['password2'] = password
-        res = fv.submit('save')
-
-        # view user
-        assert res.status == 302, self.main_div(res).encode('utf8')
-        res = res.follow()
-        if res.status == 302:
-            res = res.follow()
-        if res.status == 302:
-            res = res.follow()
-        if res.status == 302:
-            res = res.follow()
-        assert res.status == 200, res
-        main_res = self.main_div(res)
-        assert fullname in main_res, main_res
-
-        # check saved user object
-        user = model.User.by_name(unicode(username))
-        assert user
-        assert_equal(user.name, username)
-        assert_equal(user.fullname, fullname)
-        assert_equal(user.email, email)
-        assert user.password
-
-        # no revision should be created - User is not revisioned
-        rev_id_after_test = model.repo.youngest_revision().id
-        assert_equal(rev_id_before_test, rev_id_after_test)
-
-        # check cookies created
-        cookie = res.request.environ['HTTP_COOKIE']
-        assert 'auth_tkt=' in cookie, cookie
-        assert 'testcreate!userid_type:unicode' in cookie, cookie
-
-
-    def test_user_create_unicode(self):
-        # create/register user
-        username = u'testcreate4'
-        fullname = u'Test Create\xc2\xa0'
-        password = u'testpassword\xc2\xa0'
-        email = u'me\xc2\xa0@test.org'
-        assert not model.User.by_name(username)
-
-        offset = url_for(controller='user', action='register')
-        res = self.app.get(offset, status=200)
-        main_res = self.main_div(res)
-        assert 'Register' in main_res, main_res
-        fv = res.forms['user-edit']
-        fv['name'] = username
-        fv['fullname'] = fullname.encode('utf8')
-        fv['email'] = email.encode('utf8')
-        fv['password1'] = password.encode('utf8')
-        fv['password2'] = password.encode('utf8')
-        res = fv.submit('save')
-
-        # view user
-        assert res.status == 302, self.main_div(res).encode('utf8')
-        res = res.follow()
-        if res.status == 302:
-            res = res.follow()
-        if res.status == 302:
-            res = res.follow()
-        if res.status == 302:
-            res = res.follow()
-        assert res.status == 200, res
-        main_res = self.main_div(res)
-        assert fullname in main_res, main_res
-
-        user = model.User.by_name(unicode(username))
-        assert user
-        assert_equal(user.name, username)
-        assert_equal(user.fullname, fullname)
-        assert_equal(user.email, email)
-        assert user.password
-
-    def test_user_create_no_name(self):
-        # create/register user
-        password = u'testpassword'
-
-        offset = url_for(controller='user', action='register')
-        res = self.app.get(offset, status=200)
-        main_res = self.main_div(res)
-        assert 'Register' in main_res, main_res
-        fv = res.forms['user-edit']
-        fv['password1'] = password
-        fv['password2'] = password
-        res = fv.submit('save')
-        assert res.status == 200, res
-        main_res = self.main_div(res)
-        assert 'Name: Missing value' in main_res, main_res
-
-    def test_user_create_bad_name(self):
-        # create/register user
-        username = u'%%%%%%' # characters not allowed
-        password = 'testpass'
-
-        offset = url_for(controller='user', action='register')
-        res = self.app.get(offset, status=200)
-        main_res = self.main_div(res)
-        assert 'Register' in main_res, main_res
-        fv = res.forms['user-edit']
-        fv['name'] = username
-        fv['password1'] = password
-        fv['password2'] = password
-        res = fv.submit('save')
-        assert res.status == 200, res
-        main_res = self.main_div(res)
-        assert 'The form contains invalid entries' in main_res, main_res
-        assert 'Url must be purely lowercase alphanumeric' in main_res
-        self.check_named_element(main_res, 'input', 'name="name"', 'value="%s"' % username)
-
-    def test_user_create_existing_name(self):
-        # create/register user
-        username = u'annafan'
-        password = 'testpass'
-
-        offset = url_for(controller='user', action='register')
-        res = self.app.get(offset, status=200)
-        main_res = self.main_div(res)
-        assert 'Register' in main_res, main_res
-        fv = res.forms['user-edit']
-        fv['name'] = username
-        fv['password1'] = password
-        fv['password2'] = password
-        res = fv.submit('save')
-        assert res.status == 200, res
-        main_res = self.main_div(res)
-        assert 'The form contains invalid entries' in main_res, main_res
-        assert 'That login name is not available' in main_res
-        self.check_named_element(main_res, 'input', 'name="name"', 'value="%s"' % username)
-
-    def test_user_create_bad_password(self):
-        # create/register user
-        username = 'testcreate2'
-        password = u'a' # too short
-
-        offset = url_for(controller='user', action='register')
-        res = self.app.get(offset, status=200)
-        main_res = self.main_div(res)
-        assert 'Register' in main_res, main_res
-        fv = res.forms['user-edit']
-        fv['name'] = username
-        fv['password1'] = password
-        fv['password2'] = password
-        res = fv.submit('save')
-        assert res.status == 200, res
-        main_res = self.main_div(res)
-        assert 'password must be 4 characters or longer' in main_res, main_res
-        self.check_named_element(main_res, 'input', 'name="name"', 'value="%s"' % username)
-
-    def test_user_create_without_password(self):
-        # create/register user
-        username = 'testcreate3'
-        user = model.User.by_name(unicode(username))
-
-        offset = url_for(controller='user', action='register')
-        res = self.app.get(offset, status=200)
-        main_res = self.main_div(res)
-        assert 'Register' in main_res, main_res
-        fv = res.forms['user-edit']
-        fv['name'] = username
-        # no password
-        res = fv.submit('save')
-        assert res.status == 200, res
-        main_res = self.main_div(res)
-        assert 'Password: Please enter both passwords' in main_res, main_res
-        self.check_named_element(main_res, 'input', 'name="name"', 'value="%s"' % username)
-
-    def test_user_create_only_one_password(self):
-        # create/register user
-        username = 'testcreate4'
-        password = u'testpassword'
-        user = model.User.by_name(unicode(username))
-
-        offset = url_for(controller='user', action='register')
-        res = self.app.get(offset, status=200)
-        main_res = self.main_div(res)
-        assert 'Register' in main_res, main_res
-        fv = res.forms['user-edit']
-        fv['name'] = username
-        fv['password1'] = password
-        # Only password1
-        res = fv.submit('save')
-        assert res.status == 200, res
-        main_res = self.main_div(res)
-        assert 'Password: Please enter both passwords' in main_res, main_res
-        self.check_named_element(main_res, 'input', 'name="name"', 'value="%s"' % username)
-
-    def test_user_create_invalid_password(self):
-        # create/register user
-        username = 'testcreate4'
-        password = u'tes' # Too short
-        user = model.User.by_name(unicode(username))
-
-        offset = url_for(controller='user', action='register')
-        res = self.app.get(offset, status=200)
-        main_res = self.main_div(res)
-        assert 'Register' in main_res, main_res
-        fv = res.forms['user-edit']
-        fv['name'] = username
-        fv['password1'] = password
-        fv['password2'] = password
-        res = fv.submit('save')
-        assert res.status == 200, res
-        main_res = self.main_div(res)
-        assert 'Password: Your password must be 4 characters or longer' in main_res, main_res
-        self.check_named_element(main_res, 'input', 'name="name"', 'value="%s"' % username)
-
-    def test_user_create_missing_parameters(self):
-        # create/register user
-        username = 'testcreate4'
-        user = model.User.by_name(unicode(username))
-        password = u'testpassword'
-
-        offset = url_for(controller='user', action='register')
-        res = self.app.get(offset, status=200)
-        main_res = self.main_div(res)
-        assert 'Register' in main_res, main_res
-        fv = res.forms['user-edit']
-        fv['name'] = username
-        fv['password1'] = password
-        fv['password2'] = password
-        del fv.fields['email']
-        res = fv.submit('save')
-        assert "Errors in form" in res.body
-        assert "Email: Missing value" in res.body
-
-    def test_user_edit(self):
-        # create user
-        username = 'testedit'
-        about = u'Test About'
-        user = model.User.by_name(unicode(username))
-        if not user:
-            model.Session.add(model.User(name=unicode(username), about=about,
-                email=u'me@test.org',
-                password='letmein'))
-            model.repo.commit_and_remove()
-            user = model.User.by_name(unicode(username))
-        rev_id_before_test = model.repo.youngest_revision().id
-
-        # edit
-        new_about = u'Changed about'
-        new_password = u'testpass'
-        new_openid = u'http://mynewopenid.com/'
-        offset = url_for(controller='user', action='edit', id=user.id)
-        res = self.app.get(offset, status=200, extra_environ={'REMOTE_USER':username})
-        main_res = self.main_div(res)
-        assert 'Edit User: ' in main_res, main_res
-        assert about in main_res, main_res
-        fv = res.forms['user-edit']
-        fv['about'] = new_about
-        fv['openid'] = new_openid
-        fv['password1'] = new_password
-        fv['password2'] = new_password
-
-        # commit
-        res = fv.submit('save', extra_environ={'REMOTE_USER':username})
-        assert res.status == 302, self.main_div(res).encode('utf8')
-        res = res.follow()
-        main_res = self.main_div(res)
-        assert 'testedit' in main_res, main_res
-        assert new_about in main_res, main_res
-
-        updated_user = model.User.by_name(unicode(username))
-        assert_equal(updated_user.openid, new_openid)
-
-        # read, not logged in
-        offset = url_for(controller='user', action='read', id=user.id)
-        res = self.app.get(offset, status=200)
-        main_res = self.main_div(res)
-        assert new_about in main_res, main_res
-
-        # no revision should be created - User is not revisioned
-        rev_id_after_test = model.repo.youngest_revision().id
-        assert_equal(rev_id_before_test, rev_id_after_test)
-
-    def test_user_edit_no_password(self):
-        # create user
-        username = 'testedit2'
-        about = u'Test About'
-        user = model.User.by_name(unicode(username))
-        if not user:
-            model.Session.add(model.User(name=unicode(username), about=about,
-                email=u'me@test.org',
-                password='letmein'))
-            model.repo.commit_and_remove()
-            user = model.User.by_name(unicode(username))
-
-        old_password = user.password
-
-        # edit
-        new_about = u'Changed about'
-        offset = url_for(controller='user', action='edit', id=user.id)
-        res = self.app.get(offset, status=200, extra_environ={'REMOTE_USER':username})
-        main_res = self.main_div(res)
-        assert 'Edit User: ' in main_res, main_res
-        assert about in main_res, main_res
-        fv = res.forms['user-edit']
-        fv['about'] = new_about
-        fv['password1'] = ''
-        fv['password2'] = ''
-
-        # commit
-        res = fv.submit('save', extra_environ={'REMOTE_USER':username})
-        assert res.status == 302, self.main_div(res).encode('utf8')
-        res = res.follow()
-        main_res = self.main_div(res)
-        assert 'testedit2' in main_res, main_res
-        assert new_about in main_res, main_res
-
-        # read, not logged in
-        offset = url_for(controller='user', action='read', id=user.id)
-        res = self.app.get(offset, status=200)
-        main_res = self.main_div(res)
-        assert new_about in main_res, main_res
-
-        updated_user = model.User.by_name(unicode(username))
-        new_password = updated_user.password
-
-        # Ensure password has not changed
-        assert old_password == new_password
-
-    def test_user_edit_no_name(self):
-        # create user
-        username = 'testedit3'
-        about = u'Test About'
-        user = model.User.by_name(unicode(username))
-        if not user:
-            model.Session.add(model.User(name=unicode(username), about=about,
-                email=u'me@test.org',
-                password='letmein'))
-            model.repo.commit_and_remove()
-            user = model.User.by_name(unicode(username))
-
-        old_password = user.password
-
-        # edit
-        offset = url_for(controller='user', action='edit', id=user.id)
-        res = self.app.get(offset, status=200, extra_environ={'REMOTE_USER':username})
-        main_res = self.main_div(res)
-        assert 'Edit User: ' in main_res, main_res
-        fv = res.forms['user-edit']
-        fv['name'] = ''
-
-        # commit
-        res = fv.submit('save', extra_environ={'REMOTE_USER':username})
-        assert res.status == 200
-        main_res = self.main_div(res)
-        assert 'Name: Missing value' in main_res, main_res
-
-    def test_user_edit_existing_user_name(self):
-        # create user
-        username = 'testedit3'
-        about = u'Test About'
-        user = model.User.by_name(unicode(username))
-        if not user:
-            model.Session.add(model.User(name=unicode(username), about=about,
-                email=u'me@test.org',
-                password='letmein'))
-            model.repo.commit_and_remove()
-            user = model.User.by_name(unicode(username))
-
-        # edit
-        offset = url_for(controller='user', action='edit', id=user.id)
-        res = self.app.get(offset, status=200, extra_environ={'REMOTE_USER':username})
-        main_res = self.main_div(res)
-        assert 'Edit User: ' in main_res, main_res
-        fv = res.forms['user-edit']
-        fv['name'] = 'annafan'
-
-        # commit
-        res = fv.submit('save', extra_environ={'REMOTE_USER':username})
-        assert res.status == 200
-        main_res = self.main_div(res)
-        assert 'Name: That login name is not available' in main_res, main_res
 
     def test_user_edit_no_user(self):
         offset = url_for(controller='user', action='edit', id=None)
@@ -815,37 +127,6 @@ def test_user_edit_not_logged_in(self):
         offset = url_for(controller='user', action='edit', id=username)
         res = self.app.get(offset, status=302)
 
-    def test_edit_spammer(self):
-        # create user
-        username = 'testeditspam'
-        about = u'Test About <a href="http://spamsite.net">spamsite</a>'
-        user = model.User.by_name(unicode(username))
-        if not user:
-            model.Session.add(model.User(name=unicode(username), about=about,
-                                         password='letmein'))
-            model.repo.commit_and_remove()
-            user = model.User.by_name(unicode(username))
-
-        # edit
-        offset = url_for(controller='user', action='edit', id=user.id)
-        res = self.app.get(offset, status=200, extra_environ={'REMOTE_USER':username})
-        main_res = self.main_div(res)
-        assert 'Edit User: ' in main_res, main_res
-        assert 'Test About &lt;a href="http://spamsite.net"&gt;spamsite&lt;/a&gt;' in main_res, main_res
-        fv = res.forms['user-edit']
-        # commit
-        res = fv.submit('save', extra_environ={'REMOTE_USER':username})
-        assert res.status == 200, res.status
-        main_res = self.main_div(res)
-        assert 'looks like spam' in main_res, main_res
-        assert 'Edit User: ' in main_res, main_res
-
-    def test_login_openid_error(self):
-        # comes back as a params like this:
-        # e.g. /user/login?error=Error%20in%20discovery:%20Error%20fetching%20XRDS%20document:%20(6,%20%22Couldn't%20resolve%20host%20'mysite.myopenid.com'%22)
-        res = self.app.get("/user/login?error=Error%20in%20discovery:%20Error%20fetching%20XRDS%20document:%20(6,%20%22Couldn't%20resolve%20host%20'mysite.myopenid.com'%22")
-        assert "Couldn&#39;t resolve host" in res, res
-
     def _login_openid(self, res):
         # this requires a valid account on some openid provider
         # (or for us to stub an open_id provider ...)
@@ -866,66 +147,6 @@ def _login_openid(self, res):
         # but for some reason this does not work ...
         return res
 
-    def test_request_reset_user_password_link_user_incorrect(self):
-        offset = url_for(controller='user',
-                         action='request_reset')
-        res = self.app.get(offset)
-        fv = res.forms['user-password-reset']
-        fv['user'] = 'unknown'
-        res = fv.submit()
-        assert 'No such user: unknown' in res, res # error
-
-    def test_request_reset_user_password_using_search(self):
-        offset = url_for(controller='user',
-                         action='request_reset')
-        CreateTestData.create_user(name='larry1', fullname='kittens')
-        CreateTestData.create_user(name='larry2', fullname='kittens')
-        res = self.app.get(offset)
-        fv = res.forms['user-password-reset']
-        fv['user'] = 'kittens'
-        res = fv.submit()
-        assert '&#34;kittens&#34; matched several users' in res, res
-        assert 'larry1' not in res, res
-        assert 'larry2' not in res, res
-
-        res = self.app.get(offset)
-        fv = res.forms['user-password-reset']
-        fv['user'] = ''
-        res = fv.submit()
-        assert 'No such user:' in res, res
-
-        res = self.app.get(offset)
-        fv = res.forms['user-password-reset']
-        fv['user'] = 'l'
-        res = fv.submit()
-        assert 'No such user:' in res, res
-
-    def test_reset_user_password_link(self):
-        # Set password
-        CreateTestData.create_user(name='bob', email='bob@bob.net', password='test1')
-
-        # Set password to something new
-        model.User.by_name(u'bob').password = 'test2'
-        model.repo.commit_and_remove()
-        test2_encoded = model.User.by_name(u'bob').password
-        assert test2_encoded != 'test2'
-        assert model.User.by_name(u'bob').password == test2_encoded
-
-        # Click link from reset password email
-        create_reset_key(model.User.by_name(u'bob'))
-        reset_password_link = get_reset_link(model.User.by_name(u'bob'))
-        offset = reset_password_link.replace('http://test.ckan.net', '')
-        res = self.app.get(offset)
-
-        # Reset password form
-        fv = res.forms['user-reset']
-        fv['password1'] = 'test1'
-        fv['password2'] = 'test1'
-        res = fv.submit('save', status=302)
-
-        # Check a new password is stored
-        assert model.User.by_name(u'bob').password != test2_encoded
-
     def test_perform_reset_user_password_link_key_incorrect(self):
         CreateTestData.create_user(name='jack', password='test1')
         # Make up a key - i.e. trying to hack this
diff --git a/ckan/tests/test_coding_standards.py b/ckan/tests/test_coding_standards.py
index 4f9e9f0b70f..7c6aebbebd3 100644
--- a/ckan/tests/test_coding_standards.py
+++ b/ckan/tests/test_coding_standards.py
@@ -583,7 +583,6 @@ class TestPep8(object):
         'ckan/tests/functional/test_admin.py',
         'ckan/tests/functional/test_cors.py',
         'ckan/tests/functional/test_error.py',
-        'ckan/tests/functional/test_follow.py',
         'ckan/tests/functional/test_home.py',
         'ckan/tests/functional/test_package.py',
         'ckan/tests/functional/test_package_relationships.py',
diff --git a/ckanext/multilingual/tests/test_multilingual_plugin.py b/ckanext/multilingual/tests/test_multilingual_plugin.py
index 88041b54d59..ab2738e6b4a 100644
--- a/ckanext/multilingual/tests/test_multilingual_plugin.py
+++ b/ckanext/multilingual/tests/test_multilingual_plugin.py
@@ -60,78 +60,6 @@ def teardown(cls):
         ckan.model.repo.rebuild_db()
         ckan.lib.search.clear()
 
-    def test_dataset_read_translation(self):
-        '''Test the translation of dataset view pages by the
-        multilingual_dataset plugin.
-
-        '''
-        # Fetch the dataset view page for a number of different languages and
-        # test for the presence of translated and not translated terms.
-        offset = routes.url_for(
-            controller='package', action='read', id='annakarenina')
-        for (lang_code, translations) in (
-                ('de', _create_test_data.german_translations),
-                ('fr', _create_test_data.french_translations),
-                ('en', _create_test_data.english_translations),
-                ('pl', {})):
-            response = self.app.get(offset, status=200,
-                                    extra_environ={'CKAN_LANG': lang_code,
-                                                   'CKAN_CURRENT_URL': offset})
-            terms = ('A Novel By Tolstoy',
-                     'Index of the novel',
-                     'russian',
-                     'tolstoy',
-                     "Dave's books",
-                     "Roger's books",
-                     'romantic novel',
-                     'book',
-                     '123',
-                     '456',
-                     '789',
-                     'plain text',)
-            for term in terms:
-                if term in translations:
-                    assert translations[term] in response
-                elif term in _create_test_data.english_translations:
-                    assert (_create_test_data.english_translations[term]
-                            in response)
-                else:
-                    assert term in response
-            for tag_name in ('123', '456', '789', 'russian', 'tolstoy'):
-                assert '<a href="/tag/%s">' % tag_name in response
-            for group_name in ('david', 'roger'):
-                assert '<a href="/group/%s">' % group_name in response
-            assert 'this should not be rendered' not in response
-
-    def test_tag_read_translation(self):
-        '''Test the translation of tag view pages by the multilingual_tag
-        plugin.
-
-        '''
-        for tag_name in ('123', '456', '789', 'russian', 'tolstoy'):
-            offset = routes.url_for(
-                controller='tag', action='read', id=tag_name)
-            for (lang_code, translations) in (
-                    ('de', _create_test_data.german_translations),
-                    ('fr', _create_test_data.french_translations),
-                    ('en', _create_test_data.english_translations),
-                    ('pl', {})):
-                response = self.app.get(
-                    offset,
-                    status=200,
-                    extra_environ={'CKAN_LANG': lang_code,
-                                   'CKAN_CURRENT_URL': offset})
-                terms = ('A Novel By Tolstoy', tag_name, 'plain text', 'json')
-                for term in terms:
-                    if term in translations:
-                        assert translations[term] in response
-                    elif term in _create_test_data.english_translations:
-                        assert (_create_test_data.english_translations[term]
-                                in response)
-                    else:
-                        assert term in response
-                assert 'this should not be rendered' not in response
-
     def test_user_read_translation(self):
         '''Test the translation of datasets on user view pages by the
         multilingual_dataset plugin.
@@ -161,36 +89,6 @@ def test_user_read_translation(self):
                         assert term in response
                 assert 'this should not be rendered' not in response
 
-    def test_group_read_translation(self):
-        for (lang_code, translations) in (
-                ('de', _create_test_data.german_translations),
-                ('fr', _create_test_data.french_translations),
-                ('en', _create_test_data.english_translations),
-                ('pl', {})):
-            offset = '/%s/group/roger' % lang_code
-            response = self.app.get(offset, status=200)
-            terms = ('A Novel By Tolstoy',
-                     'Index of the novel',
-                     'russian',
-                     'tolstoy',
-                     "Roger's books",
-                     '123',
-                     '456',
-                     '789',
-                     'plain text',
-                     'Roger likes these books.',)
-            for term in terms:
-                if term in translations:
-                    assert translations[term] in response
-                elif term in _create_test_data.english_translations:
-                    assert (_create_test_data.english_translations[term]
-                            in response)
-                else:
-                    assert term in response
-            for tag_name in ('123', '456', '789', 'russian', 'tolstoy'):
-                assert '%s?tags=%s' % (offset, tag_name) in response
-            assert 'this should not be rendered' not in response
-
     def test_org_read_translation(self):
         for (lang_code, translations) in (
                 ('de', _create_test_data.german_translations),
@@ -213,57 +111,6 @@ def test_org_read_translation(self):
                     assert term in response
             assert 'this should not be rendered' not in response
 
-    def test_dataset_index_translation(self):
-        for (lang_code, translations) in (
-                ('de', _create_test_data.german_translations),
-                ('fr', _create_test_data.french_translations),
-                ('en', _create_test_data.english_translations),
-                ('pl', {})):
-            offset = '/%s/dataset' % lang_code
-            response = self.app.get(offset, status=200)
-            for term in ('Index of the novel', 'russian', 'tolstoy',
-                         "Dave's books", "Roger's books", 'plain text'):
-                if term in translations:
-                    assert translations[term] in response
-                elif term in _create_test_data.english_translations:
-                    assert (_create_test_data.english_translations[term]
-                            in response)
-                else:
-                    assert term in response
-            for tag_name in ('123', '456', '789', 'russian', 'tolstoy'):
-                assert ('/%s/dataset?tags=%s' % (lang_code, tag_name)
-                        in response)
-            for group_name in ('david', 'roger'):
-                assert ('/%s/dataset?groups=%s' % (lang_code, group_name)
-                        in response)
-            assert 'this should not be rendered' not in response
-
-    def test_group_index_translation(self):
-        for (lang_code, translations) in (
-                ('de', _create_test_data.german_translations),
-                ('fr', _create_test_data.french_translations),
-                ('en', _create_test_data.english_translations),
-                ('pl', {})):
-            offset = '/%s/group' % lang_code
-            response = self.app.get(offset, status=200)
-            terms = (
-                "Dave's books",
-                "Roger's books",
-                'Roger likes these books.',
-                "These are books that David likes.",
-            )
-            for term in terms:
-                if term in translations:
-                    assert translations[term] in response
-                elif term in _create_test_data.english_translations:
-                    assert (_create_test_data.english_translations[term]
-                            in response)
-                else:
-                    assert term in response
-            for group_name in ('david', 'roger'):
-                assert '/%s/group/%s' % (lang_code, group_name) in response
-            assert 'this should not be rendered' not in response
-
     def test_org_index_translation(self):
         for (lang_code, translations) in (
                 ('de', _create_test_data.german_translations),
@@ -284,32 +131,6 @@ def test_org_index_translation(self):
                     in response)
             assert 'this should not be rendered' not in response
 
-    def test_tag_index_translation(self):
-        for (lang_code, translations) in (
-                ('de', _create_test_data.german_translations),
-                ('fr', _create_test_data.french_translations),
-                ('en', _create_test_data.english_translations),
-                ('pl', {})):
-            offset = '/%s/tag' % lang_code
-            response = self.app.get(offset, status=200)
-            terms = (
-                "123",
-                "456",
-                '789',
-                "russian",
-                "tolstoy",
-            )
-            for term in terms:
-                if term in translations:
-                    assert translations[term] in response
-                elif term in _create_test_data.english_translations:
-                    assert (_create_test_data.english_translations[term]
-                            in response)
-                else:
-                    assert term in response
-                assert '/%s/tag/%s' % (lang_code, term) in response
-            assert 'this should not be rendered' not in response
-
 
 class TestDatasetSearchIndex():
 
diff --git a/ckanext/stats/tests/test_stats_plugin.py b/ckanext/stats/tests/test_stats_plugin.py
index c95114330e2..d79781366ea 100644
--- a/ckanext/stats/tests/test_stats_plugin.py
+++ b/ckanext/stats/tests/test_stats_plugin.py
@@ -13,14 +13,3 @@ def test_01_config(self):
             'public')
         assert paths.startswith(publicdir), (publicdir, paths)
 
-    def test_02_index(self):
-        url = url_for('stats')
-        out = self.app.get(url)
-        assert 'Total number of Datasets' in out, out
-        assert 'Most Edited Datasets' in out, out
-
-    def test_03_leaderboard(self):
-        url = url_for('stats_action', action='leaderboard')
-        out = self.app.get(url)
-        assert 'Leaderboard' in out, out
-
diff --git a/doc/maintaining/paster.rst b/doc/maintaining/paster.rst
index e10688c156e..653565f839b 100644
--- a/doc/maintaining/paster.rst
+++ b/doc/maintaining/paster.rst
@@ -49,6 +49,17 @@ examples below, this option can be given as ``-c`` for short.
 to execute. Most commands have their own subcommands and options. For example,
 to print out a list of all of your CKAN site's users do:
 
+.. note::
+
+  You may also specify the location of your config file using the CKAN_INI
+  environment variable. You will no longer need to use --config= or -c= to
+  tell paster where the config file is:
+
+  .. parsed-literal::
+
+     export CKAN_INI=\ |development.ini|
+
+
 .. parsed-literal::
 
    paster user list -c |development.ini|
diff --git a/requirements.in b/requirements.in
index 496ee97266e..970cddb3b41 100644
--- a/requirements.in
+++ b/requirements.in
@@ -17,7 +17,7 @@ python-dateutil>=1.5.0,<2.0.0
 pyutilib.component.core==4.5.3
 repoze.who-friendlyform==1.0.8
 repoze.who.plugins.openid==0.5.3
-repoze.who==1.0.19
+repoze.who==2.0
 requests==2.3.0
 Routes==1.13
 solrpy==0.9.5
diff --git a/requirements.txt b/requirements.txt
index a8aa7d6079a..b87a30ac995 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -31,7 +31,7 @@ python-dateutil==1.5
 python-openid==2.2.5
 pyutilib.component.core==4.5.3
 repoze.lru==0.6
-repoze.who==1.0.19
+repoze.who==2.0
 repoze.who-friendlyform==1.0.8
 repoze.who.plugins.openid==0.5.3
 requests==2.3.0