removed unneeded isTRUEs