Removing unnecessary condition checks