Eliminate those last few deprecations.