Remove 6 more casualties of Ruby 19