diff --git a/lib/OpenLayers/BaseTypes/Bounds.js b/lib/OpenLayers/BaseTypes/Bounds.js
index 47446e0d70..1dc63e9c3b 100644
--- a/lib/OpenLayers/BaseTypes/Bounds.js
+++ b/lib/OpenLayers/BaseTypes/Bounds.js
@@ -453,8 +453,7 @@ OpenLayers.Bounds = OpenLayers.Class({
                 
         return newBounds;
     },
-    
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Bounds"
 });
 
diff --git a/lib/OpenLayers/BaseTypes/LonLat.js b/lib/OpenLayers/BaseTypes/LonLat.js
index c762bf6c1a..d17a86aeab 100644
--- a/lib/OpenLayers/BaseTypes/LonLat.js
+++ b/lib/OpenLayers/BaseTypes/LonLat.js
@@ -142,8 +142,7 @@ OpenLayers.LonLat = OpenLayers.Class({
                 
         return newLonLat;
     },
-    
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.LonLat"
 });
 
diff --git a/lib/OpenLayers/BaseTypes/Pixel.js b/lib/OpenLayers/BaseTypes/Pixel.js
index f5e454fcda..01ce8f448c 100644
--- a/lib/OpenLayers/BaseTypes/Pixel.js
+++ b/lib/OpenLayers/BaseTypes/Pixel.js
@@ -115,7 +115,6 @@ OpenLayers.Pixel = OpenLayers.Class({
         }
         return newPx;
     },
-    
-    /** @final @type str */
+
     CLASS_NAME: "OpenLayers.Pixel"
 });
\ No newline at end of file
diff --git a/lib/OpenLayers/BaseTypes/Size.js b/lib/OpenLayers/BaseTypes/Size.js
index 8cb7146535..7209713d5c 100644
--- a/lib/OpenLayers/BaseTypes/Size.js
+++ b/lib/OpenLayers/BaseTypes/Size.js
@@ -79,7 +79,6 @@ OpenLayers.Size = OpenLayers.Class({
         }
         return equals;
     },
-    
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Size"
 });
\ No newline at end of file
diff --git a/lib/OpenLayers/Console.js b/lib/OpenLayers/Console.js
index 996fb10306..cdd818b395 100644
--- a/lib/OpenLayers/Console.js
+++ b/lib/OpenLayers/Console.js
@@ -205,7 +205,6 @@ OpenLayers.Console = {
      */
     count: function() {},
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Console"
 };
 
diff --git a/lib/OpenLayers/Control.js b/lib/OpenLayers/Control.js
index 204e1d63b8..8d5567f1e9 100644
--- a/lib/OpenLayers/Control.js
+++ b/lib/OpenLayers/Control.js
@@ -232,8 +232,7 @@ OpenLayers.Control = OpenLayers.Class({
         }
         return false;
     },
-    
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Control"
 });
 
diff --git a/lib/OpenLayers/Control/ArgParser.js b/lib/OpenLayers/Control/ArgParser.js
index 0da6410876..f96177c114 100644
--- a/lib/OpenLayers/Control/ArgParser.js
+++ b/lib/OpenLayers/Control/ArgParser.js
@@ -125,7 +125,6 @@ OpenLayers.Control.ArgParser = OpenLayers.Class(OpenLayers.Control, {
             }
         }
     },     
-    
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Control.ArgParser"
 });
diff --git a/lib/OpenLayers/Control/DragPan.js b/lib/OpenLayers/Control/DragPan.js
index 20c2bd9a66..03a3d18dcf 100644
--- a/lib/OpenLayers/Control/DragPan.js
+++ b/lib/OpenLayers/Control/DragPan.js
@@ -68,6 +68,5 @@ OpenLayers.Control.DragPan = OpenLayers.Class(OpenLayers.Control, {
         this.handler.start = xy;
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Control.DragPan"
 });
diff --git a/lib/OpenLayers/Control/DrawFeature.js b/lib/OpenLayers/Control/DrawFeature.js
index 3f60c6d7a2..813a7111b4 100644
--- a/lib/OpenLayers/Control/DrawFeature.js
+++ b/lib/OpenLayers/Control/DrawFeature.js
@@ -64,6 +64,5 @@ OpenLayers.Control.DrawFeature = OpenLayers.Class(OpenLayers.Control, {
         this.featureAdded(feature);
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Control.DrawFeature"
 });
diff --git a/lib/OpenLayers/Control/KeyboardDefaults.js b/lib/OpenLayers/Control/KeyboardDefaults.js
index 65d061de5c..777af844c5 100644
--- a/lib/OpenLayers/Control/KeyboardDefaults.js
+++ b/lib/OpenLayers/Control/KeyboardDefaults.js
@@ -101,7 +101,6 @@ OpenLayers.Control.KeyboardDefaults = OpenLayers.Class(OpenLayers.Control, {
                 break;
         } 
     },
-    
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Control.KeyboardDefaults"
 });
diff --git a/lib/OpenLayers/Control/LayerSwitcher.js b/lib/OpenLayers/Control/LayerSwitcher.js
index 584b59fd8b..4ff1de2de0 100644
--- a/lib/OpenLayers/Control/LayerSwitcher.js
+++ b/lib/OpenLayers/Control/LayerSwitcher.js
@@ -549,6 +549,5 @@ OpenLayers.Control.LayerSwitcher = OpenLayers.Class(OpenLayers.Control, {
         }
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Control.LayerSwitcher"
 });
