Removed old deprecations