Get rid of redundant UserOauth2 Model

@raghuveerkancherla  Please review