Add map, use multiple position providers, remove vestigal code.