Remove canvas-helper dependency from map
Clean up