Moved MapInterceptor to c.h.map package. Removed unused classes.
Merge pull request #3480 from mdogan/fix/3.4/map

Moved MapInterceptor to c.h.map package. Removed unused classes.