fix(rebase): rebased master and migration

'authUsingGplus' is defined but never used.