Validation is cleaned up.