diff --git a/oscar/SleepLib/machine_common.cpp b/oscar/SleepLib/machine_common.cpp
index dc677d74..ecc1b561 100644
--- a/oscar/SleepLib/machine_common.cpp
+++ b/oscar/SleepLib/machine_common.cpp
@@ -21,7 +21,7 @@ ChannelID CPAP_IPAP, CPAP_IPAPLo, CPAP_IPAPHi, CPAP_EPAP, CPAP_EPAPLo, CPAP_EPAP
           CPAP_MaskPressureHi,
           CPAP_RespEvent, CPAP_Snore, CPAP_MinuteVent, CPAP_RespRate, CPAP_TidalVolume, CPAP_PTB, CPAP_Leak,
           CPAP_LeakMedian, CPAP_LeakTotal, CPAP_MaxLeak, CPAP_FLG, CPAP_IE, CPAP_Te, CPAP_Ti, CPAP_TgMV,
-          CPAP_UserFlag1, CPAP_UserFlag2, CPAP_UserFlag3, CPAP_BrokenSummary, CPAP_BrokenWaveform, CPAP_RDI,
+          CPAP_UserFlag1, CPAP_UserFlag2, CPAP_UserFlag3, /*CPAP_BrokenSummary, CPAP_BrokenWaveform,*/ CPAP_RDI,
           CPAP_PresReliefMode, CPAP_PresReliefLevel, CPAP_PSMin, CPAP_PSMax, CPAP_Test1,
           CPAP_Test2, CPAP_HumidSetting,
           CPAP_PressureSet, CPAP_IPAPSet, CPAP_EPAPSet;
diff --git a/oscar/SleepLib/machine_common.h b/oscar/SleepLib/machine_common.h
index 7bd77371..c2c46883 100644
--- a/oscar/SleepLib/machine_common.h
+++ b/oscar/SleepLib/machine_common.h
@@ -152,7 +152,7 @@ extern ChannelID CPAP_IPAP, CPAP_IPAPLo, CPAP_IPAPHi, CPAP_EPAP, CPAP_EPAPLo, CP
        CPAP_MaskPressureHi,
        CPAP_RespEvent, CPAP_Snore, CPAP_MinuteVent, CPAP_RespRate, CPAP_TidalVolume, CPAP_PTB, CPAP_Leak,
        CPAP_LeakMedian, CPAP_LeakTotal, CPAP_MaxLeak, CPAP_FLG, CPAP_IE, CPAP_Te, CPAP_Ti, CPAP_TgMV,
-       CPAP_UserFlag1, CPAP_UserFlag2, CPAP_UserFlag3, CPAP_BrokenSummary, CPAP_BrokenWaveform, CPAP_RDI,
+       CPAP_UserFlag1, CPAP_UserFlag2, CPAP_UserFlag3, /*CPAP_BrokenSummary, CPAP_BrokenWaveform,*/ CPAP_RDI,
        CPAP_PresReliefMode, CPAP_PresReliefLevel, CPAP_Test1, CPAP_Test2,
        CPAP_PressureSet, CPAP_IPAPSet, CPAP_EPAPSet;
 
diff --git a/oscar/SleepLib/schema.cpp b/oscar/SleepLib/schema.cpp
index 69f5bc1e..506262b1 100644
--- a/oscar/SleepLib/schema.cpp
+++ b/oscar/SleepLib/schema.cpp
@@ -332,8 +332,10 @@ void init()
     schema::channel.add(GRP_SLEEP, ch = new Channel(ZEO_ZQ         = 0x2009, DATA,   MT_SLEEPSTAGE,  SESSION, "ZeoZQ", QObject::tr("Zeo ZQ"), QObject::tr("Zeo sleep quality measurement"), QObject::tr("ZEO ZQ"),  QString(), INTEGER,  Qt::black));
 
     NoChannel = 0;
+    /*
     CPAP_BrokenSummary = schema::channel["BrokenSummary"].id();
     CPAP_BrokenWaveform = schema::channel["BrokenWaveform"].id();
+    */
 
 //  <channel id="0x111e" class="data" name="TestChan1" details="Debugging Channel #1" label="Test #1" unit="" color="pink"/>
 //  <channel id="0x111f" class="data" name="TestChan2" details="Debugging Channel #2" label="Test #2" unit="" color="blue"/>
