[Refactor]Collection items clean up