Started Clean up on Validation class