Getting rid of a few deprecations