Remove multimap dependency