removed unused tags in templates