removed all v1 v2 suffixes etc