diff --git a/src/MESSAGE/fix_client_md.cpp b/src/MESSAGE/fix_client_md.cpp
index 9c1bfcc796..727481dcc0 100644
--- a/src/MESSAGE/fix_client_md.cpp
+++ b/src/MESSAGE/fix_client_md.cpp
@@ -89,7 +89,7 @@ FixClientMD::~FixClientMD()
 
   int nfield;
   int *fieldID,*fieldtype,*fieldlen;
-  int msgID = cs->recv(nfield,fieldID,fieldtype,fieldlen);
+  cs->recv(nfield,fieldID,fieldtype,fieldlen);
 
   // clean-up
 
@@ -173,8 +173,6 @@ void FixClientMD::min_setup(int vflag)
 
 void FixClientMD::post_force(int vflag)
 {
-  int i,j,m;
-
   // energy and virial setup
 
   if (vflag) v_setup(vflag);
@@ -286,7 +284,7 @@ void FixClientMD::receive_fev(int vflag)
   int nfield;
   int *fieldID,*fieldtype,*fieldlen;
 
-  int msgID = cs->recv(nfield,fieldID,fieldtype,fieldlen);
+  cs->recv(nfield,fieldID,fieldtype,fieldlen);
 
   double *forces = (double *) cs->unpack(FORCES);
   double **f = atom->f;
diff --git a/src/MESSAGE/message.cpp b/src/MESSAGE/message.cpp
index e9bff7d38a..61221ca26e 100644
--- a/src/MESSAGE/message.cpp
+++ b/src/MESSAGE/message.cpp
@@ -22,10 +22,6 @@
 using namespace LAMMPS_NS;
 using namespace CSLIB_NS;
 
-// customize by adding a new server protocol enum
-
-enum{MD,MC};
-
 /* ---------------------------------------------------------------------- */
 
 void Message::command(int narg, char **arg)
@@ -38,12 +34,10 @@ void Message::command(int narg, char **arg)
   else error->all(FLERR,"Illegal message command");
   lmp->clientserver = clientserver;
 
-  // customize by adding a new server protocol
+  // validate supported protocols
 
-  int protocol;
-  if (strcmp(arg[1],"md") == 0) protocol = MD;
-  else if (strcmp(arg[1],"mc") == 0) protocol = MC;
-  else error->all(FLERR,"Unknown message protocol");
+  if ((strcmp(arg[1],"md") != 0) && (strcmp(arg[1],"mc") != 0))
+    error->all(FLERR,"Unknown message protocol");
 
   // instantiate CSlib with chosen communication mode
 
diff --git a/src/MESSAGE/server_mc.cpp b/src/MESSAGE/server_mc.cpp
index 8e9a297912..8152b1f772 100644
--- a/src/MESSAGE/server_mc.cpp
+++ b/src/MESSAGE/server_mc.cpp
@@ -37,8 +37,8 @@ ServerMC::ServerMC(LAMMPS *lmp) : Pointers(lmp) {}
 
 void ServerMC::loop()
 {
-  int i,j,m;
-  double xold[3],xnew[3];
+  int m;
+  double xold[3];
   tagint atomid;
 
   CSlib *cs = (CSlib *) lmp->cslib;
diff --git a/src/MESSAGE/server_md.cpp b/src/MESSAGE/server_md.cpp
index 8debd3a987..bef327616e 100644
--- a/src/MESSAGE/server_md.cpp
+++ b/src/MESSAGE/server_md.cpp
@@ -78,7 +78,7 @@ ServerMD::~ServerMD()
 
 void ServerMD::loop()
 {
-  int i,j,m;
+  int j,m;
 
   // cs = instance of CSlib
 
diff --git a/src/special.cpp b/src/special.cpp
index ab3764a156..7f855163e0 100644
--- a/src/special.cpp
+++ b/src/special.cpp
@@ -1225,7 +1225,7 @@ void Special::dihedral_trim()
 ------------------------------------------------------------------------- */
 
 int Special::rendezvous_ids(int n, char *inbuf,
-                            int &flag, int *&proclist, char *&outbuf,
+                            int &flag, int *& /*proclist*/, char *& /*outbuf*/,
                             void *ptr)
 {
   Special *sptr = (Special *) ptr;