PSR-2 Cleanup