Remove the Map since it wasn't being used any more
Merge pull request #13 from arv/remove-map

Remove the Map since it wasn't being used any more