diff --git a/lib/OpenLayers/Control/MouseDefaults.js b/lib/OpenLayers/Control/MouseDefaults.js
index 7e435bca63..d67145d560 100644
--- a/lib/OpenLayers/Control/MouseDefaults.js
+++ b/lib/OpenLayers/Control/MouseDefaults.js
@@ -340,9 +340,7 @@ OpenLayers.Control.MouseDefaults = OpenLayers.Class(OpenLayers.Control, {
             OpenLayers.Event.stop(e);
         }
     },
-    
-    
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Control.MouseDefaults"
 });
 
diff --git a/lib/OpenLayers/Control/MousePosition.js b/lib/OpenLayers/Control/MousePosition.js
index aef27c888b..854f236036 100644
--- a/lib/OpenLayers/Control/MousePosition.js
+++ b/lib/OpenLayers/Control/MousePosition.js
@@ -121,7 +121,6 @@ OpenLayers.Control.MousePosition = OpenLayers.Class(OpenLayers.Control, {
         OpenLayers.Control.prototype.setMap.apply(this, arguments);
         this.map.events.register( 'mousemove', this, this.redraw);
     },     
-    
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Control.MousePosition"
 });
diff --git a/lib/OpenLayers/Control/Navigation.js b/lib/OpenLayers/Control/Navigation.js
index 584a8754de..e931511001 100644
--- a/lib/OpenLayers/Control/Navigation.js
+++ b/lib/OpenLayers/Control/Navigation.js
@@ -142,7 +142,6 @@ OpenLayers.Control.Navigation = OpenLayers.Class(OpenLayers.Control, {
     wheelDown: function(evt) {
         this.wheelChange(evt, -1);
     },
-    
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Control.Navigation"
 });
diff --git a/lib/OpenLayers/Control/OverviewMap.js b/lib/OpenLayers/Control/OverviewMap.js
index 0c55067661..a418803b7b 100644
--- a/lib/OpenLayers/Control/OverviewMap.js
+++ b/lib/OpenLayers/Control/OverviewMap.js
@@ -681,7 +681,5 @@ OpenLayers.Control.OverviewMap = OpenLayers.Class(OpenLayers.Control, {
         return px;
     },
 
-    /** @final @type String */
     CLASS_NAME: 'OpenLayers.Control.OverviewMap'
-    
 });
diff --git a/lib/OpenLayers/Control/PanZoom.js b/lib/OpenLayers/Control/PanZoom.js
index a0b02363a7..ff65f392f7 100644
--- a/lib/OpenLayers/Control/PanZoom.js
+++ b/lib/OpenLayers/Control/PanZoom.js
@@ -175,7 +175,6 @@ OpenLayers.Control.PanZoom = OpenLayers.Class(OpenLayers.Control, {
         OpenLayers.Event.stop(evt);
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Control.PanZoom"
 });
 
diff --git a/lib/OpenLayers/Control/Panel.js b/lib/OpenLayers/Control/Panel.js
index 9703f691ea..f71d667edd 100644
--- a/lib/OpenLayers/Control/Panel.js
+++ b/lib/OpenLayers/Control/Panel.js
@@ -190,8 +190,7 @@ OpenLayers.Control.Panel = OpenLayers.Class(OpenLayers.Control, {
         OpenLayers.Event.stop(evt ? evt : window.event);
         this.activateControl(ctrl);
     },
-    
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Control.Panel"
 });
 
diff --git a/lib/OpenLayers/Control/Permalink.js b/lib/OpenLayers/Control/Permalink.js
index 03b321fe72..b5f43fbcf2 100644
--- a/lib/OpenLayers/Control/Permalink.js
+++ b/lib/OpenLayers/Control/Permalink.js
@@ -121,6 +121,5 @@ OpenLayers.Control.Permalink = OpenLayers.Class(OpenLayers.Control, {
         this.element.href = href;
     }, 
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Control.Permalink"
 });
diff --git a/lib/OpenLayers/Control/Scale.js b/lib/OpenLayers/Control/Scale.js
index bcaa21f581..8c4ce71d61 100644
--- a/lib/OpenLayers/Control/Scale.js
+++ b/lib/OpenLayers/Control/Scale.js
@@ -66,8 +66,7 @@ OpenLayers.Control.Scale = OpenLayers.Class(OpenLayers.Control, {
         
         this.element.innerHTML = "Scale = 1 : " + scale;
     }, 
-    
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Control.Scale"
 });
 
diff --git a/lib/OpenLayers/Control/ZoomBox.js b/lib/OpenLayers/Control/ZoomBox.js
index 3e1fd327a3..ae2759409a 100644
--- a/lib/OpenLayers/Control/ZoomBox.js
+++ b/lib/OpenLayers/Control/ZoomBox.js
@@ -47,6 +47,5 @@ OpenLayers.Control.ZoomBox = OpenLayers.Class(OpenLayers.Control, {
         }
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Control.ZoomBox"
 });
