Remove some deprecations