Making some minor changes to some validation classes, removing some unused
code.