diff --git a/plugins/layer_types/openlayers_layer_type_bing.js b/plugins/layer_types/openlayers_layer_type_bing.js
index 0720a55..9bbc6d2 100644
--- a/plugins/layer_types/openlayers_layer_type_bing.js
+++ b/plugins/layer_types/openlayers_layer_type_bing.js
@@ -10,10 +10,6 @@
  *   Valid OpenLayers layer.
  */
 Drupal.openlayers.layer.bing = function(title, map, options) {
-
   options.projection = new OpenLayers.Projection(options.projection);
-
-  var layer = new OpenLayers.Layer.Bing(options);
-  layer.styleMap = Drupal.openlayers.getStyleMap(map, options.drupalID);
-  return layer;
+  return new OpenLayers.Layer.Bing(options);
 };
diff --git a/plugins/layer_types/openlayers_layer_type_cloudmade.js b/plugins/layer_types/openlayers_layer_type_cloudmade.js
index d8beba5..9a04b98 100644
--- a/plugins/layer_types/openlayers_layer_type_cloudmade.js
+++ b/plugins/layer_types/openlayers_layer_type_cloudmade.js
@@ -10,13 +10,5 @@
  *   Valid OpenLayers layer.
  */
 Drupal.openlayers.layer.cloudmade = function(title, map, options) {
-  var styleMap = Drupal.openlayers.getStyleMap(map, options.drupalID);
-
-  // options.sphericalMercator = true;
-  options.maxExtent = new OpenLayers.Bounds(-20037508, -20037508, 20037508, 20037508);
-  options.projection = new OpenLayers.Projection(options.projection);
-
-  var layer = new OpenLayers.Layer.CloudMade(title, options);
-  layer.styleMap = styleMap;
-  return layer;
+  return new OpenLayers.Layer.CloudMade(title, options);
 };
diff --git a/plugins/layer_types/openlayers_layer_type_geojson.js b/plugins/layer_types/openlayers_layer_type_geojson.js
index 71a09d7..2efd0be 100644
--- a/plugins/layer_types/openlayers_layer_type_geojson.js
+++ b/plugins/layer_types/openlayers_layer_type_geojson.js
@@ -6,8 +6,6 @@
 /**
  * Openlayer layer handler for KML layer
  */
