remove conditionals