ruby 2 and blitz cleanup