Better 9.1 cleanup