Further cleaning of Matchmaking script.

-LML
https://app.asana.com/0/18791666670950/20023109289864