Remove all references to TemplateInfo

Change-Id: I5ffc8f75140a2c372fc1c64509b13a534fe07479