(PS3) Multiman cleanups