removed unneccessary condition