PSR fixes
Removed OpenId stuff for now