Simplify and remove ruby-mass dependency