Move some deprecations along.