VE-566 remove unnecessary code