More OpenLayers cleanup