removed multimap
removed non-needed build
makefile cleanup