Update to work with new versions of ruby/jruby and sidekiq.
Code clean up.