PSR2 cleanups