Remove (already covered anyway) optional PPs