Deprecations and simplifications