Most of deprecations are resolved