Removing unnecessary condition