RUBY-620 fix unused or uninitialized variables