Remove more deprecations