Index: /OpenSceneGraph/trunk/include/osgUtil/RenderBin
===================================================================
--- /OpenSceneGraph/trunk/include/osgUtil/RenderBin (revision 10275)
+++ /OpenSceneGraph/trunk/include/osgUtil/RenderBin (revision 11202)
@@ -170,24 +170,4 @@
 };
 
-/** Proxy class for automatic registration of renderbins with the RenderBin prototypelist.*/
-class RegisterRenderBinProxy
-{
-    public:
-        RegisterRenderBinProxy(const std::string& binName,RenderBin* proto)
-        {
-            _rb = proto;
-            RenderBin::addRenderBinPrototype(binName,_rb.get());
-        }
-
-        ~RegisterRenderBinProxy()
-        {
-            RenderBin::removeRenderBinPrototype(_rb.get());
-        }
-        
-    protected:
-        osg::ref_ptr<RenderBin> _rb;
-};
-
-
 }
 
Index: /OpenSceneGraph/trunk/src/osgUtil/RenderBin.cpp
===================================================================
--- /OpenSceneGraph/trunk/src/osgUtil/RenderBin.cpp (revision 10504)
+++ /OpenSceneGraph/trunk/src/osgUtil/RenderBin.cpp (revision 11202)
@@ -31,14 +31,19 @@
 {
     public:
-        RenderBinPrototypeList() {}
+        RenderBinPrototypeList()
+        {
+            add("RenderBin",new RenderBin(RenderBin::getDefaultRenderBinSortMode()));
+            add("StateSortedBin",new RenderBin(RenderBin::SORT_BY_STATE));
+            add("DepthSortedBin",new RenderBin(RenderBin::SORT_BACK_TO_FRONT));
+            add("TraversalOrderBin",new RenderBin(RenderBin::TRAVERSAL_ORDER));
+        }
+
+        void add(const std::string& name, RenderBin* bin)
+        {
+            (*this)[name] = bin;
+        }
+
         ~RenderBinPrototypeList() {}
 };
-
-// register a RenderStage prototype with the RenderBin prototype list.
-RegisterRenderBinProxy s_registerRenderBinProxy("RenderBin",new RenderBin(RenderBin::getDefaultRenderBinSortMode()));
-RegisterRenderBinProxy s_registerStateSortedBinProxy("StateSortedBin",new RenderBin(RenderBin::SORT_BY_STATE));
-RegisterRenderBinProxy s_registerDepthSortedBinProxy("DepthSortedBin",new RenderBin(RenderBin::SORT_BACK_TO_FRONT));
-RegisterRenderBinProxy s_registerTraversalOrderProxy("TraversalOrderBin",new RenderBin(RenderBin::TRAVERSAL_ORDER));
-
 
 static RenderBinPrototypeList* renderBinPrototypeList()
Index: /OpenSceneGraph/trunk/src/osg/Geometry.cpp
===================================================================
--- /OpenSceneGraph/trunk/src/osg/Geometry.cpp (revision 10874)
+++ /OpenSceneGraph/trunk/src/osg/Geometry.cpp (revision 11202)
@@ -536,12 +536,4 @@
 bool Geometry::computeFastPathsUsed()
 {
-    static bool s_DisableFastPathInDisplayLists = getenv("OSG_DISABLE_FAST_PATH_IN_DISPLAY_LISTS")!=0;
-    if (_useDisplayList && s_DisableFastPathInDisplayLists)
-    {
-        osg::notify(osg::DEBUG_INFO)<<"Geometry::computeFastPathsUsed() - Disabling fast paths in display lists"<<std::endl;
-        _supportsVertexBufferObjects = _fastPath = false;
-        return _fastPath;
-    }
-
     ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     //
Index: /OpenSceneGraph/trunk/src/osg/DisplaySettings.cpp
===================================================================
--- /OpenSceneGraph/trunk/src/osg/DisplaySettings.cpp (revision 10774)
+++ /OpenSceneGraph/trunk/src/osg/DisplaySettings.cpp (revision 11202)
@@ -608,5 +608,2 @@
 
 }
-
-
-