more ps2 cleanups