diff --git a/server/core/test/test_buffer.cc b/server/core/test/test_buffer.cc
index c9fe7fd11..58e4e7332 100644
--- a/server/core/test/test_buffer.cc
+++ b/server/core/test/test_buffer.cc
@@ -11,17 +11,6 @@
  * Public License.
  */
 
-/**
- *
- * @verbatim
- * Revision History
- *
- * Date         Who                 Description
- * 29-08-2014   Martin Brampton     Initial implementation
- *
- * @endverbatim
- */
-
 // To ensure that ss_info_assert asserts also when building in non-debug mode.
 #if !defined (SS_DEBUG)
 #define SS_DEBUG
diff --git a/server/core/test/test_dcb.cc b/server/core/test/test_dcb.cc
index 3b1767879..3f29ffa9e 100644
--- a/server/core/test/test_dcb.cc
+++ b/server/core/test/test_dcb.cc
@@ -11,17 +11,6 @@
  * Public License.
  */
 
-/**
- *
- * @verbatim
- * Revision History
- *
- * Date         Who                 Description
- * 05-09-2014   Martin Brampton     Initial implementation
- *
- * @endverbatim
- */
-
 // To ensure that ss_info_assert asserts also when builing in non-debug mode.
 #if !defined (SS_DEBUG)
 #define SS_DEBUG
diff --git a/server/core/test/test_filter.cc b/server/core/test/test_filter.cc
index 81ee47908..08075ec15 100644
--- a/server/core/test/test_filter.cc
+++ b/server/core/test/test_filter.cc
@@ -11,17 +11,6 @@
  * Public License.
  */
 
-/**
- *
- * @verbatim
- * Revision History
- *
- * Date         Who                 Description
- * 19-08-2014   Mark Riddoch        Initial implementation
- *
- * @endverbatim
- */
-
 // To ensure that ss_info_assert asserts also when builing in non-debug mode.
 #if !defined (SS_DEBUG)
 #define SS_DEBUG
diff --git a/server/core/test/test_hint.cc b/server/core/test/test_hint.cc
index b47eff18d..a3c62bf2d 100644
--- a/server/core/test/test_hint.cc
+++ b/server/core/test/test_hint.cc
@@ -11,17 +11,6 @@
  * Public License.
  */
 
-/**
- *
- * @verbatim
- * Revision History
- *
- * Date         Who                 Description
- * 08-10-2014   Martin Brampton     Initial implementation
- *
- * @endverbatim
- */
-
 // To ensure that ss_info_assert asserts also when builing in non-debug mode.
 #if !defined (SS_DEBUG)
 #define SS_DEBUG
diff --git a/server/core/test/test_maxscalepcre2.cc b/server/core/test/test_maxscalepcre2.cc
index 5de148143..1abcbf49c 100644
--- a/server/core/test/test_maxscalepcre2.cc
+++ b/server/core/test/test_maxscalepcre2.cc
@@ -11,17 +11,6 @@
  * Public License.
  */
 
-/**
- *
- * @verbatim
- * Revision History
- *
- * Date       Who           Description
- * 05-11-2015 Markus Makela Initial implementation
- *
- * @endverbatim
- */
-
 // To ensure that ss_info_assert asserts also when builing in non-debug mode.
 #ifndef SS_DEBUG
 #define SS_DEBUG
diff --git a/server/core/test/test_modutil.cc b/server/core/test/test_modutil.cc
index 083212f61..edfdcd8b1 100644
--- a/server/core/test/test_modutil.cc
+++ b/server/core/test/test_modutil.cc
@@ -11,17 +11,6 @@
  * Public License.
  */
 
-/**
- *
- * @verbatim
- * Revision History
- *
- * Date         Who                 Description
- * 17-09-2014   Martin Brampton     Initial implementation
- *
- * @endverbatim
- */
-
 // To ensure that ss_info_assert asserts also when builing in non-debug mode.
 #if !defined (SS_DEBUG)
 #define SS_DEBUG
diff --git a/server/core/test/test_poll.cc b/server/core/test/test_poll.cc
index 43175cba2..0e655feec 100644
--- a/server/core/test/test_poll.cc
+++ b/server/core/test/test_poll.cc
@@ -11,17 +11,6 @@
  * Public License.
  */
 
-/**
- *
- * @verbatim
- * Revision History
- *
- * Date         Who                 Description
- * 11-09-2014   Martin Brampton     Initial implementation
- *
- * @endverbatim
- */
-
 // To ensure that ss_info_assert asserts also when builing in non-debug mode.
 #if !defined (SS_DEBUG)
 #define SS_DEBUG
diff --git a/server/core/test/test_server.cc b/server/core/test/test_server.cc
index cbd3031e2..c154a13b6 100644
--- a/server/core/test/test_server.cc
+++ b/server/core/test/test_server.cc
@@ -11,17 +11,6 @@
  * Public License.
  */
 
-/**
- *
- * @verbatim
- * Revision History
- *
- * Date         Who                 Description
- * 08-10-2014   Martin Brampton     Initial implementation
- *
- * @endverbatim
- */
-
 // To ensure that ss_info_assert asserts also when builing in non-debug mode.
 #if !defined (SS_DEBUG)
 #define SS_DEBUG
diff --git a/server/core/test/test_service.cc b/server/core/test/test_service.cc
index ebad36b07..fc9fd16d7 100644
--- a/server/core/test/test_service.cc
+++ b/server/core/test/test_service.cc
@@ -11,17 +11,6 @@
  * Public License.
  */
 
-/**
- *
- * @verbatim
- * Revision History
- *
- * Date         Who                 Description
- * 08-09-2014   Martin Brampton     Initial implementation
- *
- * @endverbatim
- */
-
 // To ensure that ss_info_assert asserts also when builing in non-debug mode.
 #if !defined (SS_DEBUG)
 #define SS_DEBUG
diff --git a/server/core/test/test_session.cc b/server/core/test/test_session.cc
index d248764d4..0c841595b 100644
--- a/server/core/test/test_session.cc
+++ b/server/core/test/test_session.cc
@@ -11,17 +11,6 @@
  * Public License.
  */
 
-/**
- *
- * @verbatim
- * Revision History
- *
- * Date         Who                 Description
- * 11-09-2014   Martin Brampton     Initial implementation
- *
- * @endverbatim
- */
-
 // To ensure that ss_info_assert asserts also when builing in non-debug mode.
 #if !defined (SS_DEBUG)
 #define SS_DEBUG
diff --git a/server/core/test/test_users.cc b/server/core/test/test_users.cc
index cca22d308..46d1304d0 100644
--- a/server/core/test/test_users.cc
+++ b/server/core/test/test_users.cc
@@ -11,17 +11,6 @@
  * Public License.
  */
 
-/**
- *
- * @verbatim
- * Revision History
- *
- * Date         Who                 Description
- * 08-10-2014   Martin Brampton     Initial implementation
- *
- * @endverbatim
- */
-
 // To ensure that ss_info_assert asserts also when builing in non-debug mode.
 #if !defined (SS_DEBUG)
 #define SS_DEBUG