remvoe some deprecations