diff --git a/storm-client/src/jvm/org/apache/storm/topology/TopologyBuilder.java b/storm-client/src/jvm/org/apache/storm/topology/TopologyBuilder.java
index 63384df..c14d6fb 100644
--- a/storm-client/src/jvm/org/apache/storm/topology/TopologyBuilder.java
+++ b/storm-client/src/jvm/org/apache/storm/topology/TopologyBuilder.java
@@ -473,15 +473,6 @@
         return setSpout(id, new LambdaSpout(supplier), parallelismHint);
     }
 
-    public void setStateSpout(String id, IRichStateSpout stateSpout) throws IllegalArgumentException {
-        setStateSpout(id, stateSpout, null);
-    }
-
-    public void setStateSpout(String id, IRichStateSpout stateSpout, Number parallelismHint) throws IllegalArgumentException {
-        validateUnusedId(id);
-        // TODO: finish
-    }
-
     /**
      * Add a new worker lifecycle hook.
      *
diff --git a/storm-client/test/jvm/org/apache/storm/topology/TopologyBuilderTest.java b/storm-client/test/jvm/org/apache/storm/topology/TopologyBuilderTest.java
index 3e8a86d..47fe12f 100644
--- a/storm-client/test/jvm/org/apache/storm/topology/TopologyBuilderTest.java
+++ b/storm-client/test/jvm/org/apache/storm/topology/TopologyBuilderTest.java
@@ -51,12 +51,6 @@
         builder.addWorkerHook(null);
     }
 
-    // TODO enable if setStateSpout gets implemented
-    //    @Test(expected = IllegalArgumentException.class)
-    //    public void testSetStateSpout() {
-    //        builder.setStateSpout("stateSpout", mock(IRichStateSpout.class), 0);
-    //    }
-
     @Test
     public void testStatefulTopology() {
         builder.setSpout("spout1", makeDummySpout());