diff --git a/lib/OpenLayers/Control/ZoomToMaxExtent.js b/lib/OpenLayers/Control/ZoomToMaxExtent.js
index 7ebab25144..3af8a3ceec 100644
--- a/lib/OpenLayers/Control/ZoomToMaxExtent.js
+++ b/lib/OpenLayers/Control/ZoomToMaxExtent.js
@@ -28,6 +28,6 @@ OpenLayers.Control.ZoomToMaxExtent = OpenLayers.Class(OpenLayers.Control, {
             this.map.zoomToMaxExtent();
         }    
     },
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Control.ZoomToMaxExtent"
 });
diff --git a/lib/OpenLayers/Events.js b/lib/OpenLayers/Events.js
index 05100c5df2..eb7fd73fc0 100644
--- a/lib/OpenLayers/Events.js
+++ b/lib/OpenLayers/Events.js
@@ -317,8 +317,7 @@ OpenLayers.Event = {
             OpenLayers.Event.observers = false;
         }
     },
-    
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Event"
 };
 
@@ -663,6 +662,5 @@ OpenLayers.Events = OpenLayers.Class({
         ); 
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Events"
 });
diff --git a/lib/OpenLayers/Feature.js b/lib/OpenLayers/Feature.js
index 54a6058f24..63e7326873 100644
--- a/lib/OpenLayers/Feature.js
+++ b/lib/OpenLayers/Feature.js
@@ -199,7 +199,6 @@ OpenLayers.Feature = OpenLayers.Class({
     destroyPopup: function() {
         this.popup.destroy() 
     },
-    
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Feature"
 });
diff --git a/lib/OpenLayers/Feature/WFS.js b/lib/OpenLayers/Feature/WFS.js
index b4eb6a25b5..d8eb59b740 100644
--- a/lib/OpenLayers/Feature/WFS.js
+++ b/lib/OpenLayers/Feature/WFS.js
@@ -68,8 +68,7 @@ OpenLayers.Feature.WFS = OpenLayers.Class(OpenLayers.Feature, {
                 id: null};
 
     },
-    
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Feature.WFS"
 });
   
diff --git a/lib/OpenLayers/Format.js b/lib/OpenLayers/Format.js
index f6aa0dcd5b..e193747ae4 100644
--- a/lib/OpenLayers/Format.js
+++ b/lib/OpenLayers/Format.js
@@ -55,7 +55,5 @@ OpenLayers.Format = OpenLayers.Class({
         alert("Write not implemented.");
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Format"
-
 });     
diff --git a/lib/OpenLayers/Format/GML.js b/lib/OpenLayers/Format/GML.js
index 1474e3000a..47b4f64638 100644
--- a/lib/OpenLayers/Format/GML.js
+++ b/lib/OpenLayers/Format/GML.js
@@ -503,8 +503,6 @@ OpenLayers.Format.GML = OpenLayers.Class(OpenLayers.Format, {
         
         return coordinatesNode;
     },
-    
-    /** @final @type String */
-    CLASS_NAME: "OpenLayers.Format.GML" 
 
+    CLASS_NAME: "OpenLayers.Format.GML" 
 });     
diff --git a/lib/OpenLayers/Format/GeoRSS.js b/lib/OpenLayers/Format/GeoRSS.js
index 888a5a5425..b0c5e02ebb 100644
--- a/lib/OpenLayers/Format/GeoRSS.js
+++ b/lib/OpenLayers/Format/GeoRSS.js
@@ -148,7 +148,5 @@ OpenLayers.Format.GeoRSS = OpenLayers.Class(OpenLayers.Format, {
         return document.createTextNode(path);
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Format.GeoRSS" 
-
 });     
diff --git a/lib/OpenLayers/Format/KML.js b/lib/OpenLayers/Format/KML.js
index 65fc62fb98..30e3b07d83 100644
--- a/lib/OpenLayers/Format/KML.js
+++ b/lib/OpenLayers/Format/KML.js
@@ -191,7 +191,5 @@ OpenLayers.Format.KML = OpenLayers.Class(OpenLayers.Format, {
         return p;
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Format.KML" 
-    
 });     
diff --git a/lib/OpenLayers/Format/WFS.js b/lib/OpenLayers/Format/WFS.js
index 0a44aa7725..813aa27e2f 100644
--- a/lib/OpenLayers/Format/WFS.js
+++ b/lib/OpenLayers/Format/WFS.js
@@ -179,7 +179,5 @@ OpenLayers.Format.WFS = OpenLayers.Class(OpenLayers.Format.GML, {
         this.layer = null;
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Format.WFS" 
-
 });    
diff --git a/lib/OpenLayers/Format/WKT.js b/lib/OpenLayers/Format/WKT.js
index e746cb2c75..c51d2891ff 100644
--- a/lib/OpenLayers/Format/WKT.js
+++ b/lib/OpenLayers/Format/WKT.js
@@ -326,7 +326,5 @@ OpenLayers.Format.WKT = OpenLayers.Class(OpenLayers.Format, {
 
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Format.WKT" 
-
 });     
diff --git a/lib/OpenLayers/Geometry.js b/lib/OpenLayers/Geometry.js
index 4aa02cfb78..108d1eb0e3 100644
--- a/lib/OpenLayers/Geometry.js
+++ b/lib/OpenLayers/Geometry.js
@@ -186,6 +186,5 @@ OpenLayers.Geometry = OpenLayers.Class({
         );
     },
 
