updates for gwt-gis cleanup