Remove OAuth1Client and OAuth2Client and merge them with Idps models.