Further clean up on validation suite