Removed ProbeResult etc.