removed unneeded conditions