Clean up, preparation for multiple object matching
Able to match more than one image per frame