iTunes Matching on Multiple Systems not working

I am using iTunes on multiple systems. The actual songs on the media hierarchies are exact copies. Due to the 25K limit, I started with a subset of the library on one of my systems.

After enabling iTunes Match on my main system, it shows songs already in the library also as duplicates in the cloud. This not only includes uploaded one, but also previoulsy matched songs and songs purchased from iTunes.

Given the number of track involved, just deleting the local version and downloading again is impractical. This makes the whole library browsing a bloated mess of duplicates,

Any other ideas of how to manage this? This is not plug and play at all!