remove further deprecations