Remove template annotations