Removed richcollection dependencies