Gemfile cleanup and dependencies