simplify

original _Condition_ plan duplicated data. should now have only one
condition in one place that we access