Re-enable other map tools
Code cleanup and consolidation