Cleaned up Datapath.