Remove double validation