-    /** @final @type String*/
     CLASS_NAME: "OpenLayers.Geometry"
 });
diff --git a/lib/OpenLayers/Geometry/Curve.js b/lib/OpenLayers/Geometry/Curve.js
index 986a92aa9f..09e0c1ae3f 100644
--- a/lib/OpenLayers/Geometry/Curve.js
+++ b/lib/OpenLayers/Geometry/Curve.js
@@ -49,7 +49,6 @@ OpenLayers.Geometry.Curve = OpenLayers.Class(OpenLayers.Geometry.MultiPoint, {
         }
         return length;
     },
-    
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Geometry.Curve"
 });
diff --git a/lib/OpenLayers/Geometry/LineString.js b/lib/OpenLayers/Geometry/LineString.js
index 6d747e6bc6..06e92354d7 100644
--- a/lib/OpenLayers/Geometry/LineString.js
+++ b/lib/OpenLayers/Geometry/LineString.js
@@ -41,7 +41,6 @@ OpenLayers.Geometry.LineString = OpenLayers.Class(OpenLayers.Geometry.Curve, {
                                                                   arguments);
         }
     },
-       
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Geometry.LineString"
 });
diff --git a/lib/OpenLayers/Geometry/LinearRing.js b/lib/OpenLayers/Geometry/LinearRing.js
index 0174c2a588..66f9fa15e1 100644
--- a/lib/OpenLayers/Geometry/LinearRing.js
+++ b/lib/OpenLayers/Geometry/LinearRing.js
@@ -131,6 +131,5 @@ OpenLayers.Geometry.LinearRing = OpenLayers.Class(
         return area;
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Geometry.LinearRing"
 });
diff --git a/lib/OpenLayers/Geometry/MultiLineString.js b/lib/OpenLayers/Geometry/MultiLineString.js
index a609c237c2..87c071693d 100644
--- a/lib/OpenLayers/Geometry/MultiLineString.js
+++ b/lib/OpenLayers/Geometry/MultiLineString.js
@@ -37,6 +37,5 @@ OpenLayers.Geometry.MultiLineString = OpenLayers.Class(
                                                                   arguments);        
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Geometry.MultiLineString"
 });
diff --git a/lib/OpenLayers/Geometry/MultiPoint.js b/lib/OpenLayers/Geometry/MultiPoint.js
index aeda64e235..668dbaa839 100644
--- a/lib/OpenLayers/Geometry/MultiPoint.js
+++ b/lib/OpenLayers/Geometry/MultiPoint.js
@@ -62,6 +62,5 @@ OpenLayers.Geometry.MultiPoint = OpenLayers.Class(
         this.removeComponent(point);
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Geometry.MultiPoint"
 });
diff --git a/lib/OpenLayers/Geometry/MultiPolygon.js b/lib/OpenLayers/Geometry/MultiPolygon.js
index 20e2e2fec7..328dfea4e5 100644
--- a/lib/OpenLayers/Geometry/MultiPolygon.js
+++ b/lib/OpenLayers/Geometry/MultiPolygon.js
@@ -37,7 +37,6 @@ OpenLayers.Geometry.MultiPolygon = OpenLayers.Class(
         OpenLayers.Geometry.Collection.prototype.initialize.apply(this, 
                                                                   arguments);
     },
-    
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Geometry.MultiPolygon"
 });
diff --git a/lib/OpenLayers/Geometry/Point.js b/lib/OpenLayers/Geometry/Point.js
index 9869a9fd3a..77465bfa86 100644
--- a/lib/OpenLayers/Geometry/Point.js
+++ b/lib/OpenLayers/Geometry/Point.js
@@ -163,6 +163,5 @@ OpenLayers.Geometry.Point = OpenLayers.Class(OpenLayers.Geometry, {
         this.y = origin.y + (scale * (this.y - origin.y));
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Geometry.Point"
 });
diff --git a/lib/OpenLayers/Geometry/Polygon.js b/lib/OpenLayers/Geometry/Polygon.js
index f00d57ff83..48abeda150 100644
--- a/lib/OpenLayers/Geometry/Polygon.js
+++ b/lib/OpenLayers/Geometry/Polygon.js
@@ -57,6 +57,5 @@ OpenLayers.Geometry.Polygon = OpenLayers.Class(
         return area;
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Geometry.Polygon"
 });
diff --git a/lib/OpenLayers/Geometry/Rectangle.js b/lib/OpenLayers/Geometry/Rectangle.js
index 70b522ff41..a8519fc415 100644
--- a/lib/OpenLayers/Geometry/Rectangle.js
+++ b/lib/OpenLayers/Geometry/Rectangle.js
@@ -89,6 +89,5 @@ OpenLayers.Geometry.Rectangle = OpenLayers.Class(OpenLayers.Geometry, {
         return area;
     },    
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Geometry.Rectangle"
 });
diff --git a/lib/OpenLayers/Geometry/Surface.js b/lib/OpenLayers/Geometry/Surface.js
index 699a58f863..c635118a9b 100644
--- a/lib/OpenLayers/Geometry/Surface.js
+++ b/lib/OpenLayers/Geometry/Surface.js
@@ -17,6 +17,5 @@ OpenLayers.Geometry.Surface = OpenLayers.Class(OpenLayers.Geometry, {
         OpenLayers.Geometry.prototype.initialize.apply(this, arguments);
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Geometry.Surface"
 });
