Small probing cleanup