removing deprecations in models