Clean Map VC
Merge branch 'feature/map' into develop