Removed references to multi-set/map