Remove match API tracking. Fixes #961