VID-1551 more old code removal