Remove deprecations and add todos