1.7 cleanup