Simplify gemfile and gemspec