reverted some of the matches due to misunderstanding collectionsCleaner