diff --git a/src/plotmanager.cpp b/src/plotmanager.cpp
--- a/src/plotmanager.cpp
+++ b/src/plotmanager.cpp
@@ -479,7 +479,6 @@ void PlotManager::setXAxis(bool asIndex,
     _xMax = xMax;
     for (auto curve : curves)
     {
-        // TODO: what happens when addCurve(QVector) is used?
         FrameBufferSeries* series = static_cast<FrameBufferSeries*>(curve->data());
         series->setXAxis(asIndex, xMin, xMax);
     }
diff --git a/src/stream.cpp b/src/stream.cpp
--- a/src/stream.cpp
+++ b/src/stream.cpp
@@ -48,8 +48,11 @@ Stream::Stream(unsigned nc, bool x, unsi
 
 Stream::~Stream()
 {
-    // TODO: notify deletion
-    // TODO: delete channels
+    for (auto ch : channels)
+    {
+        delete ch;
+    }
+    delete xData;
 }
 
 bool Stream::hasX() const
@@ -132,7 +135,7 @@ void Stream::setNumChannels(unsigned nc,
     if (nc != oldNum)
     {
         _infoModel.setNumOfChannels(nc);
-        // TODO: how abut X change?
+        // TODO: how about X change?
         emit numChannelsChanged(nc);
     }