SPEED-18 Fix: remove or disable obsolete code