removing few deprecations