remove more deprecations