Hygiene: Move over VE to new template mechanism

Change-Id: Icf23ceb87a87ef1a767f2258b0401a6ea00cea72