Complete rework of map tools
Removal of old defunct stuff