Remove too early deprecations