Removed some v2 tags