(PSP) Some cleanups