Removed excess condition