Removed more deprecations.