Removal old Southampton/Reading/Lichfield cobrands.

59 files changed, 59 insertions, 1560 deletions

diff --git a/perllib/FixMyStreet/Cobrand/LichfieldDC.pm b/perllib/FixMyStreet/Cobrand/LichfieldDC.pm
deleted file mode 100644
index a2eb1a859..000000000
--- a/perllib/FixMyStreet/Cobrand/LichfieldDC.pm
+++ /dev/null
@@ -1,40 +0,0 @@
-package FixMyStreet::Cobrand::LichfieldDC;
-use base 'FixMyStreet::Cobrand::UKCouncils';
-
-use strict;
-use warnings;
-
-sub council_id { return 2434; }
-sub council_area { return 'Lichfield district'; }
-sub council_name { return 'Lichfield District Council'; }
-sub council_url { return 'lichfielddc'; }
-sub is_two_tier { return 1; }
-
-# Different to councils parent due to this being a two-tier council. If we get
-# more, this can be genericised in the parent.
-sub problems_clause {
-    return { bodies_str => { like => '%2434%' } };
-}
-
-sub path_to_web_templates {
-    my $self = shift;
-    return [ FixMyStreet->path_to( 'templates/web', $self->moniker )->stringify ];
-}
-
-# FIXME - need to double check this is all correct
-sub disambiguate_location {
-    my $self = shift;
-    return {
-        %{ $self->SUPER::disambiguate_location() },
-        centre => '52.688198,-1.804966',
-        span   => '0.1196,0.218675',
-        bounds => [ 52.584891, -1.963232, 52.807793, -1.586291 ],
-    };
-}
-
-sub map_type {
-    return 'OSM';
-}
-
-1;
-
diff --git a/perllib/FixMyStreet/Cobrand/Reading.pm b/perllib/FixMyStreet/Cobrand/Reading.pm
deleted file mode 100644
index 462006532..000000000
--- a/perllib/FixMyStreet/Cobrand/Reading.pm
+++ /dev/null
@@ -1,58 +0,0 @@
-package FixMyStreet::Cobrand::Reading;
-use base 'FixMyStreet::Cobrand::UKCouncils';
-
-use strict;
-use warnings;
-
-use Carp;
-
-sub council_id { return 2596; }
-sub council_area { return 'Reading'; }
-sub council_name { return 'Reading City Council'; }
-sub council_url { return 'reading'; }
-
-sub path_to_web_templates {
-    my $self = shift;
-    return [ FixMyStreet->path_to( 'templates/web', $self->moniker )->stringify ];
-}
-
-sub disambiguate_location {
-    my $self = shift;
-    return {
-        %{ $self->SUPER::disambiguate_location() },
-        town   => 'Reading',
-        centre => '51.452983,-0.983827',
-        span   => '0.083355,0.1245',
-        bounds => [ 51.409779, -1.052994, 51.493134, -0.928494 ],
-    };
-}
-
-sub get_report_stats {
-    my $self = shift;
-
-    my ( $cobrand, $main_site ) = ( 0, 0 );
-
-    $self->{c}->log->debug( 'X' x 60 );
-    my $stats = $self->{c}->model('DB::Problem')->search(
-        { confirmed => { '>=', '2011-11-01' } },
-        {
-            select   => [ { count => 'id', -as => 'cobrand_count' }, 'cobrand' ],
-            group_by => [qw/cobrand/]
-        }
-    );
-
-    while ( my $stat = $stats->next ) {
-        if ( $stat->cobrand eq $self->moniker ) {
-            $cobrand += $stat->get_column( 'cobrand_count' );
-        } else {
-            $main_site += $stat->get_column( 'cobrand_count' );
-        }
-    }
-
-    return {
-        cobrand     => $cobrand,
-        main_site   => $main_site,
-    };
-}
-
-1;
diff --git a/perllib/FixMyStreet/Cobrand/Southampton.pm b/perllib/FixMyStreet/Cobrand/Southampton.pm
deleted file mode 100644
index cebe1a07e..000000000
--- a/perllib/FixMyStreet/Cobrand/Southampton.pm
+++ /dev/null
@@ -1,31 +0,0 @@
-package FixMyStreet::Cobrand::Southampton;
-use base 'FixMyStreet::Cobrand::UKCouncils';
-
-use strict;
-use warnings;
-
-sub council_id { return 2567; }
-sub council_area { return 'Southampton'; }
-sub council_name { return 'Southampton City Council'; }
-sub council_url { return 'southampton'; }
-
-sub path_to_web_templates {
-    my $self = shift;
-    return [ FixMyStreet->path_to( 'templates/web', $self->moniker )->stringify ];
-}
-
-sub disambiguate_location {
-    my $self = shift;
-    return {
-        %{ $self->SUPER::disambiguate_location() },
-        town   => 'Southampton',
-        centre => '50.913822,-1.400493',
-        span   => '0.084628,0.15701',
-        bounds => [ 50.871508, -1.478998, 50.956136, -1.321988 ],
-    };
-}
-
-sub send_questionnaires { return 0; }
-
-1;
-
diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t
index 10b8c5869..79072bcfe 100644
--- a/t/app/controller/report_new.t
+++ b/t/app/controller/report_new.t
@@ -44,8 +44,8 @@ for my $body (
     { id => 2226, name => 'Gloucestershire County Council' },
     { id => 2326, name => 'Cheltenham Borough Council' },
     { id => 2482, name => 'Bromley Council' },
-    { id => 2240, name => 'Staffordshire County Council' },
-    { id => 2434, name => 'Lichfield District Council' },
+    { id => 2227, name => 'Hampshire County Council' },
+    { id => 2333, name => 'Hart Council' },
     { id => 2504, name => 'Westminster City Council' },
 ) {
     $mech->create_body_ok($body->{id}, $body->{name});
@@ -87,13 +87,13 @@ my $contact5 = FixMyStreet::App->model('DB::Contact')->find_or_create( {
 } );
 my $contact6 = FixMyStreet::App->model('DB::Contact')->find_or_create( {
     %contact_params,
-    body_id => 2434, # Lichfield
+    body_id => 2333, # Hart
     category => 'Trees',
     email => 'trees@example.com',
 } );
 my $contact7 = FixMyStreet::App->model('DB::Contact')->find_or_create( {
     %contact_params,
-    body_id => 2240, # Lichfield
+    body_id => 2227, # Hampshire
     category => 'Street lighting',
     email => 'highways@example.com',
 } );
@@ -1204,53 +1204,53 @@ subtest 'user title not reset if no user title in submission' => sub {
         is $user->title, 'MR', 'User title unchanged';
 };
 
-subtest "test Lichfield" => sub {
+subtest "test Hart" => sub {
     for my $test (
         {
             desc      => 'confirm link for cobrand council in two tier cobrand links to cobrand site',
             category  => 'Trees',
-            council   => 2434,
+            council   => 2333,
             national  => 0,
             button    => 'submit_register',
         },
           {
             desc      => 'confirm link for non cobrand council in two tier cobrand links to national site',
             category  => 'Street Lighting',
-            council   => 2240,
+            council   => 2227,
             national  => 1,
             button    => 'submit_register',
           },
           {
             desc      => 'confirm redirect for cobrand council in two tier cobrand redirects to cobrand site',
             category  => 'Trees',
-            council   => 2434,
+            council   => 2333,
             national  => 0,
             redirect  => 1,
           },
           {
             desc      => 'confirm redirect for non cobrand council in two tier cobrand redirect to national site',
             category  => 'Street Lighting',
-            council   => 2240,
+            council   => 2227,
             national  => 1,
             redirect  => 1,
           },
     ) {
         subtest $test->{ desc } => sub {
             my $test_email = 'test-22@example.com';
-            $mech->host( 'lichfielddc.fixmystreet.com' );
+            $mech->host( 'hart.fixmystreet.com' );
             $mech->clear_emails_ok;
             $mech->log_out_ok;
 
             my $user = $mech->log_in_ok($test_email) if $test->{redirect};
 
             FixMyStreet::override_config {
-                ALLOWED_COBRANDS => [ 'lichfielddc', 'fixmystreet' ],
+                ALLOWED_COBRANDS => [ 'hart', 'fixmystreet' ],
                 BASE_URL => 'http://www.fixmystreet.com',
                 MAPIT_URL => 'http://mapit.mysociety.org/',
             }, sub {
                 $mech->get_ok('/around');
-                $mech->content_contains( "Lichfield District Council FixMyStreet" );
-                $mech->submit_form_ok( { with_fields => { pc => 'WS13 7RD' } }, "submit location" );
+                $mech->content_contains( "Hart Council" );
+                $mech->submit_form_ok( { with_fields => { pc => 'GU51 4AE' } }, "submit location" );
                 $mech->follow_link_ok( { text_regex => qr/skip this step/i, }, "follow 'skip this step' link" );
                 my %optional_fields = $test->{redirect} ?  () :
                     ( email => $test_email, phone => '07903 123 456' );
@@ -1292,7 +1292,7 @@ subtest "test Lichfield" => sub {
             if ( $test->{redirect} ) {
                 is $mech->uri->path, "/report/" . $report->id, "redirected to report page";
                 my $base = 'www.fixmystreet.com';
-                $base = "lichfielddc.fixmystreet.com" unless $test->{national};
+                $base = "hart.fixmystreet.com" unless $test->{national};
                 is $mech->uri->host, $base, 'redirected to correct site';
             } else {
                 # receive token
@@ -1305,21 +1305,21 @@ subtest "test Lichfield" => sub {
 
                 # confirm token
                 FixMyStreet::override_config {
-                    ALLOWED_COBRANDS => [ 'lichfielddc', 'fixmystreet' ],
+                    ALLOWED_COBRANDS => [ 'hart', 'fixmystreet' ],
                     BASE_URL => 'http://www.fixmystreet.com',
                 }, sub {
                     $mech->get_ok($url);
                 };
 
                 my $base = 'www.fixmystreet.com';
-                $base = 'lichfielddc.fixmystreet.com' unless $test->{national};
+                $base = 'hart.fixmystreet.com' unless $test->{national};
                 $mech->content_contains( $base . '/report/' .
                     $report->id, 'confirm page links to correct site' );
 
                 if ( $test->{national} ) {
                     # Shouldn't be found, as it was a county problem
                     FixMyStreet::override_config {
-                        ALLOWED_COBRANDS => [ 'lichfielddc', 'fixmystreet' ],
+                        ALLOWED_COBRANDS => [ 'hart', 'fixmystreet' ],
                     }, sub {
                         is $mech->get( '/report/' . $report->id )->code, 404, "report not found";
                     };
@@ -1328,7 +1328,7 @@ subtest "test Lichfield" => sub {
                     $mech->host( 'www.fixmystreet.com' );
                 }
                 FixMyStreet::override_config {
-                    ALLOWED_COBRANDS => [ 'lichfielddc', 'fixmystreet' ],
+                    ALLOWED_COBRANDS => [ 'hart', 'fixmystreet' ],
                 }, sub {
                     $mech->get_ok( '/report/' . $report->id );
                 };
diff --git a/t/app/controller/rss.t b/t/app/controller/rss.t
index bafa1ddc0..ae1c0d193 100644
--- a/t/app/controller/rss.t
+++ b/t/app/controller/rss.t
@@ -130,9 +130,9 @@ $report->delete();
 my $now = DateTime->now();
 my $report_to_council = FixMyStreet::App->model('DB::Problem')->find_or_create(
     {
-        postcode           => 'WS13 6YY',
-        bodies_str         => '2434',
-        areas              => ',2434,2240,',
+        postcode           => 'GU51 4AE',
+        bodies_str         => '2333',
+        areas              => ',2333,2227,',
         category           => 'Other',
         title              => 'council report',
         detail             => 'Test 2 Detail',
@@ -146,17 +146,17 @@ my $report_to_council = FixMyStreet::App->model('DB::Problem')->find_or_create(
         cobrand            => 'default',
         cobrand_data       => '',
         send_questionnaire => 't',
-        latitude           => '52.727588',
-        longitude          => '-1.731322',
+        latitude           => '51.279616',
+        longitude          => '-0.846040',
         user_id            => $user1->id,
     }
 );
 
 my $report_to_county_council = FixMyStreet::App->model('DB::Problem')->find_or_create(
     {
-        postcode           => 'WS13 6YY',
-        bodies_str         => '2240',
-        areas              => ',2434,2240,',
+        postcode           => 'GU51 4AE',
+        bodies_str         => '2227',
+        areas              => ',2333,2227,',
         category           => 'Other',
         title              => 'county report',
         detail             => 'Test 2 Detail',
@@ -170,23 +170,23 @@ my $report_to_county_council = FixMyStreet::App->model('DB::Problem')->find_or_c
         cobrand            => 'default',
         cobrand_data       => '',
         send_questionnaire => 't',
-        latitude           => '52.727588',
-        longitude          => '-1.731322',
+        latitude           => '51.279616',
+        longitude          => '-0.846040',
         user_id            => $user1->id,
     }
 );
 
 subtest "check RSS feeds on cobrand have correct URLs for non-cobrand reports" => sub {
-    $mech->host('lichfielddc.fixmystreet.com');
+    $mech->host('hart.fixmystreet.com');
     my $expected1 = mySociety::Config::get('BASE_URL') . '/report/' . $report_to_county_council->id;
     my $expected2;
 
     FixMyStreet::override_config {
-        ALLOWED_COBRANDS => [ 'lichfielddc' ],
+        ALLOWED_COBRANDS => [ 'hart' ],
         MAPIT_URL => 'http://mapit.mysociety.org/',
     }, sub {
-        $mech->get_ok("/rss/area/Lichfield");
-        my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker('lichfielddc')->new();
+        $mech->get_ok("/rss/area/Hart");
+        my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker('hart')->new();
         $expected2 = $cobrand->base_url . '/report/' . $report_to_council->id;
     };
 
diff --git a/t/app/model/alert_type.t b/t/app/model/alert_type.t
index ae413978f..5b7494a04 100644
--- a/t/app/model/alert_type.t
+++ b/t/app/model/alert_type.t
@@ -348,7 +348,7 @@ my $ward_alert = FixMyStreet::App->model('DB::Alert')->find_or_create(
         alert_type => 'area_problems',
         whensubscribed => $dt->ymd . ' ' . $dt->hms,
         confirmed => 1,
-        cobrand => 'lichfielddc',
+        cobrand => 'hart',
     }
 );
 
@@ -444,7 +444,7 @@ subtest "check alerts from cobrand send main site url for alerts for different c
 
     my $expected1 = mySociety::Config::get('BASE_URL') . '/report/' . $report_to_county_council->id;
     my $expected3 = mySociety::Config::get('BASE_URL') . '/report/' . $report_outside_district->id;
-    my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker('lichfielddc')->new();
+    my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker('hart')->new();
     my $expected2 = $cobrand->base_url . '/report/' . $report_to_council->id;
 
     like $body, qr#$expected1#, 'non cobrand area report point to fixmystreet.com';
@@ -460,7 +460,7 @@ my $local_alert = FixMyStreet::App->model('DB::Alert')->find_or_create(
         parameter2 => 52.727588,
         alert_type => 'local_problems',
         whensubscribed => $dt->ymd . ' ' . $dt->hms,
-        cobrand     => 'lichfielddc',
+        cobrand     => 'hart',
         confirmed => 1,
     }
 );
@@ -480,7 +480,7 @@ subtest "check local alerts from cobrand send main site url for alerts for diffe
     my $body = $email->body;
 
     my $expected1 = mySociety::Config::get('BASE_URL') . '/report/' . $report_to_county_council->id;
-    my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker('lichfielddc')->new();
+    my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker('hart')->new();
     my $expected2 = $cobrand->base_url . '/report/' . $report_to_council->id;
 
     like $body, qr#$expected1#, 'non cobrand area report point to fixmystreet.com';
diff --git a/t/app/model/problem.t b/t/app/model/problem.t
index f15d56bfe..96c2771da 100644
--- a/t/app/model/problem.t
+++ b/t/app/model/problem.t
@@ -381,8 +381,8 @@ for my $body (
     { id => 2651, name => 'City of Edinburgh Council' },
     { id => 2226, name => 'Gloucestershire County Council' },
     { id => 2326, name => 'Cheltenham Borough Council' },
-    { id => 2434, name => 'Lichfield District Council' },
-    { id => 2240, name => 'Staffordshire County Council' },
+    { id => 2333, name => 'Hart Council' },
+    { id => 2227, name => 'Hampshire County Council' },
     { id => 14279, name => 'Ballymoney Borough Council' },
     { id => 2636, name => 'Isle of Wight Council' },
     { id => 2649, name => 'Fife Council' },
@@ -405,11 +405,11 @@ for my $contact ( {
     category => 'potholes',
     email => '2326@example.org',
 }, {
-    body_id => 2434, # Lichfield
+    body_id => 2333, # Hart
     category => 'potholes',
     email => 'trees@example.com',
 }, {
-    body_id => 2240, # Staffordshire
+    body_id => 2227, # Hampshire
     category => 'potholes',
     email => 'highways@example.com',
 }, {
@@ -472,20 +472,20 @@ foreach my $test ( {
         desc          => 'email to two tier council that only shows district, district',
         unset_whendef => 1,
         email_count   => 1,
-        to            => qr'Lichfield District Council',
-        dear          => qr'Dear Lichfield District Council,',
-        body          => '2434',
-        cobrand       => 'lichfielddc',
-        url           => 'lichfielddc.',
+        to            => qr'Hart Council',
+        dear          => qr'Dear Hart Council,',
+        body          => '2333',
+        cobrand       => 'hart',
+        url           => 'hart.',
     }, {
         %common,
         desc          => 'email to two tier council that only shows district, county',
         unset_whendef => 1,
         email_count   => 1,
-        to            => qr'Staffordshire County Council" <highways@example',
-        dear          => qr'Dear Staffordshire County Council,',
-        body          => '2240',
-        cobrand       => 'lichfielddc',
+        to            => qr'Hampshire County Council" <highways@example',
+        dear          => qr'Dear Hampshire County Council,',
+        body          => '2227',
+        cobrand       => 'hart',
         url           => 'www.',
     }, {
         %common,
@@ -520,8 +520,8 @@ foreach my $test ( {
             BASE_URL => 'http://www.fixmystreet.com',
             MAPIT_URL => 'http://mapit.mysociety.org/',
         };
-        if ( $test->{cobrand} && $test->{cobrand} =~ /lichfielddc/ ) {
-            $override->{ALLOWED_COBRANDS} = [ 'lichfielddc' ];
+        if ( $test->{cobrand} && $test->{cobrand} =~ /hart/ ) {
+            $override->{ALLOWED_COBRANDS} = [ 'hart' ];
         }
 
         $mech->clear_emails_ok;
diff --git a/t/cobrand/councils.t b/t/cobrand/councils.t
index 0cf25ebdf..0e8b71f04 100644
--- a/t/cobrand/councils.t
+++ b/t/cobrand/councils.t
@@ -5,7 +5,7 @@ use Test::More;
 use FixMyStreet::TestMech;
 my $mech = FixMyStreet::TestMech->new;
 
-foreach my $council (qw/southampton reading bromley/) {
+foreach my $council (qw/oxfordshire bromley/) {
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ $council ],
     }, sub {
diff --git a/templates/email/lichfielddc/site-name.txt b/templates/email/lichfielddc/site-name.txt
deleted file mode 100644
index 97ebd69a3..000000000
--- a/templates/email/lichfielddc/site-name.txt
+++ /dev/null
@@ -1 +0,0 @@
-Lichfield District Council FixMyStreet
diff --git a/templates/email/reading/site-name.txt b/templates/email/reading/site-name.txt
deleted file mode 100644
index a0cf6367c..000000000
--- a/templates/email/reading/site-name.txt
+++ /dev/null
@@ -1 +0,0 @@
-Reading City Council FixMyStreet
diff --git a/templates/email/southampton/site-name.txt b/templates/email/southampton/site-name.txt
deleted file mode 100644
index 48f5deeb3..000000000
--- a/templates/email/southampton/site-name.txt
+++ /dev/null
@@ -1 +0,0 @@
-Southampton City Council FixMyStreet
diff --git a/templates/web/base/faq/faq-en-gb.html b/templates/web/base/faq/faq-en-gb.html
index 57f346d31..fb811e61b 100755
--- a/templates/web/base/faq/faq-en-gb.html
+++ b/templates/web/base/faq/faq-en-gb.html
@@ -17,9 +17,7 @@ or clearing</strong>, such as:
     <li>Flyposting or graffiti
     <li>Flytipping or litter
     <li>Streetcleaning, such as broken glass in a cycle lane
-    [% IF c.cobrand.moniker != 'southampton' %]
     <li>Unlit lampposts
-    [% END %]
     <li>Potholes
     </ul>
     </dd>
@@ -53,8 +51,8 @@ the problem.</dd>
         <dt>How are the problems solved?</dt>
         <dd>They are reported to the [% IF !c.cobrand.is_council %]relevant[% END %] council by email. The
 council can then resolve the problem the way they normally would.
-Alternatively, you can discuss the problem on the website with others[% IF c.cobrand.moniker != 'southampton' %], and
-then together lobby the council to fix it, or fix it directly yourselves[% END %].</dd>
+Alternatively, you can discuss the problem on the website with others, and
+then together lobby the council to fix it, or fix it directly yourselves.</dd>
         <dt>Is it free?</dt>
         <dd>The site is free to use, yes. FixMyStreet is run
 by a registered charity, though, so if you want to make a contribution, <a
diff --git a/templates/web/base/index.html b/templates/web/base/index.html
index 37bdd8c1e..5b2b73cfe 100644
--- a/templates/web/base/index.html
+++ b/templates/web/base/index.html
@@ -6,10 +6,7 @@
 
 <p id="expl">        
     [% 
-        subhead
-            = c.cobrand.moniker == 'southampton'
-            ? ''
-            : loc('(like graffiti, fly tipping, broken paving slabs, or street lighting)');
+        subhead = loc('(like graffiti, fly tipping, broken paving slabs, or street lighting)');
     %]
     <strong>[% loc('Report, view, or discuss local problems') %]</strong>
     [% IF subhead != ' ' %]
diff --git a/templates/web/base/questionnaire/index.html b/templates/web/base/questionnaire/index.html
index 6783bca57..5b48f8915 100644
--- a/templates/web/base/questionnaire/index.html
+++ b/templates/web/base/questionnaire/index.html
@@ -80,13 +80,9 @@ href="http://www.emptyhomes.com/getinvolved/campaign.html">http://www.emptyhomes
 </p>
 [% END %]
 
-[% IF c.cobrand.moniker == 'southampton' %]
-<p>Add a public update (please note it will not be sent to the council)</p>
-[% ELSE %]
 <p>[% loc('If you wish to leave a public update on the problem, please enter it here
 (please note it will not be sent to the council). For example, what was
 your experience of getting the problem fixed?') %]</p>
-[% END %]
 
 <p><textarea name="update" style="max-width:90%" rows="7" cols="30">[% update | html %]</textarea></p>
 
diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html
index 0124052c0..87fef5408 100644
--- a/templates/web/base/report/_main.html
+++ b/templates/web/base/report/_main.html
@@ -12,12 +12,7 @@
     </em></p>
     [% INCLUDE 'report/_support.html' %]
 
-    [% IF c.cobrand.moniker == 'southampton' %]
-        [% add_links( problem.detail ) | html_para %]
-        [% INCLUDE 'report/photo.html' object=problem %]
-    [% ELSE %]
-        [% INCLUDE 'report/photo.html' object=problem %]
-        [% add_links( problem.detail ) | html_para %]
-    [% END %]
+    [% INCLUDE 'report/photo.html' object=problem %]
+    [% add_links( problem.detail ) | html_para %]
 
 </div>
diff --git a/templates/web/fixmystreet/faq/faq-en-gb.html b/templates/web/fixmystreet/faq/faq-en-gb.html
index 2c13123be..b45144df0 100755
--- a/templates/web/fixmystreet/faq/faq-en-gb.html
+++ b/templates/web/fixmystreet/faq/faq-en-gb.html
@@ -31,9 +31,7 @@ or clearing</strong>, such as:
     <li>Flyposting or graffiti
     <li>Flytipping or litter
     <li>Streetcleaning, such as broken glass in a cycle lane
-    [% IF c.cobrand.moniker != 'southampton' %]
     <li>Unlit lampposts
-    [% END %]
     <li>Potholes
     </ul>
     </dd>
@@ -67,8 +65,8 @@ the problem.</dd>
         <dt>How are the problems solved?</dt>
         <dd>They are reported to the [% IF !c.cobrand.is_council %]relevant[% END %] council by email. The
 council can then resolve the problem the way they normally would.
-Alternatively, you can discuss the problem on the website with others[% IF c.cobrand.moniker != 'southampton' %], and
-then together lobby the council to fix it, or fix it directly yourselves[% END %].</dd>
+Alternatively, you can discuss the problem on the website with others, and
+then together lobby the council to fix it, or fix it directly yourselves.</dd>
         <dt>Is it free?</dt>
         <dd>The site is free to use, yes. FixMyStreet is run
 by a registered charity, though, so if you want to make a contribution, <a
diff --git a/templates/web/lichfielddc/around/extra_text.html b/templates/web/lichfielddc/around/extra_text.html
deleted file mode 100644
index 7f3fa0dbf..000000000
--- a/templates/web/lichfielddc/around/extra_text.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<p>
-<strong>
-This is primarily for reporting physical problems that can be fixed like graffiti, cleansing issues or road defects. To report other kinds of problems like missed bins use our <a href="http://www.lichfielddc.gov.uk/reportitother">online report it forms</a>.
-</strong>
-</p>
diff --git a/templates/web/lichfielddc/footer.html b/templates/web/lichfielddc/footer.html
deleted file mode 100644
index 58099193b..000000000
--- a/templates/web/lichfielddc/footer.html
+++ /dev/null
@@ -1,84 +0,0 @@
-
-			</div><!-- End content -->
-			
-	<br class="clear" />
-	</div>
-
-		</div>
-		<br class="clear" />
-		<br class="clear" /> 
-</div><!-- end of page_wrap --> 
-	<ul class="contactbox"> 
-		<li class="taxonomy"> 
-			<h2>Browse council information on…</h2> 
-			<ul> 
-			<li><a href="http://www.lichfielddc.gov.uk/site/scripts/documents.php?categoryID=100001">Advice and benefits</a></li> 
-			<li><a href="http://www.lichfielddc.gov.uk/site/scripts/documents.php?categoryID=100002">Business</a></li> 
-			<li><a href="http://www.lichfielddc.gov.uk/site/scripts/documents.php?categoryID=100003">Community and living</a></li> 
-			<li><a href="http://www.lichfielddc.gov.uk/site/scripts/documents.php?categoryID=100004">Council and democracy</a></li> 
-			<li><a href="http://www.lichfielddc.gov.uk/site/scripts/documents.php?categoryID=100005">Education and learning</a></li> 
-			<li><a href="http://www.lichfielddc.gov.uk/site/scripts/documents.php?categoryID=100006">Environment and planning</a></li> 
-			<li><a href="http://www.lichfielddc.gov.uk/site/scripts/documents.php?categoryID=100007">Housing</a></li> 
-			<li><a href="http://www.lichfielddc.gov.uk/site/scripts/documents.php?categoryID=100008">Jobs and careers</a></li> 
-			<li><a href="http://www.lichfielddc.gov.uk/site/scripts/documents.php?categoryID=100009">Leisure and culture</a></li> 
-			<li><a href="http://www.lichfielddc.gov.uk/site/scripts/documents.php?categoryID=100010">Health and social care</a></li> 
-			<li><a href="http://www.lichfielddc.gov.uk/site/scripts/documents.php?categoryID=100011">Transport and streets</a></li> 
-			</ul> 
-		</li> 
-		<li class="contact card"> 
-			<a href="http://www.lichfielddc.gov.uk/site/scripts/location.php"><img src="http://www.lichfielddc.gov.uk/site/images/map.gif" alt="" /></a> 
-			<h2>Get in touch or visit…</h2> 
-			<ul> 
-				<li><a href="http://www.lichfielddc.gov.uk/site/custom_scripts/feedback2.php">Your feedback or comments</a></li> 
-				<li><a href="http://www.lichfielddc.gov.uk/site/scripts/faqs_ask.php">Ask a question about our services</a></li> 
-				<li><a href="http://www.lichfielddc.gov.uk/site/scripts/location.php">Our location and travel details</a></li> 
-			</ul> 
-			<p class="fn councilName">Lichfield District Council</p> 
-			<p class="phone tel">Phone our call centre: <span>01543 308 000</span></p> 
-			<p class="add">District Council House, Frog Lane, Lichfield, Staffs, WS13 6YY</p> 
-		</li> 
-		<li class="focus"> 
-			<h2>Our focus and priorities…</h2> 
-			<ul> 
-				<li><h3><a href="http://www.lichfielddc.gov.uk/people">Centred on people</a></h3> 
-				<a href="http://www.lichfielddc.gov.uk/people"><img src="http://www.lichfielddc.gov.uk/site/images/people.gif" alt="" /></a> 
-				</li> 
-				<li><h3><a href="http://www.lichfielddc.gov.uk/place">Focused on place</a></h3> 
-				<a href="http://www.lichfielddc.gov.uk/place"><img src="http://www.lichfielddc.gov.uk/site/images/place.gif" alt="" /></a> 
-				</li> 
-				<li><h3><a href="http://www.lichfielddc.gov.uk/improvement">Delivering through improvement</a></h3> 
-				<a href="http://www.lichfielddc.gov.uk/improvement"><img src="http://www.lichfielddc.gov.uk/site/images/improvement.gif" alt="" /></a> 
-				</li> 
-			</ul> 
-		</li> 
-	</ul><!-- end contact box --> 
-	<div id="footer"> 
-	<img src="http://www.lichfielddc.gov.uk/images/3star.png" id="bcstar" alt="We received 3 stars in the Society of IT Managers' annual Better Connected report" /> 
-	<img src="http://www.lichfielddc.gov.uk/site/images/footer-logo.gif" alt="Lichfield District Council" /> 
-	<p class="addNav"><a href="http://www.lichfielddc.gov.uk/site/custom_scripts/mysociety/footer.php?#mast">Jump to the top</a></p> 
-	<p class="addNav"><a href="http://www.lichfielddc.gov.uk/site/scripts/terms.php">Terms and Disclaimer</a> - <a href="http://www.lichfielddc.gov.uk/site/scripts/accessibility.php">Accessibility Statement</a> - <a href="http://www.lichfielddc.gov.uk/site/scripts/website_statistics.php">Websites statistics</a> - <a accesskey="3" href="http://www.lichfielddc.gov.uk/site/scripts/site_map.php">Site map</a> - Lichfield District Council &copy; 2011</p> 
- 
-	<p class="addNav">Made with <a href="http://validator.w3.org/">XHTML</a> and <a href="http://jigsaw.w3.org/css-validator/">CSS</a> to <a href="http://www.w3.org/WAI/WCAG1AA-Conformance">WAI-AA</a>. <a href="http://www.icra.org">ICRA</a> rated. Powered by Jadu <a href="http://www.jadu.co.uk" >Content Management</a>.</p> 
-	
-	<p class="addNav"><a href="http://www.direct.gov.uk">www.direct.gov.uk</a> - A Beacon Authority</p> 
- 
-<p class="hidden"> 
-	<a accesskey="1" href="http://www.lichfielddc.gov.uk">Homepage</a> / 
-	<a accesskey="2" href="http://www.lichfielddc.gov.uk/site/scripts/whats_new_index.php">Whats new </a> / 
-	<a accesskey="3" href="http://www.lichfielddc.gov.uk/site/scripts/site_map.php">Site map</a> / 
-	<a accesskey="4" href="http://www.lichfielddc.gov.uk/site/scripts/search_index.php">Search facility </a> / 
-	<a accesskey="5" href="http://www.lichfielddc.gov.uk/site/scripts/faqs_index.php">Frequently asked questions</a> / 
-	<a accesskey="7" href="http://www.lichfielddc.gov.uk/site/scripts/contact.php">Complaints procedure (Contacting the Council page)</a> / 
-	<a accesskey="8" href="http://www.lichfielddc.gov.uk/site/scripts/terms.php">Terms and Privacy</a> / 
-	<a accesskey="9" href="http://www.lichfielddc.gov.uk/site/scripts/feedback.php">Feedback</a> / 
-	<a accesskey="0" href="http://www.lichfielddc.gov.uk/site/scripts/accessibility.php">Access key details</a> / 
-	<a accesskey="/" href="#mast">Top of the page</a> 
-</p> 
- 
- 
-</div>
-</div>
-<!-- #################################### -->
-<script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script><script type="text/javascript"> _uacct = "UA-511839-1"; urchinTracker(); </script> 
-</body>
-</html>
diff --git a/templates/web/lichfielddc/front/news.html b/templates/web/lichfielddc/front/news.html
deleted file mode 100644
index 987c8e58e..000000000
--- a/templates/web/lichfielddc/front/news.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<p class="other-problems">
-This is primarily for reporting physical problems that can be fixed like graffiti, cleansing issues or road defects. To report other kinds of problems like missed bins use our <a href="http://www.lichfielddc.gov.uk/reportitother">online report it forms</a>.
-</p>
diff --git a/templates/web/lichfielddc/header.html b/templates/web/lichfielddc/header.html
deleted file mode 100644
index 02e3c6a5b..000000000
--- a/templates/web/lichfielddc/header.html
+++ /dev/null
@@ -1,213 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--[if lt IE 7]><html class="ie6 oldie" xmlns="http://www.w3.org/1999/xhtml" xml:lang="[% lang_code %]" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 7]>   <html class="ie7 oldie" xmlns="http://www.w3.org/1999/xhtml" xml:lang="[% lang_code %]" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 8]>   <html class="ie8 oldie" xmlns="http://www.w3.org/1999/xhtml" xml:lang="[% lang_code %]" lang="[% lang_code %]"><![endif]-->
-<!--[if gt IE 8]><!--><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="[% lang_code %]" lang="[% lang_code %]"><!--<![endif]-->
-<head>
-
-    <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]">
-	<link rel="stylesheet" type="text/css" href="[% version('/cobrands/lichfielddc/css/layout.css') %]" />
-
-	<link rel="stylesheet" type="text/css" href="http://www.lichfielddc.gov.uk/site/styles/standard_1_.css" media="screen" />
-<link rel="stylesheet" type="text/css" href="http://www.lichfielddc.gov.uk/site/styles/generic/style.php" media="screen" />
-
-<!--[if lte IE 6]>
-	<link rel="stylesheet" type="text/css" href="http://www.lichfielddc.gov.uk/site/styles/generic/ie_special.css" media="screen" />
-	<link rel="stylesheet" type="text/css" href="http://www.lichfielddc.gov.uk/site/styles/generic/ie_special_print.css" media="print" />
-<![endif]-->
-<!--[if IE 7]>
- <link rel="stylesheet" type="text/css" href="http://www.lichfielddc.gov.uk/site/styles/generic/ie-seven.css" media="screen" />
-<![endif]-->		
-
-<link rel="stylesheet" type="text/css" href="http://www.lichfielddc.gov.uk/site/styles/generic/print.css" media="print" />
-<link rel="stylesheet" type="text/css" href="http://www.lichfielddc.gov.uk/site/styles/generic/handheld.css" media="handheld" />
-
-<link rel="Shortcut Icon" type="image/x-icon" href="http://www.lichfielddc.gov.uk/site/favicon.ico" />
-<link rel="ToC" href="http://www.lichfielddc.gov.uk/site/scripts/site_map.php" />
-
-		<link rel="search" type="application/opensearchdescription+xml" href="http://www.lichfielddc.gov.uk/openSearch.php" title="Lichfield District Council" />
-
-	<!-- general metadata -->
-	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-	<meta http-equiv="content-language" content="en" />
-	<meta name="generator" content="http://www.jadu.co.uk" />
-	<meta name="robots" content="index,follow" />
-	<meta name="revisit-after" content="2 days" />
-	<meta name="Author-Template" content="Jadu CSS design" />
-	<meta name="Author" content="Lichfield District Council" />
-	<meta name="Publisher" content="Lichfield District Council, District Council House, Frog Lane, Lichfield, Staffordshire. WS13 6YY" />
-	<meta name="Publisher-Email" content="webmaster@lichfielddc.gov.uk" />
-	<meta name="Coverage" content="Worldwide" />
-	
-	<!-- ICRA PICS label -->
-	<link rel="meta" href="http://www.lichfielddc.gov.uk/labels.rdf" type="application/rdf+xml" title="ICRA labels" />	
-	<!-- Dublin Core Metadata -->
-	<meta name="DC.creator" lang="en" content="Lichfield District Council" />
-	<meta name="DC.date.created" lang="en" content="PARAM_DATE" />
-	<meta name="DC.format" lang="en" content="text/html" />
-	<meta name="DC.language" content="en" />
-	<meta name="DC.publisher" lang="en" content="Lichfield District Council, District Council House, Frog Lane, Lichfield, Staffordshire. WS13 6YY" />
-	<meta name="DC.rights.copyright" lang="en" content="Copyright 2010 Lichfield District Council" />
-	<meta name="DC.coverage" lang="en" content="Worldwide" />
-	<meta name="DC.identifier" content="[% c.request.base %]" />
-
-	<!-- eGMS Metadata -->
-	<meta name="eGMS.status" lang="en" content="V1.0 Public Consumption" />
-	<meta name="eGMS.accessibility" scheme="WCAG" content="Double-A" />
-	
-	<!-- javascript -->
-	<script type="text/javascript" src="http://www.lichfielddc.gov.uk/site/javascript/prototype.js"></script>
-	<script type="text/javascript" src="http://www.lichfielddc.gov.uk/site/javascript/scriptaculous.js"></script>
-	<script type="text/javascript" src="http://www.lichfielddc.gov.uk/site/custom_scripts/lightbox/js/lightbox.js"></script>
-	<script type="text/javascript" src="http://www.lichfielddc.gov.uk/site/javascript/global.js"></script>
-
-
-	<meta name="Keywords" content="home, homepage, index, root, Lichfield, UK, England, local authority, council, local government, services, citizen, councillor, community, leisure, tourist, tourism, social services, education, environment, fire, emergency planning, road safety, transport, motorways, library, libraries, archive, public record, record office, parish councils, county councillors" />
-	<meta name="Description" content="Lichfield District Council: FixMyStreet" />
-
-	<meta name="DC.title" lang="en" content="Lichfield District Council: FixMyStreet" />
-	<meta name="DC.description" lang="en" content="Lichfield District Council: FixMyStreet" />
-
-	<meta name="DC.subject" lang="en" scheme="eGMS.IPSV" content="Local government;Government, politics and public administration" />
-	<meta name="DC.subject" lang="en" content="Council, government and democracy" />
-	
-[% INCLUDE 'common_header_tags.html', site_title = 'Lichfield District Council FixMyStreet' %]
-</head>
-<body>
-<!-- ########## MAIN STRUCTURE ######### -->
-<div id="container">
-<div id="mobile_name">Lichfield District Council</div>
-<div id="mast">
-	<p class="skip">
-		<a accesskey="s" title="Skip to page content, access key S" href="[% c.req.url %]#main" rel="nofollow">Jump to content</a> - 
-		<a accesskey="n" title="Skip to main navigation, access key N" href="[% c.req.url %]#main-nav" rel="nofollow">Jump to navigation</a> - 
-		
-		<a class="access" title="Change font size, colour and contrast of this site" href="http://www.lichfielddc.gov.uk/site/scripts/user_settings.php">Accessibility Settings</a> 
-	</p>
-	<!--<form action="http://www.lichfielddc.gov.uk/site/scripts/search_results.php" method="get" id="search">
-		<fieldset><a title="Create a specific detailed search" href="http://www.lichfielddc.gov.uk/site/scripts/search_index.php">Need help finding something?</a>
-		<label for="SearchSite">Search this site</label>
-		<input type="text" size="18" maxlength="40" class="field" name="searchQuery" id="SearchSite" value="" />
-		<input type="submit" value="Search" class="button" /></fieldset>
-	</form>-->
-	<form action="http://www.lichfielddc.gov.uk/site/scripts/google_results.php" method="get" name="search" id="search">
-		<fieldset><a title="Create a specific detailed search" href="http://www.lichfielddc.gov.uk/site/scripts/search_index.php">Need help finding something?</a>
-		<label for="SearchSite">Search this site</label>
-        <input type="text" name="q" size="18" maxlength="40" class="field" id="SearchSite" value="What are you looking for?" style="colour:#666;"/>
-        <input type="hidden" name="output" value="xml"/>
-        <input type="hidden" name="as_sitesearch" value="lichfielddc.gov.uk"/>
-        <input type="submit" value="Search" class="button" /></fieldset>
-	</form>
-	<div class="pseudoH1">
-		<a href="http://www.lichfielddc.gov.uk/site/index.php"><span>Lichfield District Council</span></a>
-	</div>			
-	
-	<p class="about">
-	Making it easy to <a href="http://www.lichfielddc.gov.uk/site/scripts/az_home.php" class="tt">access council services</a>, <a href="http://www.lichfielddc.gov.uk/reportit" class="tt">report problems</a> in your area, view <a href="http://www.lichfielddc.gov.uk/planning" class="tt">planning applications</a>, find out <a href="http://www.lichfielddc.gov.uk/whatsgoingon" class="tt">what's going on locally</a>, <a href="http://www.lichfielddc.gov.uk/voiceit" class="tt">have your say</a> on local issues, and much more.
-	</p>
-	
-	<a name="main-nav"></a>
-	<h2>Navigation</h2>
-	<ul>
-		<li><a href="http://www.lichfielddc.gov.uk" title="View the home page">Home</a></li>
-		<li><a href="http://www.lichfielddc.gov.uk/site/scripts/az_home.php">A-Z of services</a></li>
-		<li><a href="http://www.lichfielddc.gov.uk/site/scripts/documents_index.php">Council services</a></li>
-		<li><a href="http://www.lichfielddc.gov.uk/site/custom_scripts/newsblogindex.php">News</a></li>
-		<li><a href="http://www.lichfielddc.gov.uk/site/scripts/contact.php">Contacts</a></li>
-		<li><a href="http://www.lichfielddc.gov.uk/site/scripts/location.php">Opening hours and location</a></li>
-		<li><a href="http://www.lichfielddc.gov.uk/site/custom_scripts/myareasearch.php" id="myarea">My area</a>
-		</li>
-		<li><a href="http://www.lichfielddc.gov.uk/site/custom_scripts/map.php" >Online map</a></li>
-		<!-- <li class="sign-in"><a href="http://www.lichfielddc.gov.uk/site/index.php?sign_in=true">Sign-in</a> or <a href="http://www.lichfielddc.gov.uk/site/scripts/register.php">Register</a></li> -->
-		<li class="sign-in">
-		 
-			<a href="http://www.lichfielddc.gov.uk/site/index.php?sign_in=true">Sign in</a> or
-				
-		 
-			<a href="http://www.lichfielddc.gov.uk/site/scripts/register.php">Register</a>
-				</li>
-
-	</ul><!-- end navigation -->
-	<!--
-	<span id="postcode box" style="display: none;">
-<form action="http://www.lichfielddc.gov.uk/site/custom_scripts/myarea.php" method="get" id="pcodeform">
-<label for="postcode">Your Postcode: </label><input name="postcode" id="postcode" class="text" /> <input value="Go!" name="submit" class="button" type="submit" />
-</form>
-</span> -->
-	
-	
-	<div class="clear"></div>
-</div>
-
-<div id="suggest"></div>
-<script type="text/javascript" src="http://www.lichfielddc.gov.uk/site/javascript/effects.js"></script>
-<script type="text/javascript">
-	new Ajax.Autocompleter('SearchSite', 'suggest', 'http://www.lichfielddc.gov.uk/site/custom_scripts/autocomplete.php', {
-	paramName: 'search',
-	minChars: 1,
-	afterUpdateElement : goTo
-	});
-	
-	function goTo(text, li) {
-	var url = li.title;
-	window.location = url;
-	}
-
-$('SearchSite').onfocus = function() {
-   if (this._cleared) return
-   this.clear()
-   this.style.color = '#000'
-   this._cleared = true
- }
-
-	
-/*	document.observe("dom:loaded", function() {
-		Event.observe($('my area'), 'click', function(event) {
-		$('postcodebox').appear();
-		event.stop(event);
-		});
-	}); */
-	</script>	<div id="page_wrap">
-		<div id="mainContent">
-			<div id="content">
-				<a name="main"></a>
-
-    [% IF c.user_exists %]
-    <ul class="user">
-        <li>[% tprintf(loc('Signed in as %s'), c.user.name || c.user.email) %] - <a href="/auth/sign_out">[% loc('Sign out') %]</a></li>
-    </ul>
-    [% END %]
-                <!-- BREAD CRUMB NAVIGATION -->
-
-                 <!-- Breadcrumb --><!-- googleoff:all -->
-                            <ul id="breadcrumb">
-                                <li><a href="http://www.lichfielddc.gov.uk/site/">Home</a></li><li><a href="[% c.req.base %]">FixMyStreet</a></li>
-                                <li class="bc_end">
-                                [% SWITCH c.req.uri.path %]Report a problem
-                                [% CASE '/' %]Report a problem
-                                [% CASE '/reports/Lichfield' %]All reports
-                                [% CASE '/my' %]Your reports
-                                [% CASE '/alert' %]Local alerts
-                                [% CASE '/faq' %]Help
-                                [% CASE '/contact' %]Contact
-                                [% CASE '/around' %]Viewing a location
-                                [% CASE '/report/new' %]Reporting a problem
-                                [% CASE '/auth' %]Sign in
-                                [% CASE '/auth/sign_out' %]Signed out
-                                [% CASE DEFAULT %] [% IF c.req.uri.path.substr(0, 8 ) == '/report/' %][% problem.title %] - Viewing a problem[% END %]
-                                [% END %]
-                                </li></ul>
-
-                            <!-- END Breadcrumb --><!-- googleon:all -->
-                    <!-- END BREAD CRUMB -->
-
-<ul id="nav">
-    <li class="section"><a href="/">Report a problem</a></li>
-    <li class="section"><a href="/reports/Lichfield">All reports</a></li>
-    <li class="section"><a href="/my">Your reports</a></li>
-    <li class="section"><a href="/alert">Local alerts</a></li>
-    <li class="section"><a href="/faq">Help</a></li>
-    <li class="section"><a href="/contact">Contact</a></li>
-</ul>
-              <div id="mysociety">
-
diff --git a/templates/web/reading/footer.html b/templates/web/reading/footer.html
deleted file mode 100644
index ec523aa97..000000000
--- a/templates/web/reading/footer.html
+++ /dev/null
@@ -1,47 +0,0 @@
-</div>
-</div>
-
-<h2 class="v">[% loc('Navigation') %]</h2>
-<ul id="navigation">
-<li><a href="/">[% loc("Report a problem") %]</a></li>
-<li id="nav_new"><a href="/my">[% loc("Your reports") %]</a></li>
-<li><a href="/reports/Reading">[% loc("All reports") %]</a></li>
-<li><a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]">[% loc("Local alerts") %]</a></li>
-<li><a href="/faq">[% loc("Help") %]</a></li>
-</ul>
-
-		<div style="clear:both"></div>
-	</div>
-	<div class="footer">
-		<div class="contact">
-			<p class="title">Contact</p>
-			<address>
-				Reading Borough Council<br />
-				Civic Centre<br />
-				Reading<br />
-				RG1 7AE
-			</address>	
-			<div class="phone">
-				<p>Phone: 0118 937 3737<br />Text: 81722</p>
-			</div>
-		</div>
-		<div class="clear"></div>
-	</div>
-	</div>
-
-<!-- START OF eVisitAnalyst CODE -->
-<script language="JavaScript" type="text/javascript">
-var ID_section_15243615 = "";//Place section here.
-var ID_tt_15243615 = "t";
-var ID_uid_15243615 = "23137";
-</script>
-<script src="http://extra.evisitanalyst.com/eva.js" type="text/javascript"></script>
-<script src="http://extra.evisitanalyst.com/tag/evatrackclick.js" type="text/javascript"></script>
-<noscript>
-    <img src="http://extra.evisitanalyst.com/eva51/collect/?userid=23137&tt=t"
-    border="0" alt="eVisit" width="1" height="1">
-</noscript>
-<!-- END OF eVisitAnalyst CODE -->
-
-</body>
-</html>
diff --git a/templates/web/reading/header.html b/templates/web/reading/header.html
deleted file mode 100644
index 23bafd726..000000000
--- a/templates/web/reading/header.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!doctype html>
-<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 7]>   <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 8]>   <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if gt IE 8]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]-->
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head id="ctl00_pageHead">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-	<title>Reading Borough Council | FixMyStreet</title>
-    <link rel="shortcut icon" href="[% version('/cobrands/reading/images/favicon.ico') %]">
-    <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]">
-    <link rel="stylesheet" type="text/css" href="[% version('/cobrands/reading/css/reading.css') %]" />
-    <link rel="stylesheet" type="text/css" href="[% version('/cobrands/reading/css/print3rdParty.css') %]" media="print"/>
-    <link rel="stylesheet" type="text/css" href="[% version('/cobrands/reading/css.css') %]" />
-
-    [% INCLUDE 'common_header_tags.html', site_title = 'Reading City Council FixMyStreet' %]
-
-</head>
-<body>
-	<div class="wrapper">
-	<div class="header" id="header">
-		<p id="reading-logo" class="thirdParty"><img src="/cobrands/reading/images/reading-borough-council-logo.gif" width="176" height="38" alt="reading borough council logo" class="printMe" /><a href="http://www.reading.gov.uk/" title="Click to return to home page">Reading Borough Council</a></p>
-	</div>
-	
-	<div id="content">		
-		<div class="thirdParty">
-        <!-- end of header -->
-
-        <ul id="meta">
-            [% IF c.user_exists %]
-                <li>[% tprintf(loc('Signed in as %s'), c.user.name || c.user.email) %]
-                <li><a href="/auth/sign_out">[% loc('Sign out') %]</a></li>
-            [% ELSE %]
-                <li>&nbsp;</li>
-            [% END %]
-        </ul>
-
-        <div id="wrapper"><div id="mysociety">
diff --git a/templates/web/reading/reports/cobrand_stats.html b/templates/web/reading/reports/cobrand_stats.html
deleted file mode 100644
index 381e4f5af..000000000
--- a/templates/web/reading/reports/cobrand_stats.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<ul>
-    <li>Reports submitted via <a href="[% uri_for('/') %]">reading.fixmystreet.com</a>: [% stats.cobrand %]</li>
-    <li>Reports submitted via <a href="https://www.fixmystreet.com/">www.fixmystreet.com</a>: [% stats.main_site %]<br /><br />
-    Statistics date from launch of Reading FixMyStreet.</li>
-</ul>
diff --git a/templates/web/southampton/footer.html b/templates/web/southampton/footer.html
deleted file mode 100644
index dac5d9c1a..000000000
--- a/templates/web/southampton/footer.html
+++ /dev/null
@@ -1,25 +0,0 @@
-		</div>
-        </div>
-
-		<!-- End of main content area -->
-
-		
-
-		<!-- Start of footer -->
-
-		<div id="footer">
-			<a href="http://www.southampton.gov.uk/council-partners/accesstoinfo/" class="accessInfo"><img alt="Access to Information" src="/cobrands/southampton/accessInfo.gif" /></a>
-			<ul id="bottomMenu">
-				<li><a href="http://www.southampton.gov.uk/tools/copyright.aspx">Copyright &copy; Southampton City Council 2009</a>|</li>
-				<li><a href="http://www.southampton.gov.uk/tools/privacypolicy.aspx">Privacy</a>|</li>
-				<li><a href="http://www.southampton.gov.uk/tools/disclaimer.aspx">Disclaimer</a>|</li>
-				<li><a href="http://www.southampton.gov.uk/tools/sitestats.aspx">Site Statistics</a>|</li>
-				<li><a href="http://www.southampton.gov.uk/living/emergency-planning/">Emergencies</a></li>
-			</ul>
-		</div>
-
-		<!-- End of footer -->
-
-	</div>
-</body>
-</html>
diff --git a/templates/web/southampton/front/news.html b/templates/web/southampton/front/news.html
deleted file mode 100644
index 79d51542c..000000000
--- a/templates/web/southampton/front/news.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="news">
-<p>Fix My Street is for reporting non-urgent, local problems like graffiti, fly
-tipping, or broken paving slabs; reports will be reviewed within 48 working
-hours.</p>
-
-<p>If you are reporting an urgent or dangerous matter, for example a fallen
-tree or a very deep pot hole that may cause damage, please contact us
-directly on 023 8083 3008</p>
-</div>
diff --git a/templates/web/southampton/header.html b/templates/web/southampton/header.html
deleted file mode 100644
index 54f8ee2a8..000000000
--- a/templates/web/southampton/header.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!--[if lt IE 7]><html class="ie6 oldie" xmlns="http://www.w3.org/1999/xhtml" xml:lang="[% lang_code %]" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 7]>   <html class="ie7 oldie" xmlns="http://www.w3.org/1999/xhtml" xml:lang="[% lang_code %]" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 8]>   <html class="ie8 oldie" xmlns="http://www.w3.org/1999/xhtml" xml:lang="[% lang_code %]" lang="[% lang_code %]"><![endif]-->
-<!--[if gt IE 8]><!--><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="[% lang_code %]" lang="[% lang_code %]"><!--<![endif]-->
-<head>
-    <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]">
-	<link rel="stylesheet" type="text/css" href="[% version('/cobrands/southampton/css/style.css') %]" />
-	<link rel="stylesheet" type="text/css" href="[% version('/cobrands/southampton/css.css') %]" />
-
-    [% INCLUDE 'common_header_tags.html', site_title = 'Southampton City Council FixMyStreet' %]
-    <script type="text/javascript" src="[% version('/js/southampton.js') %]"></script>
-
-</head>
-<body>
-	<ul id="topMenu">
-		<li><a href="/#content">Skip to content</a>|</li>
-		<li><a href="http://www.southampton.gov.uk/tools/accesskeys.aspx">Access keys</a>|</li>
-		<li><a href="http://www.southampton.gov.uk/tools/accessibility.aspx">Accessibility Information</a>|</li>
-		<li><a href="http://app.readspeaker.com/proreader/proreader.php?cid=5386&amp;lang=en_uk&amp;url=http://www.southampton.gov.uk" class="listen" onclick='window.open(this.href+"&amp;selhtml="+escape(selectedString), "prwin", "width=190, height=120, resizable=1, scrollbars=1, screenX=0, screenY=0, left=0, top=0"); return false;'>Listen</a>|</li>
-		<li><a href="http://www.southampton.gov.uk/tools/help.aspx">Site help</a>|</li>
-		<li><a href="http://www.southampton.gov.uk/tools/sitemap.aspx">Site map</a></li>
-	</ul>
-	<div id="wrapper">
-
-		<!-- Start of header -->
-
-		<div id="header">
-			<img class="logo" alt="Southampton City Council Logo" src="/cobrands/southampton/SCClogo.png" />
-			<a class="siteTitle" href="http://www.southampton.gov.uk">Southampton City Council</a>
-			<div id="searchWrap">
-				<form id="frmSearch" method="get" action="http://websearch.southampton.gov.uk/search">
-					<fieldset>
-						<label for="searchbox">Search the site<br /></label>
-						<input class="text" type="text" value="" placeholder="Enter keywords" id="searchbox" name="q"/>
-	                            		<input type="hidden" id="site" name="site" value="SouthamptonOnline"/>
-			 			<input type="hidden" id="client" name="client" value="SouthamptonOnline"/>
-			 			<input type="hidden" id="proxystylesheet" name="proxystylesheet" value="SouthamptonOnline"/>
-			 			<input type="hidden" id="output" name="output" value="xml_no_dtd"/>
-						<input class="button" type="submit" value="search" />
-					</fieldset>
-	            </form>
-				<form id="whereILive" method="post" action="http://www.southampton.gov.uk/MySoton/default.aspx">
-	                <fieldset>
-						<label for="PostCode">Where I live
-						<img class="moreInfo" src="/cobrands/southampton/information.gif" alt="Find information about where you live" title="Find information about where you live" /><br />
-						</label>								
-						<input id="PostCode" name="Postcode" class="text2" type="text" value="" placeholder="Enter street/postcode" />
-						<input class="button" type="submit" value="go" />
-					</fieldset>
-				</form>
-
-			</div>
-			<ul id="topNav">
-				<li><a href="http://www.southampton.gov.uk/online/">Do it online</a></li>
-				<li><a href="http://www.southampton.gov.uk/customer-service/">Customer Services</a></li>
-				<li><a href="http://www.southampton.gov.uk/business/">Business</a></li>
-				<li><a href="http://www.southampton.gov.uk/s-environment/">Environment</a></li>
-				<li><a href="http://www.southampton.gov.uk/learning/">Learning</a></li>
-				<li><a href="http://www.southampton.gov.uk/s-leisure/">Leisure</a></li>
-				<li><a href="http://www.southampton.gov.uk/living/">Living</a></li>
-				<li><a href="http://www.southampton.gov.uk/council-partners/">Council/Partners</a></li>
-				<li><a href="http://www.southampton.gov.uk/news-events/">News and events</a></li>
-				<li><a href="http://www.southampton.gov.uk/visitors/">Visitors</a></li>
-			</ul>
-			<p class="atoz">A-Z of Council Services:</p>
-			<ul id="atoz">
-				<li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=A">A</a></li>
-				<li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=B">B</a></li>
-				<li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=C">C</a></li>
-				<li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=D">D</a></li>
-				<li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=E">E</a></li>
-				<li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=F">F</a></li>
-				<li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=G">G</a></li>
-				<li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=H">H</a></li>
-				<li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=I">I</a></li>
-				<li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=J">J</a></li>
-				<li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=K">K</a></li>
-				<li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=L">L</a></li>
-				<li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=M">M</a></li>
-				<li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=N">N</a></li>
-				<li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=O">O</a></li>
-				<li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=P">P</a></li>
-				<li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=Q">Q</a></li>
-				<li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=R">R</a></li>
-				<li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=S">S</a></li>
-				<li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=T">T</a></li>
-				<li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=U">U</a></li>
-				<li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=V">V</a></li>
-				<li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=W">W</a></li>
-				<li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=X">X</a></li>
-				<li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=Y">Y</a></li>
-				<li><a href="http://www.southampton.gov.uk/atoz/default.aspx?L=Z">Z</a></li>
-			</ul>
-			<ul id="contacts">
-				<li><a href="http://www.southampton.gov.uk/customer-service/contact/">Contact us</a></li>
-				<li><a href="http://map.southampton.gov.uk/gis/">location and maps</a></li>
-			</ul>
-
-		</div>
-
-		<!-- End of header -->
-
-
-		<!-- Start of menu bar -->
-
-		<div id="menuBar">
-			<ul id="leftMenu">
-				<li class="parent"><a href="/">Fix My Street</a></li>
-				<li class="selected"><a href="/">Report a problem</a></li>
-				<li><a href="/reports/Southampton">All reports</a></li>
-				<li><a href="/alerts">Local alerts</a></li>
-				<li><a href="/faq">Help</a></li>
-				<li><a href="http://www.southampton.gov.uk/customer-service/contact/">Contact</a></li>
-			</ul>
-		</div>
-
-
-		<!-- End of menu bar -->
-
-
-		<!-- Start of main content area -->
-
-		<div id="contentArea">
-            <div id="mysociety">
diff --git a/templates/web/southampton/report/new/category.html b/templates/web/southampton/report/new/category.html
deleted file mode 100644
index 0a7703bbb..000000000
--- a/templates/web/southampton/report/new/category.html
+++ /dev/null
@@ -1,11 +0,0 @@
-[% FILTER collapse %]
-[% IF category_options.size %]
-    <label for='form_category'>[% loc('Category') %]</label>
-    <select name='category' id='form_category'>
-        [% FOREACH cat_op IN category_options %]
-        [% NEXT IF cat_op == 'Abandoned vehicles' %]
-        <option value='[% cat_op | html %]'[% ' selected' IF report.category == cat_op %]>[% cat_op | html %]</option>
-        [% END %]
-    </select>
-[% END %]
-[% END -%]
diff --git a/templates/web/southampton/report/new/form_heading.html b/templates/web/southampton/report/new/form_heading.html
deleted file mode 100644
index deeb63e5d..000000000
--- a/templates/web/southampton/report/new/form_heading.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<p>
-<br />
-<strong>Please report only one problem at a time.</strong>
-</p>
diff --git a/templates/web/southampton/tokens/confirm_problem.html b/templates/web/southampton/tokens/confirm_problem.html
deleted file mode 100644
index f6bc2bc6c..000000000
--- a/templates/web/southampton/tokens/confirm_problem.html
+++ /dev/null
@@ -1,14 +0,0 @@
-[% INCLUDE 'header.html', title = loc('Confirmation') %]
-
-<h1>[% loc('Confirmation') %]</h1>
-
-<p class="confirmed">
-Thank you for your report which will be updated as soon as possible.
-You can <a href="[% c.cobrand.base_url_for_report( problem ) %][% problem.url %]">view the problem on this site</a>.
-</p>
-
-<p>Your reference for this problem is [% problem.id %], please quote it in any enquiries.
-
-[% display_crosssell_advert( problem.user.email, problem.name ) %]
-
-[% INCLUDE 'footer.html' %]
diff --git a/web/cobrands/lichfielddc/css/layout.css b/web/cobrands/lichfielddc/css/layout.css
deleted file mode 100644
index 363ab8579..000000000
--- a/web/cobrands/lichfielddc/css/layout.css
+++ /dev/null
@@ -1,170 +0,0 @@
-#mysociety {
-    clear: both;
-}
-
-#mysociety #postcodeForm {
-    padding: 0.8em;
-    background-color: #F3F4F4;
-}
-
-#mysociety .other-problems {
-    margin: 2em 8em 0em 8em;
-    font-weight: bold;
-}
-
-#mysociety #postcodeForm label {
-    float: none;
-    margin-bottom: 5px;
-    width: auto !important;
-}
-
-#mysociety p {
-    margin: 1em 0px;
-    padding: 0px;
-}
-
-#mysociety #update_form {
-    clear: both;
-}
-
-#mysociety #form_sign_in {
-    padding-top: 2em;
-}
-
-#mysociety form label {
-    width: 6em;
-    display: inline;
-    margin-right: 0px;
-}
-
-#mysociety div.checkbox {
-    padding-left: 6.5em;
-}
-
-#mysociety textarea,
-#mysociety input {
-    background-color: #f9f9f1;
-    margin: 4px;
-}
-
-#mysociety #fileupload_normalUI input {
-    background-color: white;
-}
-
-#mysociety input[type='submit']{
-    border: 0px;
-    color: white;
-    padding: 3px;
-    vertical-align: top;
-    font:150%/1.4em "Trebuchet MS", Helvetica, Arial, Sans-serif;
-    background:url(http://www.lichfielddc.gov.uk/site/styles/css_img/nav-bg.png) top repeat-x;
-}
-
-#mysociety #expl small {
-	position: relative;
-	top: 6px !important;
-	}
-
-#mysociety h2 {
-    background: transparent url(http://www.lichfielddc.gov.uk/site/styles/css_img/lilac-dotted-border.png) bottom repeat-x;
-    padding:0 0 7px 0 !important;
-    margin: 22px 0 14px 0 !important;
-    font-size:1.4em;
-	}
-	
-#mysociety #front_stats div {
-	background-color: #f5f5f5;
-	padding: 5px;
-	}
-	
-#mysociety #front_stats {
-	padding: 0 65px;
-	}
-	
-#mysociety #front_stats div big {
-	margin-bottom: 4px;
-	}
-	
-#nav {
-	font-size: 1em;
-	margin: 0 0 30px 0 !important;
-	background: transparent url(/cobrands/lichfielddc/i/bg_header.gif) left repeat-x !important;
-	clear: both;
-	width: 100%;
-	float: left;
-	border: 1px solid #ccc;
-	padding: 0;
-	}	
-
-#nav li {
-	float: left !important;
-	list-style-type: none !important;
-	list-style-image: none !important;
-	border-right: 1px solid #ccc;
-	padding: 0;
-	}
-	
-#nav li a {
-	border: none !important;
-	color: #111;
-	font-weight: bold;
-	padding: 8px 12px !important;
-	display: block;
-	}
-	
-#nav li a:hover {
-	border-bottom: 1px solid #111;
-	background: transparent url(/cobrands/lichfielddc/i/bg_header2.gif) left repeat-x !important;
-	}
-	
-#mysociety #fixed {
-	padding: 5px !important;
-	margin: 70px 0 10px 0 !important;
-	width: 405px;
-	position: relative;
-	top: 7px
-	}
-	
-#mysociety p[style] {
-	border: none !important;
-	}
-	
-#mysociety #updates div {
-	border-bottom: 1px dotted #ccc;
-	padding: 0 0 17px 0;
-	margin: 17px 0 0 0;
-}
-
-#mysociety #updates {
-	margin-bottom: 40px;
-	}
-	
-#mysociety #updates p {
-	margin-bottom: 15px;
-	}
-	
-#map_box ul li p {
-	margin: 0;
-	padding: 0;
-}
-	
-#mysociety input[type='text'], #mysociety input[type='password'], #mysociety input[type='email'] {
-	background: #F9F9F1;
-	border: 1px solid #666 !important;
-	padding: 5px;
-	}
-	
-#mysociety input[type='text']:focus, #mysociety input[type='password']:focus, #mysociety input[type='email']:focus {
-	border:1px solid #000000;
-	outline:2px solid #98339B;
-	}
-
-div#suggest {
-	border: none !important;
-	}
-
-ul.user {
-  list-style-type: none;
-  font-size: 80%;
-  float: right;
-}
diff --git a/web/cobrands/lichfielddc/i/bg_header.gif b/web/cobrands/lichfielddc/i/bg_header.gif
deleted file mode 100644
index e126e5798..000000000
--- a/web/cobrands/lichfielddc/i/bg_header.gif
+++ /dev/null
diff --git a/web/cobrands/lichfielddc/i/bg_header2.gif b/web/cobrands/lichfielddc/i/bg_header2.gif
deleted file mode 100644
index f11508a7f..000000000
--- a/web/cobrands/lichfielddc/i/bg_header2.gif
+++ /dev/null
diff --git a/web/cobrands/reading/css.scss b/web/cobrands/reading/css.scss
deleted file mode 100644
index 96e0fcbba..000000000
--- a/web/cobrands/reading/css.scss
+++ /dev/null
@@ -1,93 +0,0 @@
-// Generics
-
-$header_back: #ecf5fd;
-$header_back_lighter: #ecf5fd;
-$header_colour: #439DC2;
-$header_darker: #ecf5fd;
-
-$map_width: 420px;
-
-@import "../../css/main-import";
-
-p.thirdParty#reading-logo {
-    margin-top: 0px;
-    padding-bottom: 0px;
-}
-
-div#header {
-    border-bottom: solid 1px #CCC;
-}
-
-#header a:link, #header a:visited, div#header {
-    background-color: transparent;
-}
-
-a {
-    color: #9C2161;
-}
-
-body {
-    font-family: Helvetica, Arial, sans-serif;
-    font-size: 13.5px;
-    color: black;
-}
-
-#navigation {
-    margin-top: 8px;
-    a {
-        font-weight: bold;
-    }
-}
-
-#mysociety {
-
-    #map_box {
-        width: $map_width + 2;
-    }
-
-    #map {
-        width: $map_width;
-        height: $map_width;
-    }
-
-    dd {
-        margin-left: 40px;
-    }
-
-    div {
-        padding-top: 0.2em;
-        padding-bottom: 0.2em;
-    }
-
-    h3 {
-        font-size: 1.17em;
-        font-weight: bold;
-        margin: 1em 0em 1em 0em;
-    }
-
-    h2 {
-        font-weight: bold;
-        margin: 1em 0em 1em 0em;
-    }
-
-    ul, ol {
-        padding-left: 2em;
-    }
-
-    label {
-       width: 6em;
-    }
-
-    .fieldset div.checkbox, #problem_submit {
-        padding-left: 6.5em;
-    }
-
-    table {
-        border-collapse: separate;
-        border-spacing: 1px;
-    }
-
-    td {
-        padding: 3px;
-    }
-}
diff --git a/web/cobrands/reading/css/print3rdParty.css b/web/cobrands/reading/css/print3rdParty.css
deleted file mode 100644
index f5b7ebc83..000000000
--- a/web/cobrands/reading/css/print3rdParty.css
+++ /dev/null
@@ -1,33 +0,0 @@
-body {
-   background: white;
-   font-size: 12pt;
-   color:#000;
-   }
-#access,   
-.header .social, .nav, .footer  {
-   display: none;
-}
-.wrapper, #content {
-   width: auto;
-   margin: 0 2%;
-   padding: 0;
-   border: 0;
-   float: none !important;
-   color: black;
-   background: transparent none;
-}
-p#logo img.printMe  { display:block; vertical-align: bottom; }   
-div#content {
-   margin-left: 5%;
-   padding-top: 1em;
-   border-top: 1px solid #9c2161;
-}
-p#logo {
-   margin-bottom: -8px;
-}
-a:link, a:visited {
-   color: #9c2161;
-   background: transparent;
-   font-weight: bold;
-   text-decoration: underline;
-}
\ No newline at end of file
diff --git a/web/cobrands/reading/css/reading.css b/web/cobrands/reading/css/reading.css
deleted file mode 100644
index 4daef13c9..000000000
--- a/web/cobrands/reading/css/reading.css
+++ /dev/null
@@ -1,176 +0,0 @@
-html, body, div, span, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp,
-small, strong, sub, sup, var, b, i, dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section, summary,
-time, mark, audio, video {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  font-size: 100%;
-  font: inherit;
-  vertical-align: baseline;
-}
-article, aside, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section {
-  display: block;
-}
-blockquote, q { quotes: none; }
-blockquote:before, blockquote:after,
-q:before, q:after { content: ''; content: none; }
-ins { background-color: #ff9; color: #000; text-decoration: none; }
-mark { background-color: #ff9; color: #000; font-style: italic; font-weight: bold; }
-del { text-decoration: line-through; }
-abbr[title], dfn[title] { border-bottom: 1px dotted; cursor: help; }
-table { border-collapse: collapse; border-spacing: 0; }
-hr { display: block; height: 1px; border: 0; border-top: 1px solid #ccc; margin: 1em 0; padding: 0; }
-input, select { vertical-align: middle; }
-body { font:13px/1.231 sans-serif; *font-size:small; } 
-select, input, textarea, button { font:99% sans-serif; }
-pre, code, kbd, samp { font-family: monospace, sans-serif; }
-html { overflow-y: scroll; }
-a:hover, a:active { outline: none; }
-ul, ol { margin-left: 0; }
-ol { list-style-type: decimal; }
-nav ul, nav li,
-.nav ul, .nav li{ margin: 0; list-style:none; list-style-image: none; }
-small { font-size: 85%; }
-strong, th { font-weight: bold; }
-td { vertical-align: top; }
-sub, sup { font-size: 75%; line-height: 0; position: relative; }
-sup { top: -0.5em; }
-sub { bottom: -0.25em; }
-pre { white-space: pre; white-space: pre-wrap; word-wrap: break-word; padding: 15px; }
-textarea { overflow: auto; }
-.ie6 legend, .ie7 legend { margin-left: -7px; } 
-input[type="radio"] { vertical-align: text-bottom; }
-input[type="checkbox"] { vertical-align: bottom; }
-.ie7 input[type="checkbox"] { vertical-align: baseline; }
-.ie6 input { vertical-align: text-bottom; }
-label, input[type="button"], input[type="submit"], input[type="image"], button { cursor: pointer; }
-button, input, select, textarea { margin: 0; }
-input:valid, textarea:valid   {  }
-input:invalid, textarea:invalid { border-radius: 1px; -moz-box-shadow: 0px 0px 5px red; -webkit-box-shadow: 0px 0px 5px red; box-shadow: 0px 0px 5px red; }
-.no-boxshadow input:invalid, .no-boxshadow textarea:invalid { background-color: #f0dddd; }
-button {  width: auto; overflow: visible; }
-img { -ms-interpolation-mode: bicubic; }
-body {
-	margin:0;
-	padding:0;
-	font:normal 14px Helvetica, Arial, serif;
-}
-
-
-
-/*Main Structure*/
-.wrapper {
-	max-width: 1376px;
-	margin-bottom:20px;
-}
-header, nav, footer, 
-.header, .nav, .footer,
-#content{
-	margin:0 20px;
-}
-
-
-.header {}
-
-p#reading-logo{
-	text-indent:-9999px;
-	background:url("/cobrands/reading/images/reading-borough-council-logo.gif") top left no-repeat;
-	width:176px;
-	padding-bottom:20px;
-}
-p.thirdParty#reading-logo { margin-top:35px;}
-p#reading-logo img.printMe { display:none;}
-p#reading-logo a{
-	display:block;
-	height:38px;
-}
-
-#content{
-	margin-top:30px;
-}
-#content h1 {
-	font-weight: bold;
-	font-size:1.6em;
-	margin-bottom:1em;
-}
-.thirdParty { }
-.thirdParty p { margin-bottom:1em;}
-	.footer .contact {
-		width:44%!important;
-	}
-	.footer .links {
-		width:55%!important;
-		margin-right:0!important;
-	}
-	.footer .links ul li {
-		display:inline;
-		font-size:12px;
-		margin-right:3px;
-		border-right:1px solid #999;
-		padding-right:4px;
-	}
-	.footer .links ul li.last {
-		margin-right:0;
-		border:none;
-		paddin-right:0;
-	}
-	.footer .partners {
-		width:100%!important;
-	}
-footer,
-.footer{
-	margin-top:15px;
-}
-footer h3,
-.footer h3{
-	border-bottom:1px solid #b4b4b4;
-	padding-bottom:3px;
-	margin-bottom:10px;
-}
-footer p.title,
-.footer p.title{
-	border-bottom:1px solid #b4b4b4;
-	padding-bottom:3px;
-	margin-bottom:10px;
-}
-footer .contact,
-.footer .contact {
-	width:38.9%;
-	margin-top:15px;
-}
-footer .links,
-.footer .links {
-	width:15%;
-	margin-top:15px;
-}
-footer .partners,
-.footer .partners {
-	width:44%;
-	margin-top:15px;
-}
-footer h4,
-.footer h4 {display:inline;}
-footer .contact,
-footer .links,
-.footer .contact,
-.footer .links {
-	margin-right:1%;
-}
-footer .contact address, footer .contact .phone,
-.footer .contact address, .footer .contact .phone{
-	width:49%;
-}
-footer .contact,footer .links,footer .contact address,footer .contact .phone,footer .partners,
-.footer .contact,.footer .links,.footer .contact address,.footer .contact .phone,.footer .partners{
-	float:left;
-	font-style:normal
-}
-.clear { clear:both;}
-
diff --git a/web/cobrands/reading/images/favicon.ico b/web/cobrands/reading/images/favicon.ico
deleted file mode 100755
index 2619d70e9..000000000
--- a/web/cobrands/reading/images/favicon.ico
+++ /dev/null
diff --git a/web/cobrands/reading/images/reading-borough-council-logo.gif b/web/cobrands/reading/images/reading-borough-council-logo.gif
deleted file mode 100644
index 8532e63ea..000000000
--- a/web/cobrands/reading/images/reading-borough-council-logo.gif
+++ /dev/null
diff --git a/web/cobrands/southampton/SCClogo.png b/web/cobrands/southampton/SCClogo.png
deleted file mode 100644
index 74a037a8c..000000000
--- a/web/cobrands/southampton/SCClogo.png
+++ /dev/null
diff --git a/web/cobrands/southampton/accessInfo.gif b/web/cobrands/southampton/accessInfo.gif
deleted file mode 100644
index 418698ed5..000000000
--- a/web/cobrands/southampton/accessInfo.gif
+++ /dev/null
diff --git a/web/cobrands/southampton/bg-box.gif b/web/cobrands/southampton/bg-box.gif
deleted file mode 100644
index 559a5ae00..000000000
--- a/web/cobrands/southampton/bg-box.gif
+++ /dev/null
diff --git a/web/cobrands/southampton/bg-button.gif b/web/cobrands/southampton/bg-button.gif
deleted file mode 100644
index f5f8122dc..000000000
--- a/web/cobrands/southampton/bg-button.gif
+++ /dev/null
diff --git a/web/cobrands/southampton/bg-footer.gif b/web/cobrands/southampton/bg-footer.gif
deleted file mode 100644
index 89919c1cd..000000000
--- a/web/cobrands/southampton/bg-footer.gif
+++ /dev/null
diff --git a/web/cobrands/southampton/bg-header.jpg b/web/cobrands/southampton/bg-header.jpg
deleted file mode 100644
index 70e0ec46a..000000000
--- a/web/cobrands/southampton/bg-header.jpg
+++ /dev/null
diff --git a/web/cobrands/southampton/bg-input.gif b/web/cobrands/southampton/bg-input.gif
deleted file mode 100644
index 267fe9b6b..000000000
--- a/web/cobrands/southampton/bg-input.gif
+++ /dev/null
diff --git a/web/cobrands/southampton/bg-repeat.gif b/web/cobrands/southampton/bg-repeat.gif
deleted file mode 100644
index b68346517..000000000
--- a/web/cobrands/southampton/bg-repeat.gif
+++ /dev/null
diff --git a/web/cobrands/southampton/blue-line.gif b/web/cobrands/southampton/blue-line.gif
deleted file mode 100644
index c7a587ee5..000000000
--- a/web/cobrands/southampton/blue-line.gif
+++ /dev/null
diff --git a/web/cobrands/southampton/bullet.gif b/web/cobrands/southampton/bullet.gif
deleted file mode 100644
index a86ef002b..000000000
--- a/web/cobrands/southampton/bullet.gif
+++ /dev/null
diff --git a/web/cobrands/southampton/bulletActiveSG.gif b/web/cobrands/southampton/bulletActiveSG.gif
deleted file mode 100644
index 6f4e3e438..000000000
--- a/web/cobrands/southampton/bulletActiveSG.gif
+++ /dev/null
diff --git a/web/cobrands/southampton/css.scss b/web/cobrands/southampton/css.scss
deleted file mode 100644
index 2fc569190..000000000
--- a/web/cobrands/southampton/css.scss
+++ /dev/null
@@ -1,75 +0,0 @@
-$map_width: 420px;
-$background: #E9EEF7;
-$darker: #768EB5;
-
-#mysociety {
-
-    // Smaller map
-
-    #map_box {
-        width: $map_width + 2px;
-        margin-bottom: 10px;
-    }
-    #map, #drag {
-        width: $map_width;
-        height: $map_width;
-    }
-
-    p#fixed, p#unknown {
-        margin-right: $map_width + 22px;
-        width: auto;
-    }
-
-    #problem_form {
-        clear: both;
-    }
-
-    // Generics
-
-    h1 {
-        margin: 0;
-        font-size: 175%;
-    }
-    h2 {
-        font-size: 140%;
-    }
-
-    select, input, textarea {
-        font-size: 99%;
-    }
-
-    a.unsuitable-report {
-        font-size: small;
-    }
-
-    blockquote {
-        border-left: solid 4px $darker;
-    }
-
-    .a {
-        color: #000000;
-        background-color: $background;
-    }
-
-    #postcodeForm {
-        background-color: $background;
-    }
-
-    #front_stats div {
-        background-color: $background;
-        width: 6em;
-        padding: 0.5em;
-    }
-
-    #update_form {
-        clear: right;
-    }
-
-    .update-img {
-        text-align: left;
-    }
-
-    .news {
-        padding: 1em 1em 0em 1em;
-    }
-}
diff --git a/web/cobrands/southampton/css/style.css b/web/cobrands/southampton/css/style.css
deleted file mode 100644
index 8bdf19aa6..000000000
--- a/web/cobrands/southampton/css/style.css
+++ /dev/null
@@ -1,87 +0,0 @@
-body {font-family:Verdana, Geneva, sans-serif; font-size:62.5%;}

