SPEED-18 Fix: remove deprecated