Deprecations clean-up