Cleaned up the code that was incorrectly deleting the Validator objects