Revert "Validation"

This reverts commit d1269847ac68efd47d068bdb2dbc4e404557b912.