Re-init: Explicitly delete existing matches

This could be a bit more reliable in the face of future changes.