[VP] created OAuth2Validator and clean up