Fix JRuby; remove now-dead code.