Remove obsolete Map class