Moving the CveAllVerify to production only
Refactoring