Remove validator from source code

See #3234 for the full discussion

--no-rebase