SPEED-16 Fix: remove deprecated code