remove watch that are not linked anymore to probes
some fixes about getAll methods