More 1.5 cleanup