VE-119 removing unneeded code