RUBY-787 minor cleanup