fix Gemfile and remove some copied-over requires