more ps1 cleanup