diff --git a/include/channelimpl.h b/include/channelimpl.h
index 3d77fc2..21ee2af 100644
--- a/include/channelimpl.h
+++ b/include/channelimpl.h
@@ -431,8 +431,6 @@ public:
 
     /**
      *  Report to the handler that the channel is opened
-     * 
-     *  @todo when is this sent?
      */
     void reportReady()
     {
@@ -442,18 +440,14 @@ public:
 
     /**
      *  Report to the handler that the channel is closed
-     * 
-     *  @todo do we need this?
      */
     void reportClosed()
     {
         // change state
         _state = state_closed;
 
-        // inform handler
-        
-        // @todo do we report success here?
-        
+        // and pass on to the reportSuccess() method which will call the
+        // appropriate deferred object to report the successful operation
         reportSuccess();
     }
 
diff --git a/src/channelimpl.cpp b/src/channelimpl.cpp
index 31cbec1..f699692 100644
--- a/src/channelimpl.cpp
+++ b/src/channelimpl.cpp
@@ -105,8 +105,6 @@ Deferred &ChannelImpl::push(Deferred *deferred)
     // store newest callback
     _newestCallback = deferred;
     
-    // @todo in case of error we have to report the error with a timeout
-    
     // done
     return *deferred;
 }