more cleanup, passing on MRI / Jruby again