Removed some unused tags