Got rid of vatmpl.h