Remove 1.0 compatibility