Match Scouting clean up.