remove unused code
Gemfile: reorganise deps