Added collection cleanup