Implemented map_remove