removed references to Template.