removed extra conditionals, refs #340