Validation removal fix