Removes one condition to simplify the code