Revert to Ruby 1.8 syntax, remove some debug