2 files changed, 2 insertions, 58 deletions
diff --git a/perllib/FixMyStreet/SendReport/EmptyHomes.pm b/perllib/FixMyStreet/SendReport/EmptyHomes.pm
deleted file mode 100644
index b5faf8ddc..000000000
--- a/perllib/FixMyStreet/SendReport/EmptyHomes.pm
+++ /dev/null
@@ -1,56 +0,0 @@
-package FixMyStreet::SendReport::EmptyHomes;
-
-use Moo;
-use namespace::autoclean;
-
-use mySociety::MaPit;
-
-BEGIN { extends 'FixMyStreet::SendReport::Email'; }
-
-sub build_recipient_list {
-    my ( $self, $row, $h ) = @_;
-
-    my $all_confirmed = 1;
-    foreach my $body ( @{ $self->bodies } ) {
-        my $contact = $row->result_source->schema->resultset("Contact")->find( {
-            deleted => 0,
-            body_id => $body->id,
-            category => 'Empty property',
-        } );
-
-        my ($body_email, $confirmed, $note) = ( $contact->email, $contact->confirmed, $contact->note );
-
-        unless ($confirmed) {
-            $all_confirmed = 0;
-            #$note = 'Council ' . $row->body . ' deleted'
-                #unless $note;
-            $body_email = 'N/A' unless $body_email;
-            #$notgot{$body_email}{$row->category}++;
-            #$note{$body_email}{$row->category} = $note;
-        }
-
-        push @{ $self->to }, [ $body_email, $body->name ];
-
-        my $area_info = mySociety::MaPit::call('area', $body->body_areas->first->area_id);
-        my $country = $area_info->{country};
-        if ($country eq 'W') {
-            push @{$self->bcc}, 'wales@' . FixMyStreet->config('EMAIL_DOMAIN');
-        } elsif ($country eq 'S') {
-            push @{$self->bcc}, 'scotland@' . FixMyStreet->config('EMAIL_DOMAIN');
-        } else {
-            push @{$self->bcc}, 'eha@' . FixMyStreet->config('EMAIL_DOMAIN');
-        }
-    }
-
-    # Set address email parameter from added data
-    $h->{address} = $row->extra->{address};
-
-    return $all_confirmed && @{$self->to};
-}
-
-sub get_template {
-    my ( $self, $row ) = @_;
-    return Utils::read_file( FixMyStreet->path_to( "templates", "email", "emptyhomes", $row->lang, "submit.txt" )->stringify );
-}
-
-1;
diff --git a/perllib/FixMyStreet/SendReport/Open311.pm b/perllib/FixMyStreet/SendReport/Open311.pm
index 4844aa2e9..5c7fa30f3 100644
--- a/perllib/FixMyStreet/SendReport/Open311.pm
+++ b/perllib/FixMyStreet/SendReport/Open311.pm
@@ -126,8 +126,8 @@ sub send {
             $revert = 1;
         }
 
-        if ($row->cobrand eq 'fixmybarangay' || $row->bodies_str =~ /$COUNCIL_ID_GREENWICH/) {
-            # FixMyBarangay endpoints expect external_id as an attribute, as do Greenwich
+        if ($row->bodies_str =~ /$COUNCIL_ID_GREENWICH/) {
+            # Greenwich endpoint expects external_id as an attribute
             $row->set_extra_fields( { 'name' => 'external_id', 'value' => $row->id  } );
             $revert = 1;
         }