Pr32 cleanup