diff --git a/src/ca/nciu.cpp b/src/ca/nciu.cpp
index b6dcf79cb..7a24fc6ff 100644
--- a/src/ca/nciu.cpp
+++ b/src/ca/nciu.cpp
@@ -93,7 +93,6 @@ void nciu::destructor ( epicsGuard < epicsMutex > & guard )
     this->~nciu ();
 }
 
-#pragma message ("audit all callback mutex locks to verify that they dont occur at inappropriate times in the main thread?" )
 // called virtually
 void nciu::destroy ( epicsGuard < epicsMutex > & guard )
 {
diff --git a/src/ca/tcpRecvWatchdog.h b/src/ca/tcpRecvWatchdog.h
index 0759a829f..75d087349 100644
--- a/src/ca/tcpRecvWatchdog.h
+++ b/src/ca/tcpRecvWatchdog.h
@@ -54,7 +54,6 @@ public:
         epicsGuard < callbackMutex > &,
         epicsGuard < epicsMutex > &,
         const epicsTime & currentTime );
-#pragma message ("too low level?")
     void cancel ();
     void show ( unsigned level ) const;
     double delay () const;
diff --git a/src/ca/tcpiiu.cpp b/src/ca/tcpiiu.cpp
index f9defde12..c4f1a2a44 100644
--- a/src/ca/tcpiiu.cpp
+++ b/src/ca/tcpiiu.cpp
@@ -734,7 +734,6 @@ void tcpiiu::unresponsiveCircuitNotify (
         this->echoRequestPending = true;
         this->sendThreadFlushEvent.signal ();
 
-#pragma message ( "cancel is too low level" )
         this->recvDog.cancel ();
         this->sendDog.cancel ();
         if ( this->connectedList.count() ) {
diff --git a/src/db/Makefile b/src/db/Makefile
index 70cf81426..8f67b0379 100644
--- a/src/db/Makefile
+++ b/src/db/Makefile
@@ -67,7 +67,7 @@ LIBSRCS += dbCa.c
 LIBSRCS += dbCaTest.c
 LIBSRCS += initHooks.c
 LIBSRCS += cvtBpt.c
-LIBSRCS += dbServiceIO.cpp
+LIBSRCS += dbContext.cpp
 LIBSRCS += dbChannelIO.cpp
 LIBSRCS += dbSubscriptionIO.cpp
 LIBSRCS += dbPutNotifyBlocker.cpp
diff --git a/src/db/dbCAC.h b/src/db/dbCAC.h
index 7dbb1e8b3..3579b73c1 100644
--- a/src/db/dbCAC.h
+++ b/src/db/dbCAC.h
@@ -125,7 +125,6 @@ private:
 	dbContextPrivateListOfIO & operator = ( const dbContextPrivateListOfIO & );
 };
 
-#pragma message ( "name change reflecting dbContext indicated?" )
 // allow only one thread at a time to use the cache, but do not hold
 // lock when calling the callback
 class dbContextReadNotifyCache  {
diff --git a/src/db/dbServiceIO.cpp b/src/db/dbContext.cpp
similarity index 99%
rename from src/db/dbServiceIO.cpp
rename to src/db/dbContext.cpp
index acf9bf08d..4f24dd4ea 100644
--- a/src/db/dbServiceIO.cpp
+++ b/src/db/dbContext.cpp
@@ -23,8 +23,6 @@
  *	505 665 1831
  */
 
-#pragma message ( "file name needs to change" )
-
 #include <limits.h>
 
 #include "epicsMutex.h"