[#1026] remove conditionals

this and #1027 are probably going to have to be done together.