VE-525 / VE-1495 Remove code not ready for implementation