Remove the -v1 switch and all uses
Merge pull request #2034 from yebblies/removev1

Remove the -v1 switch