Cleanup the matchSinglePlayer method