removed some deprecations