Redundant loggedInWithGoogle pub and refactor userData pub