-

-a {text-decoration:none; color:#1c4384;	font-weight:bold;}

-

-a:hover {text-decoration:underline;}

-

-p {margin:0 0 10px 0;}

-

-/* ******* Start of Header ******* */

-

-ul#topMenu {width:860px; height:15px; margin:13px auto 3px auto;}

-ul#topMenu li {float:left; list-style-type:none;}

-ul#topMenu a {padding:0 5px 2px 5px; font-size:0.9em; color:#000; font-weight:400;}

-

-#wrapper {width:960px; height:auto; margin:0 auto; background:url(../bg-repeat.gif) repeat-y;}

-#header {width:100%; height:176px; background:url(../bg-header.jpg) no-repeat; background-position:1px 0px;}

-#header .logo {float:left; width:87px; height:81px; margin:25px 0 17px 46px;}

-#header a.siteTitle {height:27px; width:287px; background:url(../logo.png) no-repeat; display:block; font-family:verdana; float:left; margin:60px 0 0 15px; text-indent:-9999px;}

-

-a.mctv {float:right; height:37px; width:104px; margin:15px 7px 0 0;}

-a.mctv img {border:none;}

-

-#searchWrap {width:210px; height:auto; float:right; margin:10px 30px 0 0;}

-#searchWrap form {border:none; padding:0; margin:0 0 10px 0;}

-#searchWrap fieldset {border:none; padding:0; margin:0;}

-#searchWrap label {color:#1b4384; font-weight:700; font-size:1.1em; margin:0; padding:0;}

-#searchWrap input {float:left; background:url(../bg-input.gif) repeat-x; margin:3px 0 0 0; line-height:16px; padding:3px 5px 3px 4px;}

-#searchWrap .button {background:url(../bg-button.gif) repeat-x; margin:3px 0 0 5px; float:left; height:26px; padding:0 3px 4px 3px; color:#fff; border:none;}

-

-.moreInfo {margin:0 0 -2px 2px;}

-.text {width:109px; color:#999;}

-.text2 {width:137px; color:#999;}

-

-ul#topNav {width:870px; height:40px; background:#1b4384; clear:both; margin:0 auto; padding:3px 0 1px 0;}

-ul#topNav li {float:left; list-style-type:none; background:url(../line.gif) no-repeat 0 2px;}

-ul#topNav li:first-child {background:none;}

-ul#topNav li a {color:#ffffff; font-size:1.2em; padding:0 7px 0 8px; font-size:1.2em; font-weight:400;}

-

-p.atoz {float:left; margin:8px 0 0 43px; padding:5px 5px 3px 0; font-size:1.2em; border-bottom:1px solid #E0DBEF;}

-ul#atoz {width:420px; float:left; margin:13px 0 0 0; border-bottom:1px solid #E0DBEF; padding:0 0 1px 0;}

-ul#atoz li {list-style-type:none; display:inline;}

-ul#atoz li a {font-size:13px; font-weight:400;}

-

-ul#contacts {float:right; margin:13px 36px 0 0; padding:0;}

-ul#contacts li {float:left; list-style-type:none; background:url(../blue-line.gif) no-repeat 0 2px;}

-ul#contacts li:first-child {background:none;}

-ul#contacts li a {font-size:1.2em; padding:0 8px 0 10px; font-weight:400;}

-

-/* ******* End of Header ******* */

-

-

-

-/* ******* Start of Left Menu Bar ******* */

-

-#menuBar {width:200px; height:auto; float:left; margin:25px 0 0 43px; padding-bottom:25px; clear:both; }

-

-ul#leftMenu {height:auto; width:199px; float:left; background:#e9eef7 url(../bg-box.gif) no-repeat -1px 100%; padding:0 0 10px 0; margin:5px 0 0 0; overflow:hidden;}

-ul#leftMenu li {list-style-type:none; width:199px; padding:0;}

-ul#leftMenu li a {display:block; width:100%; line-height:1.5em; padding:3px 10px 3px 32px; font-size:1.2em; font-weight:700;}

-ul#leftMenu li.parent {background:url(../bulletActiveSG.gif) no-repeat #768eb5; background-position:10px 11px; color:#fff; padding:3px 0 3px 0;}

-ul#leftMenu li.parent a {color:#fff}

-ul#leftMenu li.selected {background:url(../bullet.gif) no-repeat; background-position:10px 8px; color:#fff; padding:0;}

-

-/* ******* End of Left Menu Bar ******* */

-

-

-

-/* ******* Start of Main Content Area ******* */

-

-#contentArea {width:640px; height:auto; float:left; padding-bottom:25px; font-size:1.1em; margin:15px 0 0 0; padding:15px 0 20px 25px;}

-

-/* ******* End of Main Content Area ******* */

-

-

-

-/* ******* Start of Footer ******* */

-

-#footer {width:100%; height:54px; clear:both; background:url(../bg-footer.gif) no-repeat;}

-

-a.accessInfo {float:left; height:32px; width:117px; margin:0 10px 0 43px;}

-a.accessInfo img {border:none;}

-

-ul#bottomMenu {float:left; margin:10px 0 0 10px;}

-ul#bottomMenu li {float:left; list-style-type:none;}

-ul#bottomMenu a {padding:0 4px 2px 4px; font-size:0.9em; color:#000; font-weight:400;}

-

-/* ******* End of Footer ******* */

diff --git a/web/cobrands/southampton/ff.png b/web/cobrands/southampton/ff.png
deleted file mode 100644
index ef7d91148..000000000
--- a/web/cobrands/southampton/ff.png
+++ /dev/null
diff --git a/web/cobrands/southampton/forms.png b/web/cobrands/southampton/forms.png
deleted file mode 100644
index 4f278e9ae..000000000
--- a/web/cobrands/southampton/forms.png
+++ /dev/null
diff --git a/web/cobrands/southampton/ie6.png b/web/cobrands/southampton/ie6.png
deleted file mode 100644
index d6179fa02..000000000
--- a/web/cobrands/southampton/ie6.png
+++ /dev/null
diff --git a/web/cobrands/southampton/information.gif b/web/cobrands/southampton/information.gif
deleted file mode 100644
index ea2f14bd2..000000000
--- a/web/cobrands/southampton/information.gif
+++ /dev/null
diff --git a/web/cobrands/southampton/line.gif b/web/cobrands/southampton/line.gif
deleted file mode 100644
index fa6ddca0c..000000000
--- a/web/cobrands/southampton/line.gif
+++ /dev/null
diff --git a/web/cobrands/southampton/logo.png b/web/cobrands/southampton/logo.png
deleted file mode 100644
index 71bdc9d97..000000000
--- a/web/cobrands/southampton/logo.png
+++ /dev/null
diff --git a/web/cobrands/southampton/mctv.png b/web/cobrands/southampton/mctv.png
deleted file mode 100644
index 17f3ecec6..000000000
--- a/web/cobrands/southampton/mctv.png
+++ /dev/null
diff --git a/web/cobrands/southampton/safari.png b/web/cobrands/southampton/safari.png
deleted file mode 100644
index e99547a7f..000000000
--- a/web/cobrands/southampton/safari.png
+++ /dev/null
diff --git a/web/js/southampton.js b/web/js/southampton.js
deleted file mode 100644
index ac7292f5d..000000000
--- a/web/js/southampton.js
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * southampton.js
- * FixMyStreet JavaScript for Southampton
- */
-
-function update_category_extra(msg) {
-    var content = '<div style="margin: 1em 0em 1em 6.5em"><strong>' + msg + '</strong></div>';
-    var el = $('#category_extra');
-    if ( el.length ) {
-        el.html( content );
-    } else {
-        var cat_extra = '<div id="category_extra" style="margin:0; display_none;">' +
-            content +
-            '</div>';
-        $('#form_title').closest('div.form-field').after(cat_extra);
-    }
-    $('#category_extra').show('fast');
-}
-
-function check_depth() {
-    var depth = $(this).val();
-    if ('Deeper than a tennis ball' == depth) {
-        var content = '<div style="margin: 1em 0em 1em 6.5em"><strong>' +
-            'Please contact Actionline on 0800 5 19 19 19 so your report can be dealt with urgently' +
-            '</strong></div>';
-        var depth_extra = $('#depth_extra');
-        if ( depth_extra.length ) {
-            depth_extra.html( content );
-            depth_extra.show('fast');
-        } else {
-            $('#form_depth').after( '<div id="depth_extra">' + content + '</div>' );
-        }
-    } else {
-        $('#depth_extra').hide('fast');
-    }
-}
-
-$(function(){
-
-    $('[placeholder]').focus(function(){
-        var input = $(this);
-        if (input.val() == input.attr('placeholder')) {
-            input.val('');
-            input.removeClass('placeholder');
-            input.css({ 'color': '#000000' });
-        }
-    }).blur(function(){
-        var input = $(this);
-        if (input.val() === '' || input.val() == input.attr('placeholder')) {
-            input.css({ 'color': '#999999' });
-            input.val(input.attr('placeholder'));
-        }
-    }).blur();
-
-    // use on() here because the #form_category may be replaced 
-    // during the page's lifetime
-    $("#problem_form").on("change.southampton", "select#form_category", 
-      function() {
-        $('#form_sign_in').show('fast');
-        $('#problem_submit').show('fast');
-        $('#street_light_report').hide('fast');
-        $('#depth_extra').hide('fast');
-        $('#category_extra').hide('fast');
-        var category = $(this).val();
-        if ('Potholes' == category) {
-            var content =
-                '<div class="form-field"><label for="form_size">Size:</label>' +
-                '<select name="detail_size"><option>-- Please select --<option>Unknown' +
-                '<option>Small: No larger than a dinner plate (up to 30cm/12inches)' +
-                '<option>Medium: No larger than a dustbin lid (up to 60cm/24inches)' +
-                '<option>Large: Larger than a dustbin lid (over 60cm/24inches)' +
-                '</select></div>' +
-                '<div class="form-field"><label for="form_depth">Depth:</label>' +
-                '<select id="form_depth" name="detail_depth"><option>-- Please select --<option>Unknown' +
-                '<option>No deeper than a golf ball (up to 4cm/1.5inches)' +
-                '<option>No deeper than a tennis ball (up to 6.5cm/2.5inches)' +
-                '<option>Deeper than a tennis ball' +
-                '</select></div>';
-            if (!$('#category_extra').length) {
-                var qns = '<div id="category_extra" style="margin:0; display:none;">' +
-                content +
-                '</div>';
-                $('#form_title').closest('div.form-field').after(qns);
-            } else {
-                $('#category_extra').html( content );
-            }
-            $('#category_extra').show('fast');
-            $('#form_depth').on('change', check_depth );
-        } else if ('Fly Tipping' == category) {
-            update_category_extra( 'Please list/detail items fly-tipped in the description box &amp; if it has been left on council or private property (if you know).' );
-        } else if ('Litter' == category) {
-            update_category_extra( 'Please detail the type of litter.  If you are reporting broken glass, syringes, oil spills or human excrement, please contact Actionline on 0800 5 19 19 19 so your report can be dealt with.' );
-        } else if ('Leaves' == category) {
-            update_category_extra( 'Please give as much information as you can, e.g. approximate quantity in bin bags. Thank you' );
-        } else if ('Dead animals' == category) {
-            update_category_extra( 'Please give as much information as you can, e.g. which animal, on road or pavement. Thank you' );
-        } else if ('Shopping trolleys' == category) {
-            update_category_extra( 'Please give as much information as you can, e.g. which supermarket. Thank you' );
-        } else if ('Bollards' == category) {
-            update_category_extra( 'Please give as much information as you can, e.g. are they lit, metal or concrete. Thank you' );
-        } else if ('Overhanging vegetation' == category) {
-            update_category_extra( 'Please give as much information as you can, e.g. is it coming from a private property or open area. Thank you' );
-        } else if ('Graffiti' == category) {
-            var graffiti_content =
-                '<div class="form-field"><label for="form_offensive">Is it racist/ offensive:</label>' +
-                '<select name="detail_offensive"><option>-- Please select --' +
-                '<option>Yes<option>No</select></div>';
-            if (!$('#category_extra').length) {
-                var graffiti_qns = '<div id="category_extra" style="margin:0; display:none;">' +
-                graffiti_content +
-                '</div>';
-                $('#form_title').closest('div.form-field').after(graffiti_qns);
-            } else {
-                $('#category_extra').html( graffiti_content );
-            }
-            $('#category_extra').show('fast');
-        } else if ('Street lighting' == category) {
-            $('#form_sign_in').hide('fast');
-            $('#problem_submit').hide('fast');
-            $('#category_extra').hide('fast');
-            var lighting_content =
-                '<div id="street_light_report" style="margin: 1em 0em 1em 6.5em">Please report Street light problems using the Southampton Street Lighting site at: <a href="http://www.lightsoninsouthampton.co.uk/Public/ReportFault.aspx">http://www.lightsoninsouthampton.co.uk/Public/ReportFault.aspx</a></div>';
-            if ( $('#form_category_row').count ) {
-                $('#form_category_row').after(lighting_content);
-            } else {
-                $('#form_category:parent').after(lighting_content);
-            }
-        } else {
-            $('#category_extra').hide('fast');
-        }
-    }
-    ).change(); // change called to trigger (in case we've come in with potholes selected)
-
-});
-