diff --git a/NEW_FEATURES.txt b/NEW_FEATURES.txt
index 3552c764..5aa62e96 100644
--- a/NEW_FEATURES.txt
+++ b/NEW_FEATURES.txt
@@ -14,13 +14,6 @@ Minor cleanup to the Standard skin:
  - make the info section easier to grok with a structured layout, perhaps
     similar to weather display or cumulus default templates
 
-Add hardware model as weewx.conf option for all drivers that cannot get the
-info from the hardware (everything other than vantage?)
-                    
-The weewx service would support dependencies or, at least, be grouped into
-like services. This would make it easier to install new services by
-3rd parties.
-
 Offer tags to support JSON. In particular, vectors. A tag like
 $day.outTemp.vector would offer a vector of temperatures for the day.
 Aggregation would be nice.
diff --git a/TODO.txt b/TODO.txt
index bb8a9754..41d3aa47 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,22 +1,3 @@
 TODO before the next release:
 
-resolve the updating of the forecast module.  putting forecast.py in the user
-directory means that it does not get updated by setup.py, but it does get
-updated by rpm and deb.  either move it into bin/weewx or modify setup.py
-to explicitly update forecast.py
-
-Sign the rpm and deb packages?
-N
-Include the following uploaders in 2.6?:
- - emoncms (emoncms.org)
- - seg (smart energy groups)
- - pachube (aka cosm, aka xively)
- - weatherbug
- - openweathermap
- - wetter.com
- - awekas
-They are available via the wiki for 2.5 and earlier, but the changes to REST
-will break those.  So support will be easier if we include the new versions
-with 2.6.
-
 Figure out why the heartbeat doesn't work on the WMR200.
diff --git a/docs/changes.txt b/docs/changes.txt
index 7bd13892..edb97c22 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -12,7 +12,6 @@ five separate lists. This will allow services to be grouped together,
 according to when they should be run.
 
 Added extensions to the weewx source distribution, including:
-  uploader for awekas
   uploader for open weather map
   uploader for weatherbug
   uploader for wetter.com
diff --git a/docs/usersguide.htm b/docs/usersguide.htm
index 6eafcfbe..a91c98eb 100644
--- a/docs/usersguide.htm
+++ b/docs/usersguide.htm
@@ -2856,6 +2856,38 @@ Jan 18 20:39:14 raspberrypi weewx[5977]:       ****  Expected to read 99 chars;
     </p>
     <p>The cure is simple: kill all but one of them.</p>
 
+    <h3 id='spikes'>Spikes in the graphs</h3>
+    <p>Occasionally you may see anomalous readings, typically manifested as
+      spikes in the graphs.  The source could be a flaky serial/USB connection,
+      radio or other interference, a cheap USB-Serial adapter, low-quality
+      sensors, or simply an anomalous reading.  It is not unusual for low-end
+      hardware to report odd sensor readings occasionally (once every few
+      days).  Some sensors, such as solar radiation/UV, have a limited lifespan
+      of about 5 years.  If you frequently see anomalous data, first check
+      the hardware.</p>
+    <p>To keep bad data from the database, add a quality control (QC) rule
+      such as Min/Max bounds.  See the <a href="#StdQC">QC</a> section for
+      details.</p>
+    <p>To remove bad data from the database, you will have to do some basic
+      SQL commands.  For example, let's say the station emitted some very
+      high temperatures and wind speeds for one or two readings.  This is
+      how to remove them:</p>
+    <ol>
+      <li>stop <span class='code'>weewx</span></li>
+      <li>Make a copy of the archive database</li>
+      <p class='tty'>cp $SQLITE_ROOT/weewx.sdb $SQLITE_ROOT/weewx-YYMMDD.sdb</p>
+      <li>Verify the bad data exist where you think they exist</li>
+      <p class='tty'>sqlite3 $SQLITE_ROOT/weewx.sdb
+sqlite> select dateTime,outTemp from archive where outTemp > 1000;</p>
+      <li>See whether the bad temperature and wind data happened at the same time</li>
+      <p class='tty'>sqlite> select dateTime,outTemp,windSpeed from archive where outTemp > 1000;</p>
+      <li>Remove the bad data by setting to NULL</li>
+      <p class='tty'>sqlite> update archive set windSpeed=NULL where outTemp > 1000;
+sqlite> update archive set outTemp=NULL where outTemp > 1000;</p>
+      <li>Delete the statistics database so that <span class='code'>weewx</span> can regenerate it without the anomalies</li>
+      <li>start <span class='code'>weewx</span></li>
+    </ol>
+
     <h3>FreeBSD</h3>
     <p>User Fabian reports that the following had to be done to get the
       VantagePro2 working under FreeBSD:</p>