Reformat and remove dead code
Upgrade to OpenLayers 2.13.1