Removing some deprecations.