Removing Ruby 1.8 code (DO NOT MERGE UNTIL AFTER MONDAY)