diff --git a/src/ca/cac.cpp b/src/ca/cac.cpp
index 8a756c746..60f737ad7 100644
--- a/src/ca/cac.cpp
+++ b/src/ca/cac.cpp
@@ -149,9 +149,9 @@ cac::cac (
     iiuExistenceCount ( 0u ),
     cacShutdownInProgress ( false )
 {
-	if ( ! osiSockAttach () ) {
-        throwWithLocation ( caErrorCode (ECA_INTERNAL) );
-	}
+    if ( ! osiSockAttach () ) {
+        throwWithLocation ( udpiiu :: noSocket () );
+    }
 
     try {
 	    long status;
diff --git a/src/ca/iocinf.h b/src/ca/iocinf.h
index 8a26fdbf5..0d3b57db1 100644
--- a/src/ca/iocinf.h
+++ b/src/ca/iocinf.h
@@ -61,13 +61,6 @@ static const double CA_CONN_VERIFY_PERIOD = 30.0; /* (sec) how often to request
  */
 static const unsigned contiguousMsgCountWhichTriggersFlowControl = 10u;
 
-class caErrorCode { 
-public:
-    caErrorCode ( int status ) : code ( status ) {};
-private:
-    int code;
-};
-
 /*
  * CA internal functions
  */
diff --git a/src/ca/tcpiiu.cpp b/src/ca/tcpiiu.cpp
index 377e3ac3c..69009c264 100644
--- a/src/ca/tcpiiu.cpp
+++ b/src/ca/tcpiiu.cpp
@@ -44,9 +44,6 @@
 
 using namespace std;
 
-const unsigned mSecPerSec = 1000u;
-const unsigned uSecPerSec = 1000u * mSecPerSec;
-
 tcpSendThread::tcpSendThread ( 
         class tcpiiu & iiuIn, const char * pName, 
         unsigned stackSize, unsigned priority ) :
@@ -805,28 +802,6 @@ tcpiiu::tcpiiu (
         }
     }
 
-#   if 0
-    //
-    // windows has a really strange implementation of thess options
-    // and we can avoid the need for this by using pthread_kill on unix
-    //
-    {
-        struct timeval timeout;
-        double pollInterval = connectionTimeout / 8.0;
-        timeout.tv_sec = static_cast < long > ( pollInterval );
-        timeout.tv_usec = static_cast < long > 
-            ( ( pollInterval - timeout.tv_sec ) * uSecPerSec );
-        // intentionally ignore status as we dont expect that all systems
-        // will accept this request
-        setsockopt ( this->sock, SOL_SOCKET, SO_SNDTIMEO,
-                ( char * ) & timeout, sizeof ( timeout ) );
-        // intentionally ignore status as we dont expect that all systems
-        // will accept this request
-        setsockopt ( this->sock, SOL_SOCKET, SO_RCVTIMEO,
-                ( char * ) & timeout, sizeof ( timeout ) );
-    }
-#   endif
-
     if ( isNameService() ) {
         pSearchDest->setCircuit ( this );
     }
diff --git a/src/cas/generic/casStrmClient.cc b/src/cas/generic/casStrmClient.cc
index 468aa17a5..bf83a7f45 100644
--- a/src/cas/generic/casStrmClient.cc
+++ b/src/cas/generic/casStrmClient.cc
@@ -34,8 +34,6 @@ const nothrow_t  nothrow ;
 }
 #endif
 
-static const caHdr nill_msg = { 0u, 0u, 0u, 0u, 0u, 0u };
-
 casStrmClient::pCASMsgHandler const casStrmClient::msgHandlers[] =
 {
     & casStrmClient::versionAction,
diff --git a/src/libCom/logClient/logClient.c b/src/libCom/logClient/logClient.c
index adaaa7f95..4f5daaab1 100644
--- a/src/libCom/logClient/logClient.c
+++ b/src/libCom/logClient/logClient.c
@@ -34,9 +34,6 @@
 
 #include "logClient.h"
 
-static const int logClientSuccess = 0;
-static const int logClientError = -1;
-
 typedef struct {
     char                msgBuf[0x4000];
     struct sockaddr_in  addr;
diff --git a/src/libCom/test/epicsCalcTest.cpp b/src/libCom/test/epicsCalcTest.cpp
index 5a4d44aa7..f4d5a4660 100644
--- a/src/libCom/test/epicsCalcTest.cpp
+++ b/src/libCom/test/epicsCalcTest.cpp
@@ -198,14 +198,6 @@ static inline double MAX(double a, double b, double c, double d, double e,
     double f, double g, double h, double i, double j) {
     return MAX(MAX(a,b,c,d,e,f,g,h,i),j);
 }
-static inline double MAX(double a, double b, double c, double d, double e,
-    double f, double g, double h, double i, double j, double k) {
-    return MAX(MAX(a,b,c,d,e,f,g,h,i,j),k);
-}
-static inline double MAX(double a, double b, double c, double d, double e,
-    double f, double g, double h, double i, double j, double k, double l) {
-    return MAX(MAX(a,b,c,d,e,f,g,h,i,j,k),l);
-}
 
 static inline double MIN(double a) {
     return a;
@@ -242,14 +234,6 @@ static inline double MIN(double a, double b, double c, double d, double e,
     double f, double g, double h, double i, double j) {
     return MIN(MIN(a,b,c,d,e,f,g,h,i),j);
 }
-static inline double MIN(double a, double b, double c, double d, double e,
-    double f, double g, double h, double i, double j, double k) {
-    return MIN(MIN(a,b,c,d,e,f,g,h,i,j),k);
-}
-static inline double MIN(double a, double b, double c, double d, double e,
-    double f, double g, double h, double i, double j, double k, double l) {
-    return MIN(MIN(a,b,c,d,e,f,g,h,i,j,k),l);
-}
 
 /* The test code below generates lots of spurious warnings because
  * it's making sure that our operator priorities match those of C.