Add remove match logic.