Use new validation code
Preview: remove unused code, fix form validation