Fix collection item removal for all types of collections