Remove google login bug and code cleanup