cleanup for ruby 2.0