clean up old match infrastructure stubbing