remove some deprecations