Removed unneeded condition