diff --git a/app/views/admin/poll/polls/_form.html.erb b/app/views/admin/poll/polls/_form.html.erb
index 64d7177a6..77961912c 100644
--- a/app/views/admin/poll/polls/_form.html.erb
+++ b/app/views/admin/poll/polls/_form.html.erb
@@ -5,30 +5,12 @@
                        placeholder: t('admin.polls.new.name'),
                        label:       t("admin.polls.new.name") %>
     </div>
-
-    <div class="small-12 medium-6 column">
-      <label><%= t("admin.polls.new.reference") %></label>
-      <input type="text" placeholder="<%= t('admin.polls.new.reference') %>">
-    </div>
-  </div>
-
-  <div class="row">
-    <div class="small-12 medium-6 column">
-      <label><%= t("admin.polls.new.open_date") %></label>
-      <input type="date">
-    </div>
-
-    <div class="small-12 medium-6 column">
-      <label><%= t("admin.polls.new.close_date") %></label>
-      <input type="date">
-    </div>
   </div>
 
   <div class="row">
     <div class="small-12 medium-4 column">
-      <input type="submit"
-             value='<%= t("admin.polls.#{admin_submit_action(@poll)}.submit_button") %>'
-             class="button success expanded">
+      <%= f.submit t("admin.polls.#{admin_submit_action(@poll)}.submit_button"),
+                   class: "button success expanded" %>
     </div>
   </div>
 <% end %>
\ No newline at end of file
diff --git a/app/views/admin/poll/polls/edit.html.erb b/app/views/admin/poll/polls/edit.html.erb
index 0158655a5..cf131203f 100644
--- a/app/views/admin/poll/polls/edit.html.erb
+++ b/app/views/admin/poll/polls/edit.html.erb
@@ -1,37 +1,5 @@
 <%= render 'shared/back_link' %>
 
 <h2><%= t("admin.polls.edit.title") %></h2>
-<%= render "form" %>
 
-<!-- <form>
-  <div class="row">
-    <div class="small-12 medium-6 column">
-      <label><%= t("admin.polls.edit.name") %></label>
-      <input type="text" placeholder="<%= t('admin.polls.edit.name') %>">
-    </div>
-
-    <div class="small-12 medium-6 column">
-      <label><%= t("admin.polls.edit.reference") %></label>
-      <input type="text" placeholder="<%= t('admin.polls.edit.reference') %>">
-    </div>
-  </div>
-
-  <div class="row">
-    <div class="small-12 medium-6 column">
-      <label><%= t("admin.polls.edit.open_date") %></label>
-      <input type="date">
-    </div>
-
-    <div class="small-12 medium-6 column">
-      <label><%= t("admin.polls.edit.close_date") %></label>
-      <input type="date">
-    </div>
-  </div>
-
-  <div class="row">
-    <div class="small-12 medium-4 column">
-      <input type="submit" value="<%= t('admin.polls.edit.submit_button') %>" class="button success expanded">
-    </div>
-  </div> -->
-
-</form>
\ No newline at end of file
+<%= render "form" %>
\ No newline at end of file
diff --git a/spec/features/admin/poll/polls_spec.rb b/spec/features/admin/poll/polls_spec.rb
index 8d130e67a..bab7b5847 100644
--- a/spec/features/admin/poll/polls_spec.rb
+++ b/spec/features/admin/poll/polls_spec.rb
@@ -30,7 +30,6 @@ feature 'Admin polls' do
     Poll.all.each do |poll|
       within("#poll_#{poll.id}") do
         expect(page).to have_content poll.name
-#expect(page).to have_content "Status/Dates" - Hardcoded
       end
     end
     expect(page).to_not have_content "There are no polls"
@@ -43,8 +42,6 @@ feature 'Admin polls' do
     click_link poll.name
 
     expect(page).to have_content poll.name
-#expect(page).to have_content "Status/Dates" - Hardcoded
-#expect(page).to have_content "REFNUM" - Hardcoded
   end
 
   scenario "Create" do
@@ -52,12 +49,9 @@ feature 'Admin polls' do
     click_link "Create poll"
 
     fill_in "poll_name", with: "Upcoming poll"
-#fill_in reference_number - Hardcoded
-#fill_in open_date - Hardcoded
-#fill_in close_date - Hardcoded
     click_button "Create poll"
-    expect(page).to have_content "Poll created successfully"
 
+    expect(page).to have_content "Poll created successfully"
     expect(page).to have_content "Upcoming poll"
   end
 
@@ -66,14 +60,11 @@ feature 'Admin polls' do
 
     visit admin_poll_path(poll)
     click_link "Edit"
-save_and_open_page
-    fill_in "poll_name", with: "Next Poll"
-#fill_in reference_number - Hardcoded
-#fill_in open_date - Hardcoded
-#fill_in close_date - Hardcoded
-    click_button "Update poll"
-    expect(page).to have_content "Poll updated successfully"
 
+    fill_in "poll_name", with: "Next Poll"
+    click_button "Update poll"
+
+    expect(page).to have_content "Poll updated successfully"
     expect(page).to have_content "Next Poll"
   end