Added more deprecations