removed unnecessary condition