diff --git a/RTCP/Cobalt/OutputProc/src/TBB_Dipole.cc b/RTCP/Cobalt/OutputProc/src/TBB_Dipole.cc
index 7d432cf9c91f992e3e925e3c5f1f597470c93da5..cfe774789c2fad7700eedea4a88b7f752553b762 100644
--- a/RTCP/Cobalt/OutputProc/src/TBB_Dipole.cc
+++ b/RTCP/Cobalt/OutputProc/src/TBB_Dipole.cc
@@ -634,26 +634,6 @@ namespace LOFAR
                 << offset);
         }
 
-        /**
-         * Flag lost frame(s) (assumes no out-of-order).
-         * Assumes all frames (except maybe the last) have the same nr of samples (fine).
-         * This cannot detect lost frames at the end of a dataset.
-         *
-         * TODO
-         * 2019-01-30 Thomas:
-         * Now that all out-of-order situations can be handled (but for the 0th
-         * frame not being the 0th frame), this code below is plain wrong.
-         * FIXME
-         */
-        const int64_t nskipped{offset - static_cast< int64_t >(
-            currentSubBand.currentSizeInSamples)};
-        // should be > 0, but do signed cmp to avoid crazy flagging range
-        if(nskipped > 0)
-        {
-            appendFlags(itsDumpInfo, currentSubBand.currentSizeInSamples,
-                static_cast< uint64_t >(nskipped));
-        }
-
         /**
          * On a data checksum error or all zeros, flag these samples.
          * TBB Design Doc states the crc32 is computed for transient data only,
@@ -677,13 +657,6 @@ namespace LOFAR
                 + " crc32: " + boost::lexical_cast<string>(crc32));
         }
 
-        if(hasAllZeroDataSamples(frame.payload,
-            2 * frame.header.nOfSamplesPerFrame) == true)
-        {
-            // in (complex) values
-            appendFlags(itsDumpInfo, offset, frame.header.nOfSamplesPerFrame);
-        }
-
         LOG_INFO_STR("TBB: offset in samples calculated for the HDF5 data set "
             "= "
             << offset