Removed references to template