Remove temporary deprecations