You are right, I was originally doing more stuff in there that is now no longer necessary. Will simplify it by just using the validator.