Migrate CVRedirect
Clean up CVRedirect