Temporarily removed everything map-related