diff --git a/src/md5.cpp b/src/md5.cpp
index 200c596a6cf..2fd5a24d3c1 100644
--- a/src/md5.cpp
+++ b/src/md5.cpp
@@ -254,9 +254,9 @@ MD5::MD5(std::ifstream& stream)
 
 
 
-unsigned char *MD5::raw_digest(){
-
-  uint1 *s = new uint1[16];
+unsigned char *MD5::raw_digest()
+{
+  static uint1 s[16];
 
   if (!finalized){
     std::cerr << "MD5::raw_digest:  Can't get digest if you haven't "<<
@@ -268,44 +268,8 @@ unsigned char *MD5::raw_digest(){
   return s;
 }
 
-
-
-char *MD5::hex_digest(){
-
-  int i;
-  char *s= new char[33];
-
-  if (!finalized){
-    std::cerr << "MD5::hex_digest:  Can't get digest if you haven't "<<
-      "finalized the digest!" <<std::endl;
-    return (char *)("");
-  }
-
-  for (i=0; i<16; i++)
-    sprintf(s+i*2, "%02x", digest[i]);
-
-  s[32]='\0';
-
-  return s;
-}
-
-
-
-
-
-std::ostream& operator<<(std::ostream &stream, MD5 context){
-
-  stream << context.hex_digest();
-  return stream;
-}
-
-
-
-
 // PRIVATE METHODS:
 
-
-
 void MD5::init(){
   finalized=0;  // we just started!
 
diff --git a/src/md5.hpp b/src/md5.hpp
index cfcb23b3f02..e00d8ad3201 100644
--- a/src/md5.hpp
+++ b/src/md5.hpp
@@ -63,9 +63,6 @@ public:
 
 // methods to acquire finalized result
   unsigned char    *raw_digest ();  // digest as a 16-byte binary array
-  char *            hex_digest ();  // digest as a 33-byte ascii-hex string
-  friend std::ostream&   operator<< (std::ostream&, MD5 context);
-
 
 
 private: