(#1026) - remove conditionals