remove conditions as they are not necessary