more ps2 cleanups

Signed-off-by: Jens Nyberg <jens.nyberg@gmail.com>
more cleanups

Signed-off-by: Jens Nyberg <jens.nyberg@gmail.com>