Remove unnecessary checks.
Add probe-id parameter.