Map/Vmap extractor dependancies cleaned up
Cleaned up references slightly