Remove import Map statement since it is not used anymore.
Merge pull request #324 from rzanoli/master

Remove import Map statement since it is not used anymore.