Begin clean up and port back to non-angular leaflet.