Cleanup and use multimap