[V2] Gemfile clean up

rebased #776.