Cleanup psr-2