Add more deprecations