PSR cleanup