Fixed Local agents removing

TODO: fix doubling of local systems