prs2 cleanups