Remove 1.0 code