VE-868: Removing unnecessary code