Remove usage of guava maps
Merge pull request #214 from dmuino/guava

Remove usage of guava maps