1.9 cleanup