removing dataflow from core