2 files changed, 1 insertions, 44 deletions
diff --git a/templates/web/fixmystreet.com/report/banner.html b/templates/web/fixmystreet.com/report/banner.html
index 35d7be179..6fd74a7fe 100644
--- a/templates/web/fixmystreet.com/report/banner.html
+++ b/templates/web/fixmystreet.com/report/banner.html
@@ -20,8 +20,7 @@
         [% INCLUDE banner, id = 'unknown', text = loc('Unknown') %]
     [% END %]
 
-    [% states = [ 'investigating', 'in progress', 'planned', 'action scheduled' ];
-       IF states.grep(problem.state).size %]
+    [% IF problem.is_in_progress %]
         [% INCLUDE banner, id = 'progress', text = loc('In progress') %]
     [% END %]
 
diff --git a/templates/web/fixmystreet.com/report/new/extra_name.html b/templates/web/fixmystreet.com/report/new/extra_name.html
deleted file mode 100644
index dbd971d74..000000000
--- a/templates/web/fixmystreet.com/report/new/extra_name.html
+++ /dev/null
@@ -1,42 +0,0 @@
-[%# Same as parent, with added gender question %]
-
-[% IF (page == 'around' OR page == 'new') AND c.cobrand.ask_gender_question %]
-<p>
-We’re conducting research to make sure our site is good for everyone;
-please help us out by providing your gender. <em>This will not be
-shared with the council or displayed publicly.</em>
-</p>
-
-[% SET gender = report.get_extra_metadata('gender') %]
-<p class="segmented-control segmented-control--radio" style="font-size: 80%">
-    <input type="radio" name="gender" id="gender_female" value="female"[% ' checked' IF gender == 'female' %]>
-    <label class="btn" for="gender_female">Female</label>
-    <input type="radio" name="gender" id="gender_male" value="male"[% ' checked' IF gender == 'male' %]>
-    <label class="btn" for="gender_male">Male</label>
-    <input type="radio" name="gender" id="gender_other" value="other"[% ' checked' IF gender == 'other' %]>
-    <label class="btn" for="gender_other">Other</label>
-    <input type="radio" name="gender" id="gender_unknown" value="unknown"[% ' checked' IF gender == 'unknown' %]>
-    <label class="btn" for="gender_unknown">Prefer not to say</label>
-</p>
-[% END %]
-
-<input type="hidden" name="variant" value="0">
-
-[% IF extra_name_info %]
-<label for="form_fms_extra_title">Title</label>
-[% IF field_errors.fms_extra_title %]
-    <p class='form-error'>[% field_errors.fms_extra_title %]</p>
-[% END %]
-[% title = '' %]
-[% IF fms_extra_title %][% title = fms_extra_title | upper %]
-[% ELSIF c.user && c.user.title %][% title = c.user.title | upper %][% END %]
-<select class="form-control form-focus-trigger required js-form-name" id="form_fms_extra_title"
-    name="fms_extra_title">
-    <option></option>
-    <option value="MR"[% ' selected' IF title == 'MR' %]>Mr</option>
-    <option value="MISS"[% ' selected' IF title == 'MISS' %]>Miss</option>
-    <option value="MRS"[% ' selected' IF title == 'MRS' %]>Mrs</option>
-    <option value="MS"[% ' selected' IF title == 'MS' %]>Ms</option>
-    <option value="DR"[% ' selected' IF title == 'DR' %]>Dr</option>
-</select>
-[% END %]