Clean up what we store for each match