Cleaned up termination of datapaths.
Fixed ADDED/REMOVED_DATAPATH_NETWORK params.