Update Gemfile, remove unused gems and comments