Undo Validator changes

Plus added some todos