redesign: conduits, simplifications, MDP
cleanup of redesign: conduits, simplifications, MDP
conflict resolution