psr, cleanup