cleanup and group gems in gemfile