polish code, dump old ConfusionTask for shiny new one