Cleanup: ad -> map_extractor