Removing confl multiplier hack and using UIP in cleaning, too