Remove deprecations from core

In progress. Feel free to take bits of it if you'd like.