Removed static attribute from map
Fixed iterator failure
Deleted dump, old method