eliminate deprecations