diff --git a/lib/OpenLayers/Handler.js b/lib/OpenLayers/Handler.js
index 62d69d066a..6a47ecc0d8 100644
--- a/lib/OpenLayers/Handler.js
+++ b/lib/OpenLayers/Handler.js
@@ -218,7 +218,6 @@ OpenLayers.Handler = OpenLayers.Class({
         this.control = this.map = null;
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Handler"
 });
 
diff --git a/lib/OpenLayers/Handler/Drag.js b/lib/OpenLayers/Handler/Drag.js
index 1942494a62..9b815da34b 100644
--- a/lib/OpenLayers/Handler/Drag.js
+++ b/lib/OpenLayers/Handler/Drag.js
@@ -223,6 +223,5 @@ OpenLayers.Handler.Drag = OpenLayers.Class(OpenLayers.Handler, {
         }
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Handler.Drag"
 });
diff --git a/lib/OpenLayers/Handler/Feature.js b/lib/OpenLayers/Handler/Feature.js
index 17a74cc712..0769d58a89 100644
--- a/lib/OpenLayers/Handler/Feature.js
+++ b/lib/OpenLayers/Handler/Feature.js
@@ -161,6 +161,5 @@ OpenLayers.Handler.Feature = OpenLayers.Class(OpenLayers.Handler, {
         }
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Handler.Feature"
 });
diff --git a/lib/OpenLayers/Handler/Keyboard.js b/lib/OpenLayers/Handler/Keyboard.js
index 57bdcd7aaa..8c4f09fd8f 100644
--- a/lib/OpenLayers/Handler/Keyboard.js
+++ b/lib/OpenLayers/Handler/Keyboard.js
@@ -87,6 +87,5 @@ OpenLayers.Handler.Keyboard = OpenLayers.Class(OpenLayers.Handler, {
         }
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Handler.Keyboard"
 });
diff --git a/lib/OpenLayers/Handler/MouseWheel.js b/lib/OpenLayers/Handler/MouseWheel.js
index 2895f2b306..3e932df3e1 100644
--- a/lib/OpenLayers/Handler/MouseWheel.js
+++ b/lib/OpenLayers/Handler/MouseWheel.js
@@ -153,6 +153,5 @@ OpenLayers.Handler.MouseWheel = OpenLayers.Class(OpenLayers.Handler, {
         }
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Handler.MouseWheel"
 });
diff --git a/lib/OpenLayers/Handler/Path.js b/lib/OpenLayers/Handler/Path.js
index 6d3f31c6ed..4c0dcd91da 100644
--- a/lib/OpenLayers/Handler/Path.js
+++ b/lib/OpenLayers/Handler/Path.js
@@ -237,7 +237,6 @@ OpenLayers.Handler.Path = OpenLayers.Class(OpenLayers.Handler.Point, {
         }
         return false;
     },
-    
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Handler.Path"
 });
diff --git a/lib/OpenLayers/Handler/Point.js b/lib/OpenLayers/Handler/Point.js
index ddcce71cfc..e7e0c49740 100644
--- a/lib/OpenLayers/Handler/Point.js
+++ b/lib/OpenLayers/Handler/Point.js
@@ -261,6 +261,5 @@ OpenLayers.Handler.Point = OpenLayers.Class(OpenLayers.Handler, {
         }
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Handler.Point"
 });
diff --git a/lib/OpenLayers/Handler/Polygon.js b/lib/OpenLayers/Handler/Polygon.js
index 9b9c7626bb..cd93ba7137 100644
--- a/lib/OpenLayers/Handler/Polygon.js
+++ b/lib/OpenLayers/Handler/Polygon.js
@@ -117,6 +117,5 @@ OpenLayers.Handler.Polygon = OpenLayers.Class(OpenLayers.Handler.Path, {
         return false;
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Handler.Polygon"
 });
diff --git a/lib/OpenLayers/Icon.js b/lib/OpenLayers/Icon.js
index 0097a685a7..05be45ce1b 100644
--- a/lib/OpenLayers/Icon.js
+++ b/lib/OpenLayers/Icon.js
@@ -178,7 +178,6 @@ OpenLayers.Icon = OpenLayers.Class({
     display: function(display) {
         this.imageDiv.style.display = (display) ? "" : "none"; 
     },
-    
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Icon"
 });
diff --git a/lib/OpenLayers/Layer.js b/lib/OpenLayers/Layer.js
index 1bfd21dea5..ef21091955 100644
--- a/lib/OpenLayers/Layer.js
+++ b/lib/OpenLayers/Layer.js
@@ -857,6 +857,5 @@ OpenLayers.Layer = OpenLayers.Class({
         return bounds;
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Layer"
 });
diff --git a/lib/OpenLayers/Layer/Boxes.js b/lib/OpenLayers/Layer/Boxes.js
index 268fc6cb2f..ba252a112e 100644
--- a/lib/OpenLayers/Layer/Boxes.js
+++ b/lib/OpenLayers/Layer/Boxes.js
@@ -69,6 +69,5 @@ OpenLayers.Layer.Boxes = OpenLayers.Class(OpenLayers.Layer.Markers, {
         }
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Layer.Boxes"
 });