diff --git a/oscar/daily.cpp b/oscar/daily.cpp
index 99965ad4..b93d9112 100644
--- a/oscar/daily.cpp
+++ b/oscar/daily.cpp
@@ -983,7 +983,7 @@ QString Daily::getSessionInformation(Day * day)
  //   Machine * cpap = day->machine(MT_CPAP);
 
     QDateTime fd,ld;
-    bool corrupted_waveform=false;
+    //bool corrupted_waveform=false;
 
     QString type;
 
@@ -1023,9 +1023,11 @@ QString Daily::getSessionInformation(Day * day)
         QList<Session *> sesslist = day->getSessions(mi.key(), true);
 
         for (QList<Session *>::iterator s=sesslist.begin(); s != sesslist.end(); ++s) {
+            /*
             if (((*s)->type() == MT_CPAP) &&
                 ((*s)->settings.find(CPAP_BrokenWaveform) != (*s)->settings.end()))
                     corrupted_waveform=true;
+            */
 
             fd=QDateTime::fromTime_t((*s)->first()/1000L);
             ld=QDateTime::fromTime_t((*s)->last()/1000L);
@@ -1066,9 +1068,11 @@ QString Daily::getSessionInformation(Day * day)
         }
     }
 
+    /*
     if (corrupted_waveform) {
         html+=QString("<tr><td colspan=5 align=center><i>%1</i></td></tr>").arg(tr("One or more waveform record(s) for this session had faulty source data. Some waveform overlay points may not match up correctly."));
     }
+    */
     html+="</table>";
     return html;
 }
@@ -1084,9 +1088,11 @@ QString Daily::getMachineSettings(Day * day) {
 
         if (day->noSettings(cpap)) {
             html+="<tr><td colspan=5 align=center><i>"+tr("<b>Please Note:</b> All settings shown below are based on assumptions that nothing has changed since previous days.")+"</i></td></tr>\n";
+        /*
         } else if ((day->settingExists(CPAP_BrokenSummary))) {
             html+="<tr><td colspan=5 align=center><i>"+tr("Machine Settings Unavailable")+"</i></td></tr></table><hr/>\n";
             return html;
+        */
         }
 
         QMap<QString, QString> other;
diff --git a/oscar/docs/channels.xml b/oscar/docs/channels.xml
index e6899dc0..cdf27778 100644
--- a/oscar/docs/channels.xml
+++ b/oscar/docs/channels.xml
@@ -14,9 +14,6 @@ Important: One id code per item, DO NOT CHANGE ID NUMBERS!!!
   <channel id="0x1160" class="data" name="RMS9_E01" details="RMS9 Empty 1" label="E01" unit="" color="black"/>
   <channel id="0x1161" class="data" name="RMS9_E02" details="RMS9 Empty 2" label="E02" unit="" color="black"/>
   <channel id="0x1162" class="data" name="SetPressure" details="Set Pressure" label="Pressure" unit="" color="black"/>
-  <channel id="0x1163" class="data" name="BrokenSummary" details="Broken Summary" label="Broken Summary" unit="" color="black"/>
-  <channel id="0x1164" class="data" name="BrokenWaveform" details="Broken Waveform" label="Broken Waveform" unit="" color="black"/>
-
   <channel id="0x1166" class="data" name="PRS1_0F" details="Unknown 0F" label="U0F" unit="?" color="dark green"/>
   <channel id="0x1167" class="data" name="IntUnk1" details="Unknown 1" label="Unknown 1" unit="?" color="dark green"/>
   <channel id="0x1168" class="data" name="IntUnk2" details="Unknown 2" label="Unknown 2" unit="?" color="dark green"/>
diff --git a/oscar/tests/sessiontests.cpp b/oscar/tests/sessiontests.cpp
index b4f38e84..e9abdc9f 100644
--- a/oscar/tests/sessiontests.cpp
+++ b/oscar/tests/sessiontests.cpp
@@ -84,7 +84,6 @@ static QString settingChannel(ChannelID i)
         CHANNELNAME(CPAP_RespRate);
         CHANNELNAME(CPAP_TidalVolume);
         CHANNELNAME(OXI_Pulse);
-        CHANNELNAME(CPAP_BrokenSummary);  // TODO: possibly obsolete and unused
         // PRS1-specific channels
         CHANNELNAME(PRS1_FlexMode);
         CHANNELNAME(PRS1_FlexLevel);