Remove deprecations for 2