Removed single line Id tag

166 files changed, 0 insertions, 298 deletions

diff --git a/TAO/performance-tests/Anyop/Anyop.mpc b/TAO/performance-tests/Anyop/Anyop.mpc
index bbf480e5258..6ad88e19e89 100644
--- a/TAO/performance-tests/Anyop/Anyop.mpc
+++ b/TAO/performance-tests/Anyop/Anyop.mpc
@@ -1,4 +1,3 @@
-// $Id$
 project: taoexe, anytypecode {
   avoids += ace_for_tao
   Source_Files {
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp
index e9c076a49ea..10a1933687a 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
 #include "ClientApp.h"
 #include "TestInf/AppHelper.h"
 #include "TestInf/TestAppExceptionC.h"
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp
index 21233a9ff7a..423ad03312a 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp
@@ -1,4 +1,3 @@
-// $Id$
 #include "ServerApp.h"
 #include "TestInf/AppHelper.h"
 #include "TestInf/OrbRunner.h"
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/client_main.cpp b/TAO/performance-tests/CSD_Strategy/TestApps/client_main.cpp
index 3481f7068f7..c1a477b339b 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/client_main.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/client_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
 #include "TestInf/TestAppMain.h"
 #include "ClientApp.h"
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/csd_pt_testapps.mpc b/TAO/performance-tests/CSD_Strategy/TestApps/csd_pt_testapps.mpc
index ab02eb59e4d..1abeda27a22 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/csd_pt_testapps.mpc
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/csd_pt_testapps.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(csd_test_server): csd_pt_test_exe, avoids_corba_e_micro {
   exename=server_main
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/server_main.cpp b/TAO/performance-tests/CSD_Strategy/TestApps/server_main.cpp
index d0d2aa30fff..725172f35d3 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/server_main.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/server_main.cpp
@@ -1,4 +1,3 @@
-// $Id$
 #include "TestInf/TestAppMain.h"
 #include "ServerApp.h"
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.cpp
index 0963cfd77dd..9a8597c428a 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.cpp
@@ -1,4 +1,3 @@
-// $Id$
 #include "AppHelper.h"
 
 void
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h
index f0ab9e023b2..2aa73b80583 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h
@@ -1,4 +1,3 @@
-// $Id$
 #ifndef APPHELPER_H
 #define APPHELPER_H
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.cpp
index 3ff4b93526b..0491e01baba 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.cpp
@@ -1,4 +1,3 @@
-// $Id$
 #include "AppShutdown.h"
 #include "TestAppExceptionC.h"
 #include "ace/Log_Msg.h"
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h b/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h
index 5c059a8e5e8..03e04037a86 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h
@@ -1,4 +1,3 @@
-// $Id$
 #ifndef APP_SHUTDOWN_H
 #define APP_SHUTDOWN_H
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/CSD_PT_TestInf_Export.h b/TAO/performance-tests/CSD_Strategy/TestInf/CSD_PT_TestInf_Export.h
index 91f36276272..0d74a2e6021 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/CSD_PT_TestInf_Export.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/CSD_PT_TestInf_Export.h
@@ -1,6 +1,5 @@
 
 // -*- C++ -*-
-// $Id$
 // Definition for Win32 Export directives.
 // This file is generated automatically by generate_export_file.pl -s CSD_PT_TestInf
 // ------------------------------
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/CancelledException.idl b/TAO/performance-tests/CSD_Strategy/TestInf/CancelledException.idl
index 8f9afcf68de..379a8ce41d8 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/CancelledException.idl
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/CancelledException.idl
@@ -1,4 +1,3 @@
-// $Id$
 #ifndef CANCELAPPXCEPTION_IDL
 #define CANCELAPPXCEPTION_IDL
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.cpp
index 361bb3cd465..221781e1b9e 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.cpp
@@ -1,4 +1,3 @@
-// $Id$
 #include "ClientEngine.h"
 
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp
index 088566ac96b..5141f3eede0 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp
@@ -1,4 +1,3 @@
-// $Id$
 // This may look like C, but it's really -*- C++ -*-
 
 #include "ClientTask.h"
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/CustomException.idl b/TAO/performance-tests/CSD_Strategy/TestInf/CustomException.idl
index 794900c41ce..e5ad609a19e 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/CustomException.idl
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/CustomException.idl
@@ -1,4 +1,3 @@
-// $Id$
 #ifndef CUSTOMEXCEPTION_IDL
 #define CUSTOMEXCEPTION_IDL
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/FooException.idl b/TAO/performance-tests/CSD_Strategy/TestInf/FooException.idl
index 4f76953e24c..330914baa72 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/FooException.idl
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/FooException.idl
@@ -1,4 +1,3 @@
-// $Id$
 #ifndef FOOEXCEPTION_IDL
 #define FOOEXCEPTION_IDL
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp
index 7653bd6a3c9..0e2dd6c9749 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp
@@ -1,4 +1,3 @@
-// $Id$
 #include "OrbRunner.h"
 #include "OrbTask.h"
 #include "TestAppExceptionC.h"
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.h b/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.h
index 4eb2f529e50..eab4b7b7013 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.h
@@ -1,4 +1,3 @@
-// $Id$
 #ifndef ORB_RUNNER_H
 #define ORB_RUNNER_H
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.cpp
index dc4a387472e..8c8076e201c 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.cpp
@@ -1,4 +1,3 @@
-// $Id$
 #include "ServantList_T.h"
 #include "AppHelper.h"
 #include "TestInf/TestAppExceptionC.h"
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h b/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h
index 72d643b74be..f7f5c727648 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h
@@ -1,4 +1,3 @@
-// $Id$
 #ifndef SERVANTLIST_T_H
 #define SERVANTLIST_T_H
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.cpp
index 0f89412cbc0..16a10887608 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.cpp
@@ -1,4 +1,3 @@
-// $Id$
 #include "TestAppBase.h"
 
 TestAppBase::TestAppBase(const char* name)
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h
index 9752d227984..a3e2d64be32 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h
@@ -1,4 +1,3 @@
-// $Id$
 #ifndef TESTAPPBASE_H
 #define TESTAPPBASE_H
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppException.idl b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppException.idl
index 2ac53939b77..f4cf0a8d88c 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppException.idl
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppException.idl
@@ -1,4 +1,3 @@
-// $Id$
 #ifndef TESTAPPXCEPTION_IDL
 #define TESTAPPXCEPTION_IDL
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppMain.h b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppMain.h
index d179542c7c8..f6adba43d5b 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppMain.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppMain.h
@@ -1,4 +1,3 @@
-// $Id$
 #ifndef TESTAPPMAIN_H
 #define TESTAPPMAIN_H
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/CSD_PT_TestServant_Export.h b/TAO/performance-tests/CSD_Strategy/TestServant/CSD_PT_TestServant_Export.h
index 6d33bdbe291..6dfad070a8b 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/CSD_PT_TestServant_Export.h
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/CSD_PT_TestServant_Export.h
@@ -1,6 +1,5 @@
 
 // -*- C++ -*-
-// $Id$
 // Definition for Win32 Export directives.
 // This file is generated automatically by generate_export_file.pl -s CSD_PT_TestServant
 // ------------------------------
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo.idl b/TAO/performance-tests/CSD_Strategy/TestServant/Foo.idl
index 41663869082..c3e27ab33ba 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo.idl
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo.idl
@@ -1,4 +1,3 @@
-// $Id$
 #ifndef FOO_IDL
 #define FOO_IDL
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.cpp b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.cpp
index d0e6dd72566..7f71bed1921 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.cpp
@@ -1,4 +1,3 @@
-// $Id$
 #include "Foo_ClientEngine.h"
 #include "Foo_Statistics.h"
 #include "TestInf/TestAppExceptionC.h"
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.cpp b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.cpp
index 6fe6e95fcff..043d87e48f5 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.cpp
@@ -1,4 +1,3 @@
-// $Id$
 #include "Foo_Statistics.h"
 #include "Foo_ClientEngine.h"
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h
index 118e5afd81d..8dd569d1543 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h
@@ -1,4 +1,3 @@
-// $Id$
 #ifndef FOO_STATISTICS_H
 #define FOO_STATISTICS_H
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp
index 15fc4cd2002..5aa94864344 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp
@@ -1,4 +1,3 @@
-// $Id$
 #include "Foo_i.h"
 #include "TestInf/AppShutdown.h"
 #include "ace/Time_Value.h"
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h
index 931bc8542aa..476b9e238cb 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h
@@ -1,4 +1,3 @@
-// $Id$
 #ifndef FOO_I_H
 #define FOO_I_H
 
diff --git a/TAO/performance-tests/Callback/Callback.mpc b/TAO/performance-tests/Callback/Callback.mpc
index 2d9fbe40121..d455880971c 100644
--- a/TAO/performance-tests/Callback/Callback.mpc
+++ b/TAO/performance-tests/Callback/Callback.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*Perf_IDL): taoidldefaults, strategies {
   IDL_Files {
     callback.idl
diff --git a/TAO/performance-tests/Callback/Callback_i.cpp b/TAO/performance-tests/Callback/Callback_i.cpp
index f2ca5619ba6..6c8b0a5a997 100644
--- a/TAO/performance-tests/Callback/Callback_i.cpp
+++ b/TAO/performance-tests/Callback/Callback_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Callback_i.h"
 
 #if !defined(__ACE_INLINE__)
diff --git a/TAO/performance-tests/Callback/Callback_i.h b/TAO/performance-tests/Callback/Callback_i.h
index 11a5655f7a2..e646e2e3416 100644
--- a/TAO/performance-tests/Callback/Callback_i.h
+++ b/TAO/performance-tests/Callback/Callback_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
 #ifndef TAO_CALLBACK_I_H
 #define TAO_CALLBACK_I_H
 
diff --git a/TAO/performance-tests/Callback/Callback_i.inl b/TAO/performance-tests/Callback/Callback_i.inl
index 8bfbbcf3dcc..18c2c0cad06 100644
--- a/TAO/performance-tests/Callback/Callback_i.inl
+++ b/TAO/performance-tests/Callback/Callback_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
 ACE_INLINE
 Callback_i::Callback_i (int expected_samples)
   : history_ (expected_samples)
diff --git a/TAO/performance-tests/Callback/Server_i.cpp b/TAO/performance-tests/Callback/Server_i.cpp
index 1deaefea278..7751da4e5b8 100644
--- a/TAO/performance-tests/Callback/Server_i.cpp
+++ b/TAO/performance-tests/Callback/Server_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Server_i.h"
 
 #if !defined(__ACE_INLINE__)
diff --git a/TAO/performance-tests/Callback/Server_i.h b/TAO/performance-tests/Callback/Server_i.h
index 87f5e0640ac..06948665fc2 100644
--- a/TAO/performance-tests/Callback/Server_i.h
+++ b/TAO/performance-tests/Callback/Server_i.h
@@ -1,5 +1,3 @@
-// $Id$
-
 #ifndef TAO_SERVER_I_H
 #define TAO_SERVER_I_H
 
diff --git a/TAO/performance-tests/Callback/Server_i.inl b/TAO/performance-tests/Callback/Server_i.inl
index eab268f111e..e162f536d0a 100644
--- a/TAO/performance-tests/Callback/Server_i.inl
+++ b/TAO/performance-tests/Callback/Server_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
 ACE_INLINE
 Server_i::Server_i (void)
   : done_ (0)
diff --git a/TAO/performance-tests/Callback/client.cpp b/TAO/performance-tests/Callback/client.cpp
index 3ddedfa0c11..069c566552f 100644
--- a/TAO/performance-tests/Callback/client.cpp
+++ b/TAO/performance-tests/Callback/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Callback_i.h"
 
 #include "tao/Messaging/Messaging.h"
diff --git a/TAO/performance-tests/Callback/server.cpp b/TAO/performance-tests/Callback/server.cpp
index aa4900c158c..e12195d755d 100644
--- a/TAO/performance-tests/Callback/server.cpp
+++ b/TAO/performance-tests/Callback/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Server_i.h"
 
 #include "tao/Messaging/Messaging.h"
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc
index 8d4cfd0fb4b..7a9fac25699 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*client): taoserver, strategies, dynamicinterface, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   exename   = client
   after    += IDL_Cubit_Server
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/cubit.idl b/TAO/performance-tests/Cubit/TAO/DII_Cubit/cubit.idl
index 68ce2b6165b..8f899ff99cc 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/cubit.idl
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/cubit.idl
@@ -1,6 +1,4 @@
 /* -*- C++ -*- */
-// $Id$
-
 interface Cubit
 {
   // = TITLE
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
index b71c28d89de..4d2e8704bd0 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Cubit_Client.h"
 #include "RTI_IO.h"
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
index e7d09d1577e..b52869dc434 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Cubit_Server.h"
 #include "tao/TAO_Internal.h"
 #include "tao/debug.h"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc
index fbbf398c02d..7c81e34f5d7 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*IDL): taoidldefaults, strategies {
   idlflags += -Gd
   IDL_Files {
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/RTI_IO.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/RTI_IO.cpp
index 9a208bc2eea..3177f9982e2 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/RTI_IO.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/RTI_IO.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "RTI_IO.h"
 #include "ace/Log_Msg.h"
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
index 63c45a894d5..6d1f4e8b305 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "ace/config-all.h"
 
 #if defined (ACE_VXWORKS) && !defined (__RTP__)
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
index 4b7fb83344c..06a9ba20ff6 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Cubit_Client.h"
 #include "Cubit_Server.h"
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/cubit.idl b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/cubit.idl
index 68ce2b6165b..8f899ff99cc 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/cubit.idl
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/cubit.idl
@@ -1,6 +1,4 @@
 /* -*- C++ -*- */
-// $Id$
-
 interface Cubit
 {
   // = TITLE
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
index 5d753a50db8..5ba42c3f4db 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "ace/config-all.h"
 
 #if defined (ACE_VXWORKS) && !defined (__RTP__)
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
index 7e0045bf9aa..6e0750d7838 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "ace/Sched_Params.h"
 #include "Globals.h"
 #include "Cubit_Task.h"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
index 3ce978c9347..9d918022ac4 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Globals.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc
index a2524f3d52e..ef5f612754f 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*IDL): taoidldefaults, strategies {
   IDL_Files {
     cubit.idl
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
index 83217ea1f52..10da30b572c 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Task_Client.h"
 #include "Timer.h"
 #include "ace/Stats.h"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp
index 948dc4af38d..f7e1ae4fc4c 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Util_Thread.h"
 #include "ace/ACE.h"
 #include "ace/Barrier.h"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
index 822032d3714..3438baa7d6c 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "ace/config-all.h"
 
 #if defined (ACE_VXWORKS) && !defined (__RTP__)
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit.idl b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit.idl
index 30285cd9d12..da68193d934 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit.idl
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 interface Cubit
 {
   // = TITLE
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
index 63973fd7c1a..1359acd6f0b 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "tao/ORB_Constants.h"
 #include "cubit_i.h"
 #include "Task_Client.h"
diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc
index 939cd18912a..076acb3192a 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*AMH_latency_idl): taoidldefaults, amh {
   IDL_Files {
     Test.idl
diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp
index 36a200cdcf4..cbcd21bd8dc 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp
index 02c1d4c245b..d9da49e21cd 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Roundtrip.h"
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Latency/AMI/AMI.mpc b/TAO/performance-tests/Latency/AMI/AMI.mpc
index 41a969e0147..2db781d2f8d 100644
--- a/TAO/performance-tests/Latency/AMI/AMI.mpc
+++ b/TAO/performance-tests/Latency/AMI/AMI.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*latency_idl): taoidldefaults, ami {
   IDL_Files {
     Test.idl
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
index c7beb0469ea..1c5482c6a3f 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
@@ -1,5 +1,3 @@
-// $Id$
-
 #ifndef ROUNDTRIP_HANDLER_H
 #define ROUNDTRIP_HANDLER_H
 #include /**/ "ace/pre.h"
diff --git a/TAO/performance-tests/Latency/AMI/client.cpp b/TAO/performance-tests/Latency/AMI/client.cpp
index faf45ee0574..b7223db09cd 100644
--- a/TAO/performance-tests/Latency/AMI/client.cpp
+++ b/TAO/performance-tests/Latency/AMI/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Roundtrip_Handler.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/performance-tests/Latency/AMI/server.cpp b/TAO/performance-tests/Latency/AMI/server.cpp
index e5cebc42463..def5bed8ae5 100644
--- a/TAO/performance-tests/Latency/AMI/server.cpp
+++ b/TAO/performance-tests/Latency/AMI/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Roundtrip.h"
 #include "Server_Task.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/performance-tests/Latency/Collocation/Collocation.mpc b/TAO/performance-tests/Latency/Collocation/Collocation.mpc
index b9f851bf3c2..a8475f27526 100644
--- a/TAO/performance-tests/Latency/Collocation/Collocation.mpc
+++ b/TAO/performance-tests/Latency/Collocation/Collocation.mpc
@@ -1,4 +1,3 @@
-// $Id$
 project(Latency*): taoserver, strategies {
   exename = Collocated_Test
   avoids += ace_for_tao
diff --git a/TAO/performance-tests/Latency/DII/DII.mpc b/TAO/performance-tests/Latency/DII/DII.mpc
index 77c1483e4a8..3215b3a7c65 100644
--- a/TAO/performance-tests/Latency/DII/DII.mpc
+++ b/TAO/performance-tests/Latency/DII/DII.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*latency_idl): taoidldefaults, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   IDL_Files {
     Test.idl
diff --git a/TAO/performance-tests/Latency/DII/client.cpp b/TAO/performance-tests/Latency/DII/client.cpp
index e6fd45fd08b..2273992983e 100644
--- a/TAO/performance-tests/Latency/DII/client.cpp
+++ b/TAO/performance-tests/Latency/DII/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "tao/DynamicInterface/Request.h"
 #include "tao/Strategies/advanced_resource.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
diff --git a/TAO/performance-tests/Latency/DII/server.cpp b/TAO/performance-tests/Latency/DII/server.cpp
index 02c1d4c245b..d9da49e21cd 100644
--- a/TAO/performance-tests/Latency/DII/server.cpp
+++ b/TAO/performance-tests/Latency/DII/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Roundtrip.h"
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Latency/DSI/DSI.mpc b/TAO/performance-tests/Latency/DSI/DSI.mpc
index 1515c4af7bd..a6260e73162 100644
--- a/TAO/performance-tests/Latency/DSI/DSI.mpc
+++ b/TAO/performance-tests/Latency/DSI/DSI.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*latency_idl): taoidldefaults, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   IDL_Files {
     Test.idl
diff --git a/TAO/performance-tests/Latency/DSI/client.cpp b/TAO/performance-tests/Latency/DSI/client.cpp
index ec4320644e4..c71229731e0 100644
--- a/TAO/performance-tests/Latency/DSI/client.cpp
+++ b/TAO/performance-tests/Latency/DSI/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
diff --git a/TAO/performance-tests/Latency/DSI/server.cpp b/TAO/performance-tests/Latency/DSI/server.cpp
index db1e0e0b512..71b0808a4fd 100644
--- a/TAO/performance-tests/Latency/DSI/server.cpp
+++ b/TAO/performance-tests/Latency/DSI/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Roundtrip.h"
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Latency/Deferred/Deferred.mpc
index e71e4ec9178..4f54f7a0872 100644
--- a/TAO/performance-tests/Latency/Deferred/Deferred.mpc
+++ b/TAO/performance-tests/Latency/Deferred/Deferred.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*latency_idl): taoidldefaults, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   IDL_Files {
     Test.idl
diff --git a/TAO/performance-tests/Latency/Deferred/client.cpp b/TAO/performance-tests/Latency/Deferred/client.cpp
index 45db13bf079..caefd2ff1a6 100644
--- a/TAO/performance-tests/Latency/Deferred/client.cpp
+++ b/TAO/performance-tests/Latency/Deferred/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "tao/DynamicInterface/Request.h"  /* This must come first for
                                               G++ 3.4 or better */
 
diff --git a/TAO/performance-tests/Latency/Deferred/server.cpp b/TAO/performance-tests/Latency/Deferred/server.cpp
index 02c1d4c245b..d9da49e21cd 100644
--- a/TAO/performance-tests/Latency/Deferred/server.cpp
+++ b/TAO/performance-tests/Latency/Deferred/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Roundtrip.h"
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc
index 699b18e36ac..731640bf22c 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc
+++ b/TAO/performance-tests/Latency/Single_Threaded/Single_Threaded.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*latency_idl): taoidldefaults, strategies {
   IDL_Files {
     Test.idl
diff --git a/TAO/performance-tests/Latency/Single_Threaded/client.cpp b/TAO/performance-tests/Latency/Single_Threaded/client.cpp
index 36a200cdcf4..cbcd21bd8dc 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Latency/Single_Threaded/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
diff --git a/TAO/performance-tests/Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Latency/Single_Threaded/server.cpp
index f208e449a78..fb08b8fa1cd 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/server.cpp
+++ b/TAO/performance-tests/Latency/Single_Threaded/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Roundtrip.h"
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h
index 75716ac14b5..07a0fbaf7b1 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h
@@ -1,5 +1,3 @@
-// $Id$
-
 #ifndef CLIENT_TASK_H
 #define CLIENT_TASK_H
 #include /**/ "ace/pre.h"
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Thread_Per_Connection.mpc b/TAO/performance-tests/Latency/Thread_Per_Connection/Thread_Per_Connection.mpc
index 15f41e7c886..1cabec72e79 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Thread_Per_Connection.mpc
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Thread_Per_Connection.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*latency_idl): taoidldefaults, strategies {
   IDL_Files {
     Test.idl
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp
index 7a3ddeacbc4..8d28b314596 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Client_Task.h"
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp
index f208e449a78..fb08b8fa1cd 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Roundtrip.h"
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h
index 75716ac14b5..07a0fbaf7b1 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h
+++ b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h
@@ -1,5 +1,3 @@
-// $Id$
-
 #ifndef CLIENT_TASK_H
 #define CLIENT_TASK_H
 #include /**/ "ace/pre.h"
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Thread_Pool.mpc b/TAO/performance-tests/Latency/Thread_Pool/Thread_Pool.mpc
index 56499861212..791a398e31d 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Thread_Pool.mpc
+++ b/TAO/performance-tests/Latency/Thread_Pool/Thread_Pool.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*latency_idl): taoidldefaults, strategies {
   IDL_Files {
     Test.idl
diff --git a/TAO/performance-tests/Latency/Thread_Pool/client.cpp b/TAO/performance-tests/Latency/Thread_Pool/client.cpp
index 7a3ddeacbc4..8d28b314596 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Client_Task.h"
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
diff --git a/TAO/performance-tests/Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Latency/Thread_Pool/server.cpp
index 2803f597e72..cd5e70115aa 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/server.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Roundtrip.h"
 #include "Worker_Thread.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/performance-tests/Memory/IORsize/Foo_i.cpp b/TAO/performance-tests/Memory/IORsize/Foo_i.cpp
index 9238769bd96..41d13f81555 100644
--- a/TAO/performance-tests/Memory/IORsize/Foo_i.cpp
+++ b/TAO/performance-tests/Memory/IORsize/Foo_i.cpp
@@ -1,4 +1,2 @@
-// $Id$
-
 #include "Foo_i.h"
 
diff --git a/TAO/performance-tests/Memory/IORsize/Memory_Growth.h b/TAO/performance-tests/Memory/IORsize/Memory_Growth.h
index d76ea2610fc..4c2f7924601 100644
--- a/TAO/performance-tests/Memory/IORsize/Memory_Growth.h
+++ b/TAO/performance-tests/Memory/IORsize/Memory_Growth.h
@@ -1,5 +1,3 @@
-// $Id$
-
 #ifndef MEMORY_GROWTH_H
 #define MEMORY_GROWTH_H
 #include /**/ "ace/pre.h"
diff --git a/TAO/performance-tests/Memory/IORsize/Memory_IORsize.mpc b/TAO/performance-tests/Memory/IORsize/Memory_IORsize.mpc
index 0fe46138f86..5f8986916a5 100644
--- a/TAO/performance-tests/Memory/IORsize/Memory_IORsize.mpc
+++ b/TAO/performance-tests/Memory/IORsize/Memory_IORsize.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*idl): taoidldefaults {
   idl_files {
     Test.idl
diff --git a/TAO/performance-tests/Memory/IORsize/Test.idl b/TAO/performance-tests/Memory/IORsize/Test.idl
index 7b4128b8c20..d5472cffc30 100644
--- a/TAO/performance-tests/Memory/IORsize/Test.idl
+++ b/TAO/performance-tests/Memory/IORsize/Test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 /// Put the interfaces in a module, to avoid global namespace pollution
 module Test
 {
diff --git a/TAO/performance-tests/Memory/IORsize/client.cpp b/TAO/performance-tests/Memory/IORsize/client.cpp
index 18eb21c4713..2f097812309 100644
--- a/TAO/performance-tests/Memory/IORsize/client.cpp
+++ b/TAO/performance-tests/Memory/IORsize/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 #include "TestS.h"
diff --git a/TAO/performance-tests/Memory/IORsize/server.cpp b/TAO/performance-tests/Memory/IORsize/server.cpp
index c552df3c9cc..e9d9f3fb751 100644
--- a/TAO/performance-tests/Memory/IORsize/server.cpp
+++ b/TAO/performance-tests/Memory/IORsize/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Memory_Growth.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
diff --git a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc
index 2acd1ce5e05..77dc292a0cf 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc
+++ b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*idl): taoidldefaults {
   IDL_Files {
     Test.idl
diff --git a/TAO/performance-tests/Memory/Single_Threaded/client.cpp b/TAO/performance-tests/Memory/Single_Threaded/client.cpp
index e0c71de9da9..c6d5c2e11f7 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Memory/Single_Threaded/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
diff --git a/TAO/performance-tests/Memory/Single_Threaded/server.cpp b/TAO/performance-tests/Memory/Single_Threaded/server.cpp
index c552df3c9cc..e9d9f3fb751 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/server.cpp
+++ b/TAO/performance-tests/Memory/Single_Threaded/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Memory_Growth.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
diff --git a/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc b/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc
index 0fa233bb2d0..d9048670f2e 100644
--- a/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc
+++ b/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project: taoserver, avoids_corba_e_micro, avoids_ace_for_tao {
   exename = create_reference
 }
diff --git a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
index cc9afe79088..174255b5bf5 100644
--- a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
+++ b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/ORB_Constants.h"
 #include "tao/ORB.h"
diff --git a/TAO/performance-tests/POA/Demux/Demux.mpc b/TAO/performance-tests/POA/Demux/Demux.mpc
index 4370ff2f9d5..32bb6f4ae03 100644
--- a/TAO/performance-tests/POA/Demux/Demux.mpc
+++ b/TAO/performance-tests/POA/Demux/Demux.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*poa idl): taoidldefaults {
   IDL_Files {
     demux_test.idl
diff --git a/TAO/performance-tests/POA/Demux/demux_test.idl b/TAO/performance-tests/POA/Demux/demux_test.idl
index 104bd97091c..00cf3acd60d 100644
--- a/TAO/performance-tests/POA/Demux/demux_test.idl
+++ b/TAO/performance-tests/POA/Demux/demux_test.idl
@@ -1,4 +1,3 @@
-// $Id$
 // Interface for TAO's Demux_Test
 
 interface Demux_Test
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc b/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
index 7e6e57c1719..abc0809c065 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
+++ b/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*idl): taoidldefaults {
   idlflags += -Sa -St
 
diff --git a/TAO/performance-tests/POA/Implicit_Activation/client.cpp b/TAO/performance-tests/POA/Implicit_Activation/client.cpp
index ede6a1374df..526edd50312 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/client.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
diff --git a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp
index d00dbd20d2f..8aa76f08e8c 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Simple.h"
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/POA/Implicit_Activation/server.cpp b/TAO/performance-tests/POA/Implicit_Activation/server.cpp
index 9884ddb93ee..1d9054487c8 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/server.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Factory.h"
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc b/TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc
index ac39fcfb8c9..fe3f20c3ca4 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(registration): taoexe, portableserver, avoids_corba_e_micro, avoids_ace_for_tao {
   exename = registration
 }
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/test.idl b/TAO/performance-tests/POA/Object_Creation_And_Registration/test.idl
index 329acf8055e..907847b2cfd 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/test.idl
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 //
 // Simple interface to be used in registration test
 //
diff --git a/TAO/performance-tests/Pluggable/PP_Test.idl b/TAO/performance-tests/Pluggable/PP_Test.idl
index ed5301c4781..9e6a9670fe6 100644
--- a/TAO/performance-tests/Pluggable/PP_Test.idl
+++ b/TAO/performance-tests/Pluggable/PP_Test.idl
@@ -1,6 +1,4 @@
 /* -*- C++ -*- */
-// $Id$
-
 interface Pluggable_Test
 {
   // = TITLE
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
index ce968f029a4..4cf2427b933 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "PP_Test_Client.h"
 
 #include "tao/Timeprobe.h"
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
index e6dc2fff394..a8121b86a85 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "PP_Test_Server.h"
 #include "tao/TAO_Internal.h"
 #include "tao/debug.h"
diff --git a/TAO/performance-tests/Pluggable/Pluggable.mpc b/TAO/performance-tests/Pluggable/Pluggable.mpc
index 75e85bf24df..41851894879 100644
--- a/TAO/performance-tests/Pluggable/Pluggable.mpc
+++ b/TAO/performance-tests/Pluggable/Pluggable.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*idl): taoidldefaults {
   IDL_Files {
     PP_Test.idl
diff --git a/TAO/performance-tests/Pluggable/client.cpp b/TAO/performance-tests/Pluggable/client.cpp
index 1eb80035a87..2ac9b960752 100644
--- a/TAO/performance-tests/Pluggable/client.cpp
+++ b/TAO/performance-tests/Pluggable/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "PP_Test_Client.h"
 #include "tao/Timeprobe.h"
 
diff --git a/TAO/performance-tests/Pluggable/server.cpp b/TAO/performance-tests/Pluggable/server.cpp
index ecb07808724..97ad684db6c 100644
--- a/TAO/performance-tests/Pluggable/server.cpp
+++ b/TAO/performance-tests/Pluggable/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "PP_Test_Server.h"
 #include "tao/Timeprobe.h"
 
diff --git a/TAO/performance-tests/Protocols/Protocols.mpc b/TAO/performance-tests/Protocols/Protocols.mpc
index 826cccec1c8..291329870c3 100644
--- a/TAO/performance-tests/Protocols/Protocols.mpc
+++ b/TAO/performance-tests/Protocols/Protocols.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*IDL): taoidldefaults {
   IDL_Files {
     test.idl
diff --git a/TAO/performance-tests/Protocols/distributor.cpp b/TAO/performance-tests/Protocols/distributor.cpp
index 1e3d712d65f..362bfdf6e90 100644
--- a/TAO/performance-tests/Protocols/distributor.cpp
+++ b/TAO/performance-tests/Protocols/distributor.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
diff --git a/TAO/performance-tests/Protocols/receiver.cpp b/TAO/performance-tests/Protocols/receiver.cpp
index 6b1c2f62d57..efbb376b2f1 100644
--- a/TAO/performance-tests/Protocols/receiver.cpp
+++ b/TAO/performance-tests/Protocols/receiver.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
diff --git a/TAO/performance-tests/Protocols/sender.cpp b/TAO/performance-tests/Protocols/sender.cpp
index 597b0ea4992..e10826b6e00 100644
--- a/TAO/performance-tests/Protocols/sender.cpp
+++ b/TAO/performance-tests/Protocols/sender.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/Stats.h"
diff --git a/TAO/performance-tests/Protocols/test.idl b/TAO/performance-tests/Protocols/test.idl
index 33f1a21606a..2cb62463d00 100644
--- a/TAO/performance-tests/Protocols/test.idl
+++ b/TAO/performance-tests/Protocols/test.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 interface test
 {
   void start_test (in long session_id,
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc
index 2373d00b9f0..4d8d483aa1d 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc
@@ -1,4 +1,3 @@
-// $Id$
 project(RTCORBA_Common): taolib_with_idl, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   sharedname   = RTCORBA_Common
   requires    += rt_corba
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/rtcorba_common_export.h b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/rtcorba_common_export.h
index 6b4617d0fd5..4aeabdededc 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/rtcorba_common_export.h
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/rtcorba_common_export.h
@@ -1,6 +1,5 @@
 
 // -*- C++ -*-
-// $Id$
 // Definition for Win32 Export directives.
 // This file is generated automatically by generate_export_file.pl
 // ------------------------------
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
index 6f511ae008a..7c0770ae78a 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "test_i.h"
 #include "tao/debug.h"
 #include "ace/ACE.h"
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.inl b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.inl
index 673f315b7ca..60fa6e3774b 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.inl
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
 ACE_INLINE
 Test_i::Test_i (void)
 {
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc
index 22fa8a8fce4..2c592b85af3 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*server): rt_server, strategies, rtcorbacommon, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   Source_Files {
     server.cpp
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
index 31243265912..3466ec9ced1 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "testC.h"
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/RTCORBA/Priority_Mapping_Manager.h"
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
index e6556096ce5..cbca89d0e78 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "test_i.h"
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/RTCORBA/Priority_Mapping.h"
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Single_Endpoint.mpc b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Single_Endpoint.mpc
index 56b1686697e..d350191b43f 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Single_Endpoint.mpc
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Single_Endpoint.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*server): rt_server, strategies, rtcorbacommon {
   Source_Files {
     server.cpp
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
index c801d22963b..3f499bffaba 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "../Common/testC.h"
 #include "tao/RTCORBA/RTCORBA.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp
index cbe061ebdb9..167267759b2 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "test_i.h"
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc b/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc
index f9c59018da4..6be3210def2 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc
@@ -1,5 +1,3 @@
-// $Id$
-
 project(*oneways idl RT): taoidldefaults {
   IDL_Files {
     test.idl
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
index a4ab2ea9e38..01fcc474949 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "testC.h"
 
 #include "tao/Messaging/Messaging.h"
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
index 944c06db6ce..4e8f517450b 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "test_i.h"
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
index 8abc4a2c00b..04cf24da8fa 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "test_i.h"
 #include "ace/ACE.h"
 
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.inl b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.inl
index c918e290e88..716cacf1fc2 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.inl
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.inl
@@ -1,5 +1,3 @@
-// $Id$
-
 ACE_INLINE
 Test_i::Test_i (CORBA::ORB_ptr orb)
   :  orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc b/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
index 913c80c0739..575beb6ac98 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*RTCorba idl): taoidldefaults {
   IDL_Files {
     test.idl
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
index ba3e578c082..9e835b90b7f 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/Stats.h"
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
index a4e9993fec6..8cfdad88d30 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "ace/Get_Opt.h"
 #include "ace/Stats.h"
 #include "ace/Task.h"
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc
index 7fdc182014e..681c81d6e7f 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*AMH_sequence_idl): taoidldefaults, amh {
   IDL_Files {
     Test.idl
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
index d7ce746d9b8..7af03422198 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp
index 02c1d4c245b..d9da49e21cd 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Roundtrip.h"
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
index 72c3514b46b..1689bf80ef4 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
@@ -1,5 +1,3 @@
-// $Id$
-
 #ifndef ROUNDTRIP_HANDLER_H
 #define ROUNDTRIP_HANDLER_H
 #include /**/ "ace/pre.h"
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/ami.mpc b/TAO/performance-tests/Sequence_Latency/AMI/ami.mpc
index d9fde7e7816..d84bbaf9738 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/ami.mpc
+++ b/TAO/performance-tests/Sequence_Latency/AMI/ami.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*sequence_idl): taoidldefaults, ami {
   IDL_Files {
     Test.idl
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
index c2f8d609108..7cfef21bc2b 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Roundtrip_Handler.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/server.cpp b/TAO/performance-tests/Sequence_Latency/AMI/server.cpp
index e5cebc42463..def5bed8ae5 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Roundtrip.h"
 #include "Server_Task.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/performance-tests/Sequence_Latency/DII/DII.mpc b/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
index d4f879d4a6f..8bc79752b6b 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
+++ b/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*sequence_idl): taoidldefaults, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   IDL_Files {
     Test.idl
diff --git a/TAO/performance-tests/Sequence_Latency/DII/client.cpp b/TAO/performance-tests/Sequence_Latency/DII/client.cpp
index c0b3bc94790..8498b310c13 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DII/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "tao/DynamicInterface/Request.h"
 #include "tao/Strategies/advanced_resource.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
diff --git a/TAO/performance-tests/Sequence_Latency/DII/server.cpp b/TAO/performance-tests/Sequence_Latency/DII/server.cpp
index 02c1d4c245b..d9da49e21cd 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DII/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Roundtrip.h"
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
index 97120f54c39..1ada685ed08 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
+++ b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*idl): taoidldefaults, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   IDL_Files {
     Test.idl
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/server.cpp b/TAO/performance-tests/Sequence_Latency/DSI/server.cpp
index db1e0e0b512..71b0808a4fd 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DSI/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Roundtrip.h"
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
index 54def5f5f87..c97c4981f9e 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*sequence_idl): taoidldefaults, strategies, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   IDL_Files {
     Test.idl
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
index e67705b13e9..098776142d6 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "tao/DynamicInterface/Request.h"  /* Must come first for G++
                                               3.4 or better */
 
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp
index 02c1d4c245b..d9da49e21cd 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Roundtrip.h"
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/Sequence_Ops_Time.mpc b/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/Sequence_Ops_Time.mpc
index 38c4e767850..e7cf9c72194 100644
--- a/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/Sequence_Ops_Time.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/Sequence_Ops_Time.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*idl): taoidldefaults {
   IDL_Files {
     sequence.idl
diff --git a/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/sequence.idl b/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/sequence.idl
index 671fd4f3cf6..84d8f2d37ee 100644
--- a/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/sequence.idl
+++ b/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/sequence.idl
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "tao/StringSeq.pidl"
 
 struct Str_Sequences
diff --git a/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp b/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp
index bf4db3004ca..1163c7866f3 100644
--- a/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp
@@ -1,6 +1,4 @@
 // Test of raw copy performance when using different sequence allocations
-// $Id$
-
 #include "sequenceC.h"
 #include "ace/Time_Value.h"
 #include "ace/High_Res_Timer.h"
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc
index fae260ec562..64bd4650ff6 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*sequence_idl): taoidldefaults, strategies {
   IDL_Files {
     Test.idl
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp
index 6c6829f2bae..2b48adf7df4 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp
index d8bce48960e..efacd2f57e0 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Roundtrip.h"
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h
index c959ae45aa3..79f1c7eb6e3 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h
@@ -1,5 +1,3 @@
-// $Id$
-
 #ifndef CLIENT_TASK_H
 #define CLIENT_TASK_H
 #include /**/ "ace/pre.h"
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Conn.mpc b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Conn.mpc
index 9e690719c57..fd7d234162a 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Conn.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Thread_Per_Conn.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*sequence_idl): taoidldefaults, strategies {
   IDL_Files {
     Test.idl
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp
index 5a67e410966..efe0b8651db 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Client_Task.h"
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp
index f208e449a78..fb08b8fa1cd 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Roundtrip.h"
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h
index c959ae45aa3..79f1c7eb6e3 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h
@@ -1,5 +1,3 @@
-// $Id$
-
 #ifndef CLIENT_TASK_H
 #define CLIENT_TASK_H
 #include /**/ "ace/pre.h"
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc
index 433de27a1d4..374135b7614 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Thread_Pool.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*sequence_idl): taoidldefaults, strategies {
   IDL_Files {
     Test.idl
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp
index 4224adf3218..29a4c32a8a0 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Client_Task.h"
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp
index 5bdc4b137a3..8107554e861 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Roundtrip.h"
 #include "Worker_Thread.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/performance-tests/Throughput/Throughput.mpc b/TAO/performance-tests/Throughput/Throughput.mpc
index e0baa06c094..1ef2954e936 100644
--- a/TAO/performance-tests/Throughput/Throughput.mpc
+++ b/TAO/performance-tests/Throughput/Throughput.mpc
@@ -1,6 +1,4 @@
 // -*- MPC -*-
-// $Id$
-
 project(*idl): taoidldefaults {
   IDL_Files {
     Test.idl
diff --git a/TAO/performance-tests/Throughput/client.cpp b/TAO/performance-tests/Throughput/client.cpp
index 02c342abf9d..a1e54de8a44 100644
--- a/TAO/performance-tests/Throughput/client.cpp
+++ b/TAO/performance-tests/Throughput/client.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "TestC.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/performance-tests/Throughput/server.cpp b/TAO/performance-tests/Throughput/server.cpp
index 6bf0fccfa31..48697e5e52a 100644
--- a/TAO/performance-tests/Throughput/server.cpp
+++ b/TAO/performance-tests/Throughput/server.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #include "Receiver_Factory.h"
 #include "ace/Get_Opt.h"
 #include "tao/Strategies/advanced_resource.h"