-(function($) {
-
 Drupal.openlayers.layer.geojson = function(title, map, options) {
   var features = null;
   options.projection = new OpenLayers.Projection(options.projection);
@@ -82,5 +80,3 @@ Drupal.openlayers.layer.geojson = function(title, map, options) {
 
   return layer;
 };
-
-})(jQuery);
diff --git a/plugins/layer_types/openlayers_layer_type_google.js b/plugins/layer_types/openlayers_layer_type_google.js
index b899972..c681f04 100644
--- a/plugins/layer_types/openlayers_layer_type_google.js
+++ b/plugins/layer_types/openlayers_layer_type_google.js
@@ -10,8 +10,6 @@
  *   Valid OpenLayers layer.
  */
 Drupal.openlayers.layer.google = function(title, map, options) {
-  var styleMap = Drupal.openlayers.getStyleMap(map, options.drupalID);
-
   // if G_ vars exists we're using gmap v2
   var google_type_map = {
     'normal': window['G_NORMAL_MAP'] || null,
@@ -21,9 +19,7 @@ Drupal.openlayers.layer.google = function(title, map, options) {
   };
 
   options.type = google_type_map[options.type];
-  options.projection = "EPSG:900913";
+  options.projection = new OpenLayers.Projection(options.projection);
 
-  var layer = new OpenLayers.Layer.Google(title, options);
-  layer.styleMap = styleMap;
-  return layer;
+  return new OpenLayers.Layer.Google(title, options);
 };
diff --git a/plugins/layer_types/openlayers_layer_type_image.js b/plugins/layer_types/openlayers_layer_type_image.js
index 016f062..24eab58 100644
--- a/plugins/layer_types/openlayers_layer_type_image.js
+++ b/plugins/layer_types/openlayers_layer_type_image.js
@@ -3,16 +3,17 @@
  */
 Drupal.openlayers.layer.image = function(title, map, options) {
   var maxExtent;
-  if(options.maxExtent===null){
+  if (options.maxExtent === null) {
     // Stretch image to cover whole map if not specified.
     maxExtent = map.maxExtent;
   } else {
     maxExtent = options.maxExtent;
   }
+
   return new OpenLayers.Layer.Image(
     title,
     options.file,
-    new OpenLayers.Bounds.fromArray(maxExtent),
+    OpenLayers.Bounds.fromArray(maxExtent),
     new OpenLayers.Size(options.size.w/options.factors.x, options.size.h/options.factors.y),
     {
       numZoomLevels: options.numZoomLevels,
diff --git a/plugins/layer_types/openlayers_layer_type_osm.js b/plugins/layer_types/openlayers_layer_type_osm.js
index fdbaf0e..6f9b029 100644
--- a/plugins/layer_types/openlayers_layer_type_osm.js
+++ b/plugins/layer_types/openlayers_layer_type_osm.js
@@ -8,7 +8,5 @@
  * Openlayer layer handler for OSM layer
  */
 Drupal.openlayers.layer.osm = function(title, map, options) {
-    var layer = new OpenLayers.Layer.OSM(title, options.url, options);
-    layer.styleMap = Drupal.openlayers.getStyleMap(map, options.drupalID);
-    return layer;
+    return new OpenLayers.Layer.OSM(title, options.url, options);
 };
diff --git a/plugins/layer_types/openlayers_layer_type_raw.js b/plugins/layer_types/openlayers_layer_type_raw.js
index 511861f..2e226c8 100644
--- a/plugins/layer_types/openlayers_layer_type_raw.js
+++ b/plugins/layer_types/openlayers_layer_type_raw.js
@@ -8,7 +8,6 @@ Drupal.openlayers.layer.openlayers_raw = function(title, map, options) {
   // Note, so that we do not pass all the features along to the Layer
   // options, we use the options.options to give to Layer
   options.options.drupalID = options.drupalID;
-
   options.options.styleMap = Drupal.openlayers.getStyleMap(map, options.drupalID);
 
   var layer = new OpenLayers.Layer.Vector(title, options.options);
diff --git a/plugins/layer_types/openlayers_layer_type_wms.js b/plugins/layer_types/openlayers_layer_type_wms.js
index d863b80..0ebc31b 100644
--- a/plugins/layer_types/openlayers_layer_type_wms.js
+++ b/plugins/layer_types/openlayers_layer_type_wms.js
@@ -8,8 +8,6 @@
  * Openlayer layer handler for WMS layer
  */
 Drupal.openlayers.layer.wms = function(title, map, options) {
-  var styleMap = Drupal.openlayers.getStyleMap(map, options.drupalID);
-
   /* TODO: have PHP take care of the casts here, not JS! */
   if (options.params.buffer) {
     options.params.buffer = parseInt(options.params.buffer, 10);
@@ -36,10 +34,5 @@ Drupal.openlayers.layer.wms = function(title, map, options) {
   // OpenLayers can calculate the resolutions usually if provided with the number of zoom levels and tile sizes
   paramsClone.numZoomLevels=18;
 
-  // TODO: Is styleMap an option for WMS Layers ?
-  // According to the doc, styleMap is only an option for layers
-  // extending the Vector layer class. WMS is not extending it... so ?
-  var layer = new OpenLayers.Layer.WMS(title, options.base_url, optionsClone, paramsClone);
-  layer.styleMap = styleMap;
-  return layer;
+  return new OpenLayers.Layer.WMS(title, options.base_url, optionsClone, paramsClone);
 };
diff --git a/plugins/layer_types/openlayers_layer_type_xyz.js b/plugins/layer_types/openlayers_layer_type_xyz.js
index c72667d..5b430ff 100644
--- a/plugins/layer_types/openlayers_layer_type_xyz.js
+++ b/plugins/layer_types/openlayers_layer_type_xyz.js
@@ -8,7 +8,6 @@
  * Openlayer layer handler for XYZ layer
  */
 Drupal.openlayers.layer.xyz = function(title, map, options) {
-  var styleMap = Drupal.openlayers.getStyleMap(map, options.drupalID);
   if (OpenLayers.Util.isArray(options.maxExtent)) {
     options.maxExtent = OpenLayers.Bounds.fromArray(options.maxExtent);
   }
@@ -32,7 +31,5 @@ Drupal.openlayers.layer.xyz = function(title, map, options) {
 
   options.projection = new OpenLayers.Projection(options.projection);
 
-  var layer = new OpenLayers.Layer.XYZ(title, options.url, options);
-  layer.styleMap = styleMap;
-  return layer;
+  return new OpenLayers.Layer.XYZ(title, options.url, options);
 };