Removed excess validation.