Clean up Matchlisting