diff --git a/Gemfile b/Gemfile
index 71187876..fd79772f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -71,7 +71,6 @@ gem 'twitter'
 # To use a more recent Faraday version, a fork of this gem is required.
 gem 'tumblr_client', git: 'https://github.com/amplifr/tumblr_client'
 
-gem 'foreman'
 gem 'redis'
 
 gem 'fake_email_validator'
@@ -82,10 +81,6 @@ group :development do
   gem 'web-console', '< 4.0.0'
 end
 
-group :production do
-  gem 'unicorn', group: :production
-end
-
 gem 'puma'
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 2f64072f..212bb83d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -177,7 +177,6 @@ GEM
       railties (>= 3.2, < 6.1)
     font-kit-rails (1.2.0)
       rails
-    foreman (0.87.1)
     formatador (0.2.5)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
@@ -251,7 +250,6 @@ GEM
       activerecord
       kaminari-core (= 1.2.0)
     kaminari-core (1.2.0)
-    kgio (2.11.3)
     launchy (2.5.0)
       addressable (~> 2.7)
     letter_opener (1.7.0)
@@ -389,7 +387,6 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
-    raindrops (0.19.1)
     rake (13.0.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.1)
@@ -515,9 +512,6 @@ GEM
       unf_ext
     unf_ext (0.0.7.7)
     unicode-display_width (1.7.0)
-    unicorn (5.5.4)
-      kgio (~> 2.6)
-      raindrops (~> 0.7)
     warden (1.2.8)
       rack (>= 2.0.6)
     web-console (3.7.0)
@@ -558,7 +552,6 @@ DEPENDENCIES
   fog-local
   font-awesome-rails (~> 4.7.0)
   font-kit-rails
-  foreman
   guard-brakeman
   haml (~> 5.0)
   haml_lint
@@ -610,7 +603,6 @@ DEPENDENCIES
   turbolinks (~> 2.5.3)
   twitter
   uglifier (>= 1.3.0)
-  unicorn
   web-console (< 4.0.0)
 
 BUNDLED WITH
diff --git a/Procfile b/Procfile
deleted file mode 100644
index 20a11f91..00000000
--- a/Procfile
+++ /dev/null
@@ -1,2 +0,0 @@
-web: bundle exec unicorn -E production -c ./config/unicorn.rb -l unix:./tmp/sockets/justask.sock
-workers: bundle exec sidekiq -e production -C './config/sidekiq.yml'
diff --git a/app/views/application/_answerbox.haml b/app/views/application/_answerbox.haml
index 1639c5da..1f427b7d 100644
--- a/app/views/application/_answerbox.haml
+++ b/app/views/application/_answerbox.haml
@@ -34,7 +34,7 @@
           %i.fa.fa-clock-o
           = link_to(raw(t('views.answerbox.time', time: time_tooltip(a))), show_user_answer_path(a.user.screen_name, a.id))
         .col-8.col-sm-8.col-md-6.text-right
-          = render 'answerbox/actions', a: a
+          = render 'answerbox/actions', a: a, display_all: display_all
   .card-footer{ id: "ab-comments-section-#{a.id}", style: display_all.nil? ? 'display: none' : nil }
     %div{ id: "ab-smiles-#{a.id}" }= render 'answerbox/smiles', a: a
     %div{ id: "ab-comments-#{a.id}" }= render 'answerbox/comments', a: a
diff --git a/app/views/moderation/priority.haml b/app/views/moderation/priority.haml
index 436fb9ea..6f64fe75 100644
--- a/app/views/moderation/priority.haml
+++ b/app/views/moderation/priority.haml
@@ -7,4 +7,4 @@
   .row.row-cols-1.row-cols-sm-2.row-cols-md-3
     - @users.each do |u, c|
       .col
-        = render 'moderation/userbox', user: u, count: c
+        = render 'moderation/userbox', user: u, count: (c || 0)