reverted some of the matches due to misunderstanding collectionsCleaner
Merge pull request #1055 from Bart39/dev

reverted some of the matches due to misunderstanding collectionsCleaner