PSR clean up