re-factor Deprecations