diff --git a/applications/osgconv/osgconv.cpp b/applications/osgconv/osgconv.cpp
index cb366556b..5aaa614b7 100644
--- a/applications/osgconv/osgconv.cpp
+++ b/applications/osgconv/osgconv.cpp
@@ -373,16 +373,6 @@ public:
             ++_numStateSetRemoved;
         }
 
-        for(unsigned int i=0;i<node.getNumDrawables();++i)
-        {
-            osg::Drawable* drawable = node.getDrawable(i);
-            if (drawable && drawable->getStateSet())
-            {
-                drawable->setStateSet(0);
-                ++_numStateSetRemoved;
-            }
-        }
-
         traverse(node);
     }
 
diff --git a/examples/osganalysis/osganalysis.cpp b/examples/osganalysis/osganalysis.cpp
index 551712a31..d4df072d3 100644
--- a/examples/osganalysis/osganalysis.cpp
+++ b/examples/osganalysis/osganalysis.cpp
@@ -56,18 +56,7 @@ public:
         traverse(node);
     }
 
-    void apply(osg::Geode& node)
-    {
-        if (!_useStateSets && node.getStateSet()) node.setStateSet(0);
-        for(unsigned int i = 0; i<node.getNumDrawables(); ++i)
-        {
-            process(*node.getDrawable(i));
-        }
-
-        traverse(node);
-    }
-
-    void process(osg::Drawable& drawable)
+    void apply(osg::Drawable& drawable)
     {
         if (!_useStateSets && drawable.getStateSet())
         {