Support NUCCORE-1238. Remove Multimap since wasn't in use