Clean up all deprecations