more changes on collection delete issue