Get rid of separate vertex generator