Removed references to the old tags.