Remove watson/validating
Update validation rules