Removed some disabled codes. Refs #8222.
Merge branch 'feature/8222_preNexus_veto' into develop