remove useless conditionals