Added remove method to template version