diff --git a/lib/OpenLayers/Layer/EventPane.js b/lib/OpenLayers/Layer/EventPane.js
index d5fc5986ee..a41af98efe 100644
--- a/lib/OpenLayers/Layer/EventPane.js
+++ b/lib/OpenLayers/Layer/EventPane.js
@@ -375,6 +375,5 @@ OpenLayers.Layer.EventPane = OpenLayers.Class(OpenLayers.Layer, {
         return moPixel;
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Layer.EventPane"
 });
diff --git a/lib/OpenLayers/Layer/FixedZoomLevels.js b/lib/OpenLayers/Layer/FixedZoomLevels.js
index 1a3a2fc634..6ca092a191 100644
--- a/lib/OpenLayers/Layer/FixedZoomLevels.js
+++ b/lib/OpenLayers/Layer/FixedZoomLevels.js
@@ -245,8 +245,6 @@ OpenLayers.Layer.FixedZoomLevels = OpenLayers.Class({
         return zoom;
     },
 
-
-    /** @final @type String */
     CLASS_NAME: "FixedZoomLevels.js"
 });
 
diff --git a/lib/OpenLayers/Layer/GML.js b/lib/OpenLayers/Layer/GML.js
index 34081305f2..778ccdb80c 100644
--- a/lib/OpenLayers/Layer/GML.js
+++ b/lib/OpenLayers/Layer/GML.js
@@ -127,6 +127,5 @@ OpenLayers.Layer.GML = OpenLayers.Class(OpenLayers.Layer.Vector, {
         alert("Error in loading GML file "+this.url);
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Layer.GML"
-    });
+});
diff --git a/lib/OpenLayers/Layer/Google.js b/lib/OpenLayers/Layer/Google.js
index fa76eeb4ed..ebaa89fda5 100644
--- a/lib/OpenLayers/Layer/Google.js
+++ b/lib/OpenLayers/Layer/Google.js
@@ -447,6 +447,5 @@ OpenLayers.Layer.Google = OpenLayers.Class(OpenLayers.Layer.EventPane,
         return new GPoint(x, y);
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Layer.Google"
 });
diff --git a/lib/OpenLayers/Layer/Grid.js b/lib/OpenLayers/Layer/Grid.js
index 6aecd905dd..6aa1856a45 100644
--- a/lib/OpenLayers/Layer/Grid.js
+++ b/lib/OpenLayers/Layer/Grid.js
@@ -650,6 +650,5 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
         }
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Layer.Grid"
 });
diff --git a/lib/OpenLayers/Layer/HTTPRequest.js b/lib/OpenLayers/Layer/HTTPRequest.js
index caf23ae964..6063ffa934 100644
--- a/lib/OpenLayers/Layer/HTTPRequest.js
+++ b/lib/OpenLayers/Layer/HTTPRequest.js
@@ -209,6 +209,5 @@ OpenLayers.Layer.HTTPRequest = OpenLayers.Class(OpenLayers.Layer, {
         return requestString;
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Layer.HTTPRequest"
 });
diff --git a/lib/OpenLayers/Layer/Image.js b/lib/OpenLayers/Layer/Image.js
index eee88265c2..1553200307 100644
--- a/lib/OpenLayers/Layer/Image.js
+++ b/lib/OpenLayers/Layer/Image.js
@@ -201,7 +201,6 @@ OpenLayers.Layer.Image = OpenLayers.Class(OpenLayers.Layer, {
     getURL: function(bounds) {
         return this.url;
     },
-        
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Layer.Image"
 });
diff --git a/lib/OpenLayers/Layer/KaMap.js b/lib/OpenLayers/Layer/KaMap.js
index c294a72952..9edfbfdeca 100644
--- a/lib/OpenLayers/Layer/KaMap.js
+++ b/lib/OpenLayers/Layer/KaMap.js
@@ -226,6 +226,5 @@ OpenLayers.Layer.KaMap = OpenLayers.Class(OpenLayers.Layer.Grid, {
         return obj;
     },    
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Layer.KaMap"
 });
diff --git a/lib/OpenLayers/Layer/MapServer.js b/lib/OpenLayers/Layer/MapServer.js
index 7665b19998..0bf04a8aff 100644
--- a/lib/OpenLayers/Layer/MapServer.js
+++ b/lib/OpenLayers/Layer/MapServer.js
@@ -190,7 +190,6 @@ OpenLayers.Layer.MapServer = OpenLayers.Class(OpenLayers.Layer.Grid, {
         }
         return requestString;
     },
-    
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Layer.MapServer"
 });
diff --git a/lib/OpenLayers/Layer/Markers.js b/lib/OpenLayers/Layer/Markers.js
index 91373ab417..f70b01bcb9 100644
--- a/lib/OpenLayers/Layer/Markers.js
+++ b/lib/OpenLayers/Layer/Markers.js
@@ -139,7 +139,6 @@ OpenLayers.Layer.Markers = OpenLayers.Class(OpenLayers.Layer, {
             }
         }
     },
-    
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Layer.Markers"
 });
