rid of deprecations