Clean up deprecations