diff --git a/lib/OpenLayers/Layer/MultiMap.js b/lib/OpenLayers/Layer/MultiMap.js
index 054ddb0c6c..128ffdeb16 100644
--- a/lib/OpenLayers/Layer/MultiMap.js
+++ b/lib/OpenLayers/Layer/MultiMap.js
@@ -255,6 +255,5 @@ OpenLayers.Layer.MultiMap = OpenLayers.Class(
         return new MMPoint(x, y);
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Layer.MultiMap"
 });
diff --git a/lib/OpenLayers/Layer/TMS.js b/lib/OpenLayers/Layer/TMS.js
index d3c3c2fd52..ce29ebfa50 100644
--- a/lib/OpenLayers/Layer/TMS.js
+++ b/lib/OpenLayers/Layer/TMS.js
@@ -136,6 +136,5 @@ OpenLayers.Layer.TMS = OpenLayers.Class(OpenLayers.Layer.Grid, {
         }                                       
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Layer.TMS"
 });
diff --git a/lib/OpenLayers/Layer/Text.js b/lib/OpenLayers/Layer/Text.js
index 254b3024d0..9072030d36 100644
--- a/lib/OpenLayers/Layer/Text.js
+++ b/lib/OpenLayers/Layer/Text.js
@@ -181,8 +181,7 @@ OpenLayers.Layer.Text = OpenLayers.Class(OpenLayers.Layer.Markers, {
             }
         }        
     },
-    
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Layer.Text"
 });
      
diff --git a/lib/OpenLayers/Layer/Vector.js b/lib/OpenLayers/Layer/Vector.js
index 2ecaf5e9a8..01146150bc 100644
--- a/lib/OpenLayers/Layer/Vector.js
+++ b/lib/OpenLayers/Layer/Vector.js
@@ -429,6 +429,5 @@ OpenLayers.Layer.Vector = OpenLayers.Class(OpenLayers.Layer, {
     preFeatureInsert: function(feature) {
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Layer.Vector"
 });
diff --git a/lib/OpenLayers/Layer/VirtualEarth.js b/lib/OpenLayers/Layer/VirtualEarth.js
index 87cafdae36..f0d4beb7fc 100644
--- a/lib/OpenLayers/Layer/VirtualEarth.js
+++ b/lib/OpenLayers/Layer/VirtualEarth.js
@@ -269,6 +269,5 @@ OpenLayers.Layer.VirtualEarth = OpenLayers.Class(
         return new Msn.VE.Pixel(x, y);
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Layer.VirtualEarth"
 });
diff --git a/lib/OpenLayers/Layer/WFS.js b/lib/OpenLayers/Layer/WFS.js
index be91c26583..cdbe4d7ff2 100644
--- a/lib/OpenLayers/Layer/WFS.js
+++ b/lib/OpenLayers/Layer/WFS.js
@@ -391,7 +391,6 @@ OpenLayers.Layer.WFS = OpenLayers.Class(
             this.tile.draw();
         }
     },
-    
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Layer.WFS"
 });
diff --git a/lib/OpenLayers/Layer/WMS.js b/lib/OpenLayers/Layer/WMS.js
index 3684d9f8bf..8719e072bc 100644
--- a/lib/OpenLayers/Layer/WMS.js
+++ b/lib/OpenLayers/Layer/WMS.js
@@ -204,7 +204,6 @@ OpenLayers.Layer.WMS = OpenLayers.Class(OpenLayers.Layer.Grid, {
         return OpenLayers.Layer.Grid.prototype.getFullRequestString.apply(
                                                     this, arguments);
     },
-    
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Layer.WMS"
 });
diff --git a/lib/OpenLayers/Layer/WMS/Untiled.js b/lib/OpenLayers/Layer/WMS/Untiled.js
index 4beeca61e6..34638ea4b7 100644
--- a/lib/OpenLayers/Layer/WMS/Untiled.js
+++ b/lib/OpenLayers/Layer/WMS/Untiled.js
@@ -39,7 +39,6 @@ OpenLayers.Layer.WMS.Untiled = OpenLayers.Class(OpenLayers.Layer.WMS, {
                   "'singleTile' as true.";
         OpenLayers.Console.warn(msg);
     },    
-    
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Layer.WMS.Untiled"
 });
diff --git a/lib/OpenLayers/Layer/WorldWind.js b/lib/OpenLayers/Layer/WorldWind.js
index 89067a4e84..99aae97b55 100644
--- a/lib/OpenLayers/Layer/WorldWind.js
+++ b/lib/OpenLayers/Layer/WorldWind.js
@@ -110,6 +110,5 @@ OpenLayers.Layer.WorldWind = OpenLayers.Class(OpenLayers.Layer.Grid, {
 
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Layer.WorldWind"
 });
diff --git a/lib/OpenLayers/Layer/Yahoo.js b/lib/OpenLayers/Layer/Yahoo.js
index 389662fc14..ab13d3ca47 100644
--- a/lib/OpenLayers/Layer/Yahoo.js
+++ b/lib/OpenLayers/Layer/Yahoo.js
@@ -337,6 +337,5 @@ OpenLayers.Layer.Yahoo = OpenLayers.Class(
         return new YCoordPoint(x, y);
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Layer.Yahoo"
 });
diff --git a/lib/OpenLayers/Marker.js b/lib/OpenLayers/Marker.js
index d5bf740efc..297cf5d864 100644
--- a/lib/OpenLayers/Marker.js
+++ b/lib/OpenLayers/Marker.js
@@ -173,8 +173,7 @@ OpenLayers.Marker = OpenLayers.Class({
     display: function(display) {
         this.icon.display(display);
     },
-    
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Marker"
 });
 
diff --git a/lib/OpenLayers/Marker/Box.js b/lib/OpenLayers/Marker/Box.js
index 2eb9be23af..1cb3e999b8 100644
--- a/lib/OpenLayers/Marker/Box.js
+++ b/lib/OpenLayers/Marker/Box.js
@@ -111,8 +111,7 @@ OpenLayers.Marker.Box = OpenLayers.Class(OpenLayers.Marker, {
     display: function(display) {
         this.div.style.display = (display) ? "" : "none";
     },
-    
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Marker.Box"
 });
 
diff --git a/lib/OpenLayers/Popup.js b/lib/OpenLayers/Popup.js
index 5634d5f0b5..a496853fdd 100644
--- a/lib/OpenLayers/Popup.js
+++ b/lib/OpenLayers/Popup.js
@@ -484,7 +484,6 @@ OpenLayers.Popup = OpenLayers.Class({
         OpenLayers.Event.stop(evt, true);
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Popup"
 });
 
diff --git a/lib/OpenLayers/Popup/Anchored.js b/lib/OpenLayers/Popup/Anchored.js
index 617fe46fc7..36430ae7e6 100644
--- a/lib/OpenLayers/Popup/Anchored.js
+++ b/lib/OpenLayers/Popup/Anchored.js
@@ -142,6 +142,5 @@ OpenLayers.Popup.Anchored = OpenLayers.Class(OpenLayers.Popup, {
         return newPx;   
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Popup.Anchored"
 });
diff --git a/lib/OpenLayers/Popup/AnchoredBubble.js b/lib/OpenLayers/Popup/AnchoredBubble.js
index ecf71e1241..1bd4344531 100644
--- a/lib/OpenLayers/Popup/AnchoredBubble.js
+++ b/lib/OpenLayers/Popup/AnchoredBubble.js
@@ -181,7 +181,6 @@ OpenLayers.Popup.AnchoredBubble = OpenLayers.Class(OpenLayers.Popup.Anchored, {
         return corners.join(" ");
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Popup.AnchoredBubble"
 });
 
diff --git a/lib/OpenLayers/Renderer.js b/lib/OpenLayers/Renderer.js
index c2c87d4724..c830394f9a 100644
--- a/lib/OpenLayers/Renderer.js
+++ b/lib/OpenLayers/Renderer.js
@@ -206,7 +206,6 @@ OpenLayers.Renderer = OpenLayers.Class({
      * geometry - {<OpenLayers.Geometry>} 
      */
     eraseGeometry: function(geometry) {},
-        
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Renderer"
 });
diff --git a/lib/OpenLayers/Renderer/Elements.js b/lib/OpenLayers/Renderer/Elements.js
index dce961f043..b18bbe5c5f 100644
--- a/lib/OpenLayers/Renderer/Elements.js
+++ b/lib/OpenLayers/Renderer/Elements.js
@@ -350,6 +350,5 @@ OpenLayers.Renderer.Elements = OpenLayers.Class(OpenLayers.Renderer, {
         return node;
     },
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Renderer.Elements"
 });
diff --git a/lib/OpenLayers/Renderer/SVG.js b/lib/OpenLayers/Renderer/SVG.js
index 87b54691d3..09a8cb1e06 100644
--- a/lib/OpenLayers/Renderer/SVG.js
+++ b/lib/OpenLayers/Renderer/SVG.js
@@ -543,7 +543,6 @@ OpenLayers.Renderer.SVG = OpenLayers.Class(OpenLayers.Renderer.Elements, {
         return string;
         
     },
-    
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Renderer.SVG"
 });
diff --git a/lib/OpenLayers/Renderer/VML.js b/lib/OpenLayers/Renderer/VML.js
index 66dca2d675..f06741d65a 100644
--- a/lib/OpenLayers/Renderer/VML.js
+++ b/lib/OpenLayers/Renderer/VML.js
@@ -551,6 +551,5 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
         node.path = path;
     },
 
-    /** @final @type String*/
     CLASS_NAME: "OpenLayers.Renderer.VML"
 });
diff --git a/lib/OpenLayers/Tile.js b/lib/OpenLayers/Tile.js
index 6a8830d66f..c64361515b 100644
--- a/lib/OpenLayers/Tile.js
+++ b/lib/OpenLayers/Tile.js
@@ -227,6 +227,5 @@ OpenLayers.Tile = OpenLayers.Class({
         return bounds;
     },        
 
-    /** @final @type String */
     CLASS_NAME: "OpenLayers.Tile"
 });
diff --git a/lib/OpenLayers/Tile/WFS.js b/lib/OpenLayers/Tile/WFS.js
index b9730a4c19..34eb91230f 100644
--- a/lib/OpenLayers/Tile/WFS.js
+++ b/lib/OpenLayers/Tile/WFS.js
@@ -145,8 +145,7 @@ OpenLayers.Tile.WFS = OpenLayers.Class(OpenLayers.Tile, {
             feature.destroy();
         }
     },
-    
-    /** @final @type String */
+
     CLASS_NAME: "OpenLayers.Tile.WFS"
   }
 );