diff --git a/Hlt/HltBase/Event/HltCandidate.h b/Hlt/HltBase/Event/HltCandidate.h
index f15f2d770f38df57134b50bbf4dc3556e2d481f9..7764d8b5b05f74f0705c672bacd8ad38eab63bfb 100644
--- a/Hlt/HltBase/Event/HltCandidate.h
+++ b/Hlt/HltBase/Event/HltCandidate.h
@@ -1,5 +1,3 @@
-// $Id: HltCandidate.h,v 1.8 2010-08-30 13:00:44 amazurov Exp $ 
-// ============================================================================
 #ifndef HltEvent_Candidate_H_
 #define HltEvent_Candidate_H_ 1
 // ============================================================================
@@ -22,15 +20,6 @@
 // ============================================================================
 #include "Event/HltStage.h"
 // ============================================================================
-#ifdef _WIN32
-// ============================================================================
-// Avoid conflict of Windows macro with std::max
-// ============================================================================
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#endif
-// ============================================================================
 // Allocators from  Gaudi
 // ============================================================================
 #include "GaudiKernel/boost_allocator.h"
diff --git a/Hlt/HltBase/Event/HltL0DiMuonCandidate.h b/Hlt/HltBase/Event/HltL0DiMuonCandidate.h
index 7874841428cde11a4896346d37fc438eaedddee9..f6edf418c9e7d1942aa71686243276e34c65aa6e 100644
--- a/Hlt/HltBase/Event/HltL0DiMuonCandidate.h
+++ b/Hlt/HltBase/Event/HltL0DiMuonCandidate.h
@@ -1,5 +1,3 @@
-// $Id:$ 
-// ============================================================================
 #ifndef HltEvent_L0DiMuonCandidate_H
 #define HltEvent_L0DiMuonCandidate_H 1
 // ============================================================================
@@ -15,13 +13,6 @@
 #include "GaudiKernel/ContainedObject.h"
 #include "GaudiKernel/ObjectVector.h"
 // ============================================================================
-#ifdef _WIN32
-// Avoid conflict of Windows macro with std::max
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#endif
-// ============================================================================
 #include "GaudiKernel/boost_allocator.h"
 #include "GaudiKernel/SmartRef.h"
 // ============================================================================
diff --git a/Hlt/HltBase/Event/HltMultiTrack.h b/Hlt/HltBase/Event/HltMultiTrack.h
index 91ab4beca2715e65e3371113f5959ca31d314453..80194b62cdf2d5679a7be14688f3e55cbd2b422b 100644
--- a/Hlt/HltBase/Event/HltMultiTrack.h
+++ b/Hlt/HltBase/Event/HltMultiTrack.h
@@ -1,5 +1,3 @@
-// $Id: HltMultiTrack.h,v 1.4 2010-08-30 13:00:44 amazurov Exp $
-// ============================================================================ 
 #ifndef HltEvent_MultiTrack_H
 #define HltEvent_MultiTrack_H 1
 // ============================================================================ 
@@ -11,12 +9,6 @@
 #include "GaudiKernel/NamedRange.h"
 #include "GaudiKernel/ContainedObject.h"
 #include "GaudiKernel/ObjectVector.h"
-#ifdef _WIN32
-// Avoid conflict of Windows macro with std::max
-  #ifndef NOMINMAX
-    #define NOMINMAX
-  #endif
-#endif
 #include "GaudiKernel/boost_allocator.h"
 #include "GaudiKernel/SmartRef.h"
 #include <vector>
diff --git a/Hlt/HltBase/Event/HltStage.h b/Hlt/HltBase/Event/HltStage.h
index e8711ccf8ab9d424ecf9a36d28b6d756d7d3fffa..79d1f5c9a5fdb39a7dd0dd4ce1a8bf5df150998f 100644
--- a/Hlt/HltBase/Event/HltStage.h
+++ b/Hlt/HltBase/Event/HltStage.h
@@ -1,5 +1,3 @@
-// $Id: HltStage.h,v 1.10 2010-08-30 13:00:44 amazurov Exp $ 
-// =============================================================================
 #ifndef HltEvent_Stage_H_
 #define HltEvent_Stage_H_ 1
 // =============================================================================
@@ -36,15 +34,6 @@
 #include "Event/HltL0DiMuonCandidate.h"
 #include "HltBase/Cache.h"
 // =============================================================================
-#ifdef _WIN32
-// =============================================================================
-// Avoid conflict of Windows macro with std::max
-// =============================================================================
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#endif
-// =============================================================================
 // allocators form Boost 
 // =============================================================================
 #include "GaudiKernel/boost_allocator.h"
diff --git a/Hlt/HltBase/cmt/requirements b/Hlt/HltBase/cmt/requirements
index d3f32d97bc291e7c82e2fb569063b04bb3af4952..908fa0de2c1e96635007b62431a48dd30c5994a1 100755
--- a/Hlt/HltBase/cmt/requirements
+++ b/Hlt/HltBase/cmt/requirements
@@ -48,8 +48,7 @@ apply_pattern    linker_library library=HltBase
 apply_pattern    reflex_dictionary                                 \
                  dictionary=HltBase                                \
                  headerfiles=$(HLTBASEROOT)/dict/HltBaseDict.h     \
-                 selectionfile=$(HLTBASEROOT)/dict/HltBaseDict.xml \
-                 options="-U__MINGW32__"
+                 selectionfile=$(HLTBASEROOT)/dict/HltBaseDict.xml
 
 # Hack for cmt v1r19 bug to link dictionary on windows
 macro        HltBaseDict_use_linkopts $(use_linkopts)
diff --git a/Hlt/HltBase/dict/HltBaseDict.h b/Hlt/HltBase/dict/HltBaseDict.h
index a5ebb29859dec2ca6548ab2feefc61c567c32d2a..d96fbd317b4cf02aa371eb76ec2f68c59d9e3061 100755
--- a/Hlt/HltBase/dict/HltBaseDict.h
+++ b/Hlt/HltBase/dict/HltBaseDict.h
@@ -1,11 +1,6 @@
 #ifndef DICT_HLTBASEDICT_H 
 #define DICT_HLTBASEDICT_H 1
 // ============================================================================
-#ifdef __INTEL_COMPILER
-#pragma warning(disable:2259) // non-pointer conversion ... may lose significant bits
-#pragma warning(push)
-#endif
-// ============================================================================
 #include "HltBase/IMatchTVeloTracks.h"
 #include "HltBase/ITrackConfirmTool.h"
 #include "HltBase/ITrackL0CaloMatchTool.h"
@@ -27,15 +22,6 @@
 #include "HltBase/HltUtils.h"
 #include "HltBase/ITrack2CandidateMatch.h"
 // ============================================================================
-#ifdef __INTEL_COMPILER
-#pragma warning(pop)
-#endif
-// ============================================================================
-#ifdef __INTEL_COMPILER
-#pragma warning(disable:177)  //  variable ... was declared but never referenced
-#pragma warning(disable:191)  // type qualifier is meaningless on cast type
-#endif
-// ============================================================================
 namespace 
 {
   struct __Instantiations
diff --git a/Hlt/HltCommon/src/TarFileAccess.cpp b/Hlt/HltCommon/src/TarFileAccess.cpp
index 6a6b8f5ab2d2c86c1bd0e6c981f56e2da500234c..f8092a7c53dfa52518683d1727752b2862e00926 100644
--- a/Hlt/HltCommon/src/TarFileAccess.cpp
+++ b/Hlt/HltCommon/src/TarFileAccess.cpp
@@ -14,18 +14,12 @@
 
 #include "GaudiKernel/ToolFactory.h"
 
-
-
-#ifndef _WIN32
 #include <unistd.h>
 #include <sys/types.h>
 #include <pwd.h>
 #include <grp.h>
 #include <sys/stat.h>
-#else 
-typedef int uid_t;
-typedef int gid_t;
-#endif
+
 using namespace std;
 
 #include "boost/regex.hpp"
@@ -36,9 +30,7 @@ namespace fs = boost::filesystem;
 
 #include "boost/iostreams/filtering_stream.hpp"
 #include "boost/iostreams/copy.hpp"
-#ifndef _WIN32
 #include "boost/iostreams/filter/gzip.hpp"
-#endif
 #include "boost/iostreams/slice.hpp"
 #include "boost/iostreams/operations.hpp"
 #include "boost/iostreams/seek.hpp"
@@ -162,11 +154,7 @@ namespace TarFileAccess_details {
                 // cerr << "got file " << i->second.name << " of size " << i->second.size <<  " at offset " << i->second.offset << (i->second.compressed?" (compressed) ":"") << endl;
                 io::filtering_istream *in = new io::filtering_istream();
                 if (i->second.compressed) {
-#ifdef _WIN32
-                    return 0;
-#else
                     in->push(io::gzip_decompressor());
-#endif
                 }
                 in->push(io::slice(m_file,i->second.offset,i->second.size));
                 return in;
@@ -230,33 +218,25 @@ namespace TarFileAccess_details {
            return val;
         }
         uid_t getUid() const {
-#ifndef _WIN32
                if (m_myUid==0) m_myUid = getuid();
-#endif
                return m_myUid;
         }
         gid_t getGid() const {
-#ifndef _WIN32
                if (m_myGid==0) m_myGid = getgid();
-#endif
                return m_myGid;
         }
         const char *getUname() const {
-#ifndef _WIN32
                 if (m_uname.empty()) {
                     struct passwd *passwd = getpwuid(getUid());
                     m_uname = ( passwd ? passwd->pw_name : "" );
                 }
-#endif
                 return m_uname.c_str();
         }
         const char *getGname() const {
-#ifndef _WIN32
                 if (m_gname.empty()) {
                     struct group *group = getgrgid(getGid());
                     m_gname = ( group ? group->gr_name : "" );
                 }
-#endif
                 return m_gname.c_str();
         }
 
@@ -273,7 +253,6 @@ namespace TarFileAccess_details {
     };
 
     bool TarFile::append(const string& name, std::stringstream& is) {
-#ifndef _WIN32
         if (m_compressOnWrite && is.str().size()>512 && (name.size()<3||name.compare(name.size()-3,3,".gz")!=0) ) {
             std::stringstream out;
             io::filtering_istream in;
@@ -284,7 +263,6 @@ namespace TarFileAccess_details {
             //       if not, it's useless to compress..
             return _append(name+".gz",out);
         } 
-#endif
         return _append(name,is);
     }
 
@@ -321,11 +299,7 @@ namespace TarFileAccess_details {
                    memset(&header,0,sizeof(header));
                }
                putString(name.c_str(),header.name);
-#ifdef _WIN32
-               putOctal(33060u, header.mode);
-#else
                putOctal( S_IFREG|S_IRUSR|S_IRGRP|S_IROTH, header.mode);
-#endif
                putString( "ustar ",header.magic);
                putString("00", header.version);
                putOctal( getUid(), header.uid);
diff --git a/Phys/LoKiTracks/LoKi/TrackCuts.h b/Phys/LoKiTracks/LoKi/TrackCuts.h
index 92eaa5660d1a95660a06743a0073199015b2a191..91c053c2ed2bf19330516e63c769f49385ac86ee 100755
--- a/Phys/LoKiTracks/LoKi/TrackCuts.h
+++ b/Phys/LoKiTracks/LoKi/TrackCuts.h
@@ -1,5 +1,3 @@
-// $Id: TrackCuts.h 124240 2011-06-05 13:35:37Z ibelyaev $
-// ============================================================================
 #ifndef LOKI_TRACKCUTS_H
 #define LOKI_TRACKCUTS_H 1
 // ============================================================================
@@ -17,14 +15,6 @@ namespace LoKi
   // ==========================================================================
   namespace Cuts
   {
-    // ========================================================================
-    // Suppress Intel compiler warnings about missing default constructor
-    // In this case the compiler generated constructor is fine, since there are
-    // no member data to be initialised
-#ifdef __INTEL_COMPILER
-#pragma warning(disable:854)
-#pragma warning(push)
-#endif
     // ======================================================================== 
     /** @var TrTYPE 
      *  Simple function which evaluates LHCb::Track::type
@@ -1241,10 +1231,6 @@ namespace LoKi
      */
     const LoKi::Tracks::NTHits                                     TrTNORMIDC ;
     // ========================================================================
-#ifdef __INTEL_COMPILER
-#pragma warning(pop) 
-#endif
-    // ========================================================================
  } //                                            end of namespace LoKi::Tracks
   // ==========================================================================
 } //                                                      end of namespace LoKi 
diff --git a/Phys/LoKiTracks/cmt/requirements b/Phys/LoKiTracks/cmt/requirements
index fa669f2084e3a37bb6dc2216982a3a5c7039822b..e474bb54368b990251fbd9ac24293c11ede39541 100755
--- a/Phys/LoKiTracks/cmt/requirements
+++ b/Phys/LoKiTracks/cmt/requirements
@@ -1,4 +1,3 @@
-# $Id: requirements 124240 2011-06-05 13:35:37Z ibelyaev $ 
 # ============================================================================
 # Created    : 2007-06-08
 # Maintainer : Vanya BELYAEV
@@ -30,8 +29,7 @@ macro_append LoKiTracksDict_dependencies  " LoKiTracksLib "
 apply_pattern    reflex_dictionary                                       \
                  dictionary=LoKiTracks                                   \
                  headerfiles=$(LOKITRACKSROOT)/dict/LoKiTracksDict.h     \
-                 selectionfile=$(LOKITRACKSROOT)/dict/LoKiTracks.xml     \  
-                 options=" -U__MINGW32__ "
+                 selectionfile=$(LOKITRACKSROOT)/dict/LoKiTracks.xml
 
 # ============== patterns =====================================================
 apply_pattern    linker_library    library=LoKiTracksLib
diff --git a/Phys/LoKiTracks/dict/LoKiTracksDict.h b/Phys/LoKiTracks/dict/LoKiTracksDict.h
index 2dea1fb70c8cc6559e3d64a9bf27814b9ee79bf0..110e993bd72b4d7ae500a6f71ce501cb8c25d525 100755
--- a/Phys/LoKiTracks/dict/LoKiTracksDict.h
+++ b/Phys/LoKiTracks/dict/LoKiTracksDict.h
@@ -1,5 +1,3 @@
-// $Id: LoKiTracksDict.h 124240 2011-06-05 13:35:37Z ibelyaev $
-// ============================================================================
 #ifndef LOKI_LOKITRACKSDICT_H 
 #define LOKI_LOKITRACKSDICT_H 1
 // ============================================================================
@@ -18,11 +16,6 @@
 #include "LoKi/ITrackFunctorAntiFactory.h"
 #include "LoKi/TrackEngine.h"
 // ============================================================================
-#ifdef __INTEL_COMPILER
-#pragma warning(disable:177) //  variable ... was declared but never referenced
-#pragma warning(disable:191) // type qualifier is meaningless on cast type
-#endif
-// ============================================================================
 /** @file
  *  This file is a part of LoKi project - 
  *    "C++ ToolKit  for Smart and Friendly Physics Analysis"
@@ -31,14 +24,6 @@
  *  Galina PAKHLOVA and Sergey BARSUK.  Many bright ideas, 
  *  contributions and advices from G.Raven, J.van Tilburg, 
  *  A.Golutvin, P.Koppenburg have been used in the design.
- *
- *  By usage of this code one clearly states the disagreement 
- *  with the smear campaign of Dr.O.Callot et al.: 
- *  ``No Vanya's lines are allowed in LHCb/Gaudi software.''
- *
- *                    $Revision: 124240 $
- *  Last Modification $Date: 2011-06-05 15:35:37 +0200 (Sun, 05 Jun 2011) $ 
- *                 by $Author: ibelyaev $ 
  */
 // ============================================================================
 namespace LoKi
diff --git a/Phys/LoKiTracks/python/LoKiTracks/functions.py b/Phys/LoKiTracks/python/LoKiTracks/functions.py
index 8a8904815194836f593ade5ec3ba2f8fa65f861c..619713832e9b855af1ab0f15fa1c4b90851bf64f 100644
--- a/Phys/LoKiTracks/python/LoKiTracks/functions.py
+++ b/Phys/LoKiTracks/python/LoKiTracks/functions.py
@@ -11,10 +11,6 @@
 #  contributions and advices from G.Raven, J.van Tilburg, 
 #  A.Golutvin, P.Koppenburg have been used in the design.
 #
-#  By usage of this code one clearly states the disagreement 
-#  with the campain of Dr.O.Callot et al.: 
-#  ``No Vanya's lines are allowed in LHCb/Gaudi software.''
-#
 #  @author Vanya BELYAEV ibelyaev@physics.syr.edu
 #  @date 2007-06-09
 # =============================================================================
@@ -28,11 +24,6 @@ The package has been designed with the kind help from
 Galina PAKHLOVA and Sergey BARSUK.  Many bright ideas, 
 contributions and advices from G.Raven, J.van Tilburg, 
 A.Golutvin, P.Koppenburg have been used in the design.
-
-By usage of this code one clearly states the disagreement 
-with the campain of Dr.O.Callot et al.: 
- ``No Vanya's lines are allowed in LHCb/Gaudi software.''
- 
 """
 # =============================================================================
 __author__  = "Vanya BELYAEV  Ivan.Belyaev@nikhef.nl "
@@ -44,10 +35,8 @@ __version__ = "CVS tag $Name:$, version $Revision: 120449 $ "
 import LoKiCore.decorators as _LoKiCore 
 
 ## needed since there is no autoloading of Tracking dictionaries:
-import sys,PyCintex
-
-if sys.platform == 'win32' : PyCintex.loadDict (    "TrackEventDict" )  
-else                       : PyCintex.loadDict ( "libTrackEventDict" )  
+import PyCintex
+PyCintex.loadDict ( "libTrackEventDict" )  
 
 
 # Namespaces:
diff --git a/Phys/LoKiTracks/python/LoKiTracks/tests.py b/Phys/LoKiTracks/python/LoKiTracks/tests.py
index 83158d3b983d6cd495133d51625793d7b98c63fd..f5b041c16a7b62a4b84e89a5cf58c81bada13ab3 100755
--- a/Phys/LoKiTracks/python/LoKiTracks/tests.py
+++ b/Phys/LoKiTracks/python/LoKiTracks/tests.py
@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 # =============================================================================
-# $Id: tests.py 120055 2011-03-10 17:56:43Z ibelyaev $
-# =============================================================================
 ## @file   LoKiTracks/tests.py
 #  The simple test script for Phys/LoKiTracks package
 #
@@ -13,10 +11,6 @@
 #  contributions and advices from G.Raven, J.van Tilburg, 
 #  A.Golutvin, P.Koppenburg have been used in the design.
 #
-#  By usage of this code one clearly states the disagreement 
-#  with the campain of Dr.O.Callot et al.: 
-#  ``No Vanya's lines are allowed in LHCb/Gaudi software.''
-#
 #  @author Vanya BELYAEV ibelyaev@physics.syr.edu
 #  @date 2007-05-29
 # =============================================================================
@@ -30,11 +24,6 @@ The package has been designed with the kind help from
 Galina PAKHLOVA and Sergey BARSUK.  Many bright ideas, 
 contributions and advices from G.Raven, J.van Tilburg, 
 A.Golutvin, P.Koppenburg have been used in the design.
-
-By usage of this code one clearly states the disagreement 
-with the campain of Dr.O.Callot et al.: 
- ``No Vanya's lines are allowed in LHCb/Gaudi software.''
- 
 """
 # =============================================================================
 __author__   = "Vanya BELYAEV  Ivan.Belyaev@nikhef.nl"
@@ -42,12 +31,6 @@ __date__     = "2007-05-29"
 __version__  = "CVS tag $Name: not supported by cvs2svn $, verison $Revision: 120055 $ "
 # =============================================================================
 
-## needed since there is no autoloading of Tracking dictionaries:
-## import sys,PyCintex
-## if sys.platform == 'win32' : PyCintex.loadDict (    "TrackEventDict" )  
-## else                       : PyCintex.loadDict ( "libTrackEventDict" )  
-## import GaudiPython.Pythonizations
-
 import LoKiNumbers.decorators 
 from   LoKiTracks.decorators  import *
 from   LoKiCore.functions     import *
diff --git a/Phys/LoKiTracks/src/TrackIDs.cpp b/Phys/LoKiTracks/src/TrackIDs.cpp
index 4c7f24eaddf2bdf742ed6d10163372c9c9538a2a..ae862669dfe6b55913437027f78fff372d22a3a9 100644
--- a/Phys/LoKiTracks/src/TrackIDs.cpp
+++ b/Phys/LoKiTracks/src/TrackIDs.cpp
@@ -1,4 +1,3 @@
-// $Id: TrackIDs.cpp 124240 2011-06-05 13:35:37Z ibelyaev $
 // ============================================================================
 // Include files 
 // ============================================================================
@@ -14,10 +13,6 @@
 // ============================================================================
 #include "LoKi/TrackIDs.h"
 // ============================================================================
-#ifdef __INTEL_COMPILER
-#pragma warning(disable:177) //  variable ... was declared but never referenced
-#endif
-// ============================================================================
 // Boost
 // ============================================================================
 #include "boost/static_assert.hpp"
@@ -37,10 +32,6 @@
  *  contributions and advices from G.Raven, J.van Tilburg, 
  *  A.Golutvin, P.Koppenburg have been used in the design.
  *
- *  By usage of this code one clearly states the disagreement 
- *  with the campain of Dr.O.Callot et al.: 
- *  ``No Vanya's lines are allowed in LHCb/Gaudi software.''
- *
  *  @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
  *  @date   2009-12-17
  */
diff --git a/Phys/LoKiTrigger/LoKi/HltFunctions.h b/Phys/LoKiTrigger/LoKi/HltFunctions.h
index d39a93fb5c21973bedf2ed6b996c853c6c07c584..24b4e2f2a118b8fc54c05d86f62ebbfe24ca62b2 100755
--- a/Phys/LoKiTrigger/LoKi/HltFunctions.h
+++ b/Phys/LoKiTrigger/LoKi/HltFunctions.h
@@ -1,5 +1,3 @@
-// $Id: HltFunctions.h 124376 2011-06-07 10:44:10Z ibelyaev $
-// ============================================================================
 #ifndef LOKI_HLTFUNCTIONS_H 
 #define LOKI_HLTFUNCTIONS_H 1
 // ============================================================================
@@ -26,17 +24,9 @@
  *  Galina PAKHLOVA and Sergey BARSUK.  Many bright ideas, 
  *  contributions and advices from G.Raven, J.van Tilburg, 
  *  A.Golutvin, P.Koppenburg have been used in the design.
- * 
- *  By usage of this code one clearly states the disagreement 
- *  with the campain of Dr.O.Callot et al.: 
- *  ``No Vanya's lines are allowed in LHCb/Gaudi software.''
  *  
  *  @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
  *
- *                    $Revision: 124376 $
- *  Last Modification $Date: 2011-06-07 12:44:10 +0200 (Tue, 07 Jun 2011) $ 
- *                 by $Author: ibelyaev $ 
- *
  *  @todo HltFunctions.h check if we need all this stuff..
  */
 namespace LoKi 
@@ -45,11 +35,6 @@ namespace LoKi
   namespace Tracks
   {  
     // ========================================================================    
-#ifdef __INTEL_COMPILER
-#pragma warning(disable:654) // overloaded virtual function is only partially overridden
-#pragma warning(push)
-#endif
-    // ========================================================================
     /** @class DistanceOfClosestApproach 
      *  Evaluate the distance of the closest approach between two tracks.
      *
@@ -247,10 +232,6 @@ namespace LoKi
       { return s << "TTrDA" ; }
     } ;    
     // ========================================================================
-#ifdef __INTEL_COMPILER
-#pragma warning(pop)
-#endif
-    // ========================================================================
   } //                                            end of namespace LoKi::Tracks
   // ==========================================================================
 } //                                                      end of namespace LoKi 
diff --git a/Phys/LoKiTrigger/LoKi/HltStages.h b/Phys/LoKiTrigger/LoKi/HltStages.h
index 4b067a9569427d757eeff47772eacf8abdc00fdd..dd87ee43e7ed4beba7a6225e02e25ab025d02b5d 100644
--- a/Phys/LoKiTrigger/LoKi/HltStages.h
+++ b/Phys/LoKiTrigger/LoKi/HltStages.h
@@ -1,5 +1,3 @@
-// $Id: HltStages.h 124376 2011-06-07 10:44:10Z ibelyaev $
-// ============================================================================
 #ifndef LOKI_HLTSTAGES_H 
 #define LOKI_HLTSTAGES_H 1
 // ============================================================================
@@ -35,16 +33,8 @@
  *  contributions and advices from G.Raven, J.van Tilburg, 
  *  A.Golutvin, P.Koppenburg have been used in the design.
  *
- *  By usage of this code one clearly states the disagreement 
- *  with the campain of Dr.O.Callot et al.: 
- *  ``No Vanya's lines are allowed in LHCb/Gaudi software.''
- *
  *  @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
  *  @date 2010-08-01
- *
- *                    $Revision: 124376 $
- *  Last Modification $Date: 2011-06-07 12:44:10 +0200 (Tue, 07 Jun 2011) $ 
- *                 by $Author: ibelyaev $ 
  */
 // ============================================================================
 namespace LoKi 
@@ -772,14 +762,6 @@ namespace LoKi
   // ==========================================================================
   namespace Cuts 
   {
-    // ========================================================================    
-    // Suppress Intel compiler warnings about missing default constructor
-    // In this case the compiler generated constructor is fine, since there are
-    // no member data to be initialised
-#ifdef __INTEL_COMPILER
-#pragma warning(disable:854)
-#pragma warning(push)
-#endif
     // ========================================================================
     /** @var TS_TRACK 
      *  trivial predicate to check the type of Hlt::Stage 
@@ -1040,10 +1022,6 @@ namespace LoKi
      */
     typedef LoKi::Stages::Cache2                                TS_CACHE_BOOL ;
     // ========================================================================
-#ifdef __INTEL_COMPILER
-#pragma warning(pop) 
-#endif    
-    // ========================================================================
   } //                                              end of namespace LoKi::Cuts 
   // ==========================================================================
 } //                                                      end of namespace LoKi
diff --git a/Phys/LoKiTrigger/LoKi/OldTypes.h b/Phys/LoKiTrigger/LoKi/OldTypes.h
index 54e7363d88f0850aef9550ae5fa563af94b5a766..71a8ef21003c6150682be67ca23e7168bfaaa85d 100755
--- a/Phys/LoKiTrigger/LoKi/OldTypes.h
+++ b/Phys/LoKiTrigger/LoKi/OldTypes.h
@@ -1,5 +1,3 @@
-// $Id: OldTypes.h 124376 2011-06-07 10:44:10Z ibelyaev $
-// ============================================================================
 #ifndef LOKI_OLDTYPES_H 
 #define LOKI_OLDTYPES_H 1
 // ============================================================================
@@ -15,11 +13,6 @@
 #include "Event/Track.h"
 #include "Event/RecVertex.h"
 // ============================================================================
-#ifdef __INTEL_COMPILER
-#pragma warning(disable:654) // overloaded virtual function is only partially overridden
-#pragma warning(push)
-#endif
-// ============================================================================
 namespace LoKi 
 {
   // ==========================================================================
@@ -197,10 +190,6 @@ namespace LoKi
   // ==========================================================================
 } // end of namespace LoKi
 // ============================================================================
-#ifdef __INTEL_COMPILER
-#pragma warning(pop)
-#endif
-// ============================================================================
 namespace LoKi 
 {
   // ==========================================================================
diff --git a/Phys/LoKiTrigger/LoKi/RecVertices.h b/Phys/LoKiTrigger/LoKi/RecVertices.h
index 23d7732d6b03702c6f8e9d304b5bac76e2ffd3b1..878055055a3ec4ad7cbe37d346eb721156a5426c 100755
--- a/Phys/LoKiTrigger/LoKi/RecVertices.h
+++ b/Phys/LoKiTrigger/LoKi/RecVertices.h
@@ -1,5 +1,3 @@
-// $Id: RecVertices.h 124376 2011-06-07 10:44:10Z ibelyaev $
-// ============================================================================
 #ifndef LOKI_RECVERTICES_H 
 #define LOKI_RECVERTICES_H 1
 // ============================================================================
@@ -24,16 +22,8 @@
  *  contributions and advices from G.Raven, J.van Tilburg, 
  *  A.Golutvin, P.Koppenburg have been used in the design.
  *
- *  By usage of this code one clearly states the disagreement 
- *  with the campain of Dr.O.Callot et al.: 
- *  ``No Vanya's lines are allowed in LHCb/Gaudi software.''
- *
  *  @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
  *  @date 2010-08-01
- *
- *                    $Revision: 124376 $
- *  Last Modification $Date: 2011-06-07 12:44:10 +0200 (Tue, 07 Jun 2011) $ 
- *                 by $Author: ibelyaev $ 
  */
 namespace LoKi
 {
@@ -160,14 +150,6 @@ namespace LoKi
   // ==========================================================================
   namespace Cuts 
   {
-    // ========================================================================    
-    // Suppress Intel compiler warnings about missing default constructor
-    // In this case the compiler generated constructor is fine, since there are
-    // no member data to be initialised
-#ifdef __INTEL_COMPILER
-#pragma warning(disable:854)
-#pragma warning(push)
-#endif
     // ========================================================================
     /** @var RV_MAXDOCA 
      *  Simple evaluator for "DOCA-max" between all tracks in 
@@ -227,10 +209,6 @@ namespace LoKi
      */
     typedef LoKi::RecVertices::DOCACut                             RV_DOCACUT ;
     // ========================================================================
-#ifdef __INTEL_COMPILER
-#pragma warning(pop)
-#endif
-    // ========================================================================
   } //                                              end of namespace LoKi::Cuts 
   // ==========================================================================
 } //                                                      end of namespace LoKi
diff --git a/Phys/LoKiTrigger/cmt/requirements b/Phys/LoKiTrigger/cmt/requirements
index 929a6c5c38035f25ceb0df371280d6ae3d7bbd1e..92a37ce3ca8c0cd911870bf013700abf72251db3 100755
--- a/Phys/LoKiTrigger/cmt/requirements
+++ b/Phys/LoKiTrigger/cmt/requirements
@@ -1,4 +1,3 @@
-# $Id: requirements 124219 2011-06-03 11:44:26Z ibelyaev $ 
 # ============================================================================
 # Created    : 2007-06-08
 # Maintainer : Vanya BELYAEV
@@ -36,8 +35,7 @@ macro_append LoKiTriggerDict_dependencies  " LoKiTriggerLib "
 apply_pattern    reflex_dictionary                                         \
                  dictionary=LoKiTrigger                                    \
                  headerfiles=$(LOKITRIGGERROOT)/dict/LoKiTriggerDict.h     \
-                 selectionfile=$(LOKITRIGGERROOT)/dict/LoKiTrigger.xml     \  
-                 options=" -U__MINGW32__ "
+                 selectionfile=$(LOKITRIGGERROOT)/dict/LoKiTrigger.xml
 
 # ============== patterns =====================================================
 apply_pattern    linker_library    library=LoKiTriggerLib
diff --git a/Phys/LoKiTrigger/dict/LoKiTriggerDict.h b/Phys/LoKiTrigger/dict/LoKiTriggerDict.h
index b96532e195db95b24becb84e2bea5cdda39e4b53..98155550d9d945ffe79ed32d5ab6792796de268a 100755
--- a/Phys/LoKiTrigger/dict/LoKiTriggerDict.h
+++ b/Phys/LoKiTrigger/dict/LoKiTriggerDict.h
@@ -1,5 +1,3 @@
-// $Id: LoKiTriggerDict.h 124376 2011-06-07 10:44:10Z ibelyaev $
-// ============================================================================
 #ifndef LOKI_LOKITRIGGERDICT_H
 #define LOKI_LOKITRIGGERDICT_H 1
 // ============================================================================
@@ -57,22 +55,10 @@
  *  contributions and advices from G.Raven, J.van Tilburg, 
  *  A.Golutvin, P.Koppenburg have been used in the design.
  *
- *  By usage of this code one clearly states the disagreement 
- *  with the smear campaign of Dr.O.Callot et al.: 
- *  ``No Vanya's lines are allowed in LHCb/Gaudi software.''
- *  
  *  @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
  *  @date 2010-08-01
- * 
- *                    $Revision: 124376 $
- *  Last modification $Date: 2011-06-07 12:44:10 +0200 (Tue, 07 Jun 2011) $
- *                 by $Author: ibelyaev $     
  */
 // ============================================================================
-#ifdef __INTEL_COMPILER
-#pragma warning(disable:191) // type qualifier is meaningless on cast type
-#endif
-// ============================================================================
 namespace LoKi
 {
   // ==========================================================================
diff --git a/Phys/LoKiTrigger/src/HelperTool.cpp b/Phys/LoKiTrigger/src/HelperTool.cpp
index 8b3ce47108d008afd8ec90449ae6acd1e39fd30c..a6791537aa319c72a5a87ec6ee4ccbd887a2fd22 100644
--- a/Phys/LoKiTrigger/src/HelperTool.cpp
+++ b/Phys/LoKiTrigger/src/HelperTool.cpp
@@ -1,4 +1,3 @@
-// $Id: HelperTool.cpp 124376 2011-06-07 10:44:10Z ibelyaev $
 // ============================================================================
 // Include files 
 // ============================================================================
@@ -14,11 +13,6 @@
 // ============================================================================
 #include "GaudiAlg/GaudiAlgorithm.h"
 // ============================================================================
-#ifdef __INTEL_COMPILER
-#pragma warning(disable:1572) // non-pointer conversion ... may lose significant bits
-#pragma warning(push)
-#endif
-// ============================================================================
 // HltBase 
 // ============================================================================
 #include "HltBase/HltUtils.h"
@@ -34,10 +28,6 @@
 // ============================================================================
 #include  "LTTools.h"
 // ============================================================================
-#ifdef __INTEL_COMPILER
-#pragma warning(pop)
-#endif
-// ============================================================================
 /** @file
  *  Implementation file for class LoKi::Hlt1::HelperTool
  *  @date 2010-10-30 
diff --git a/Phys/LoKiTrigger/src/Hlt1Functions.cpp b/Phys/LoKiTrigger/src/Hlt1Functions.cpp
index f8700f89ba030de1ad61cee9785b1abe21c43bc0..4383a04ba97edd1197f6548140725814b1259715 100644
--- a/Phys/LoKiTrigger/src/Hlt1Functions.cpp
+++ b/Phys/LoKiTrigger/src/Hlt1Functions.cpp
@@ -1,4 +1,3 @@
-// $Id: Hlt1Functions.cpp 124376 2011-06-07 10:44:10Z ibelyaev $
 // ============================================================================
 // Include files 
 // ============================================================================
@@ -25,19 +24,10 @@
 // ============================================================================
 #include "KalmanFilter/FastVertex.h"
 // ============================================================================
-#ifdef __INTEL_COMPILER
-#pragma warning(disable:177) //variable ... was declared but never referenced
-#pragma warning(push) 
-#endif
-// ============================================================================
 // Boost 
 // ============================================================================
 #include "boost/lambda/bind.hpp"
 // ============================================================================
-#ifdef __INTEL_COMPILER
-#pragma warning(pop) 
-#endif
-// ============================================================================
 /** @file 
  *  implementation file for classed form the file LoKi/Hlt1Functions.h
  *
@@ -49,16 +39,8 @@
  *  contributions and advices from G.Raven, J.van Tilburg, 
  *  A.Golutvin, P.Koppenburg have been used in the design.
  *
- *  By usage of this code one clearly states the disagreement 
- *  with the campain of Dr.O.Callot et al.: 
- *  ``No Vanya's lines are allowed in LHCb/Gaudi software.''
- *
  *  @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
  *  @date 2009-03-30
- * 
- *                    $Revision: 124376 $
- *  Last Modification $Date: 2011-06-07 12:44:10 +0200 (Tue, 07 Jun 2011) $ 
- *                 by $Author: ibelyaev $ 
  */  
 // ============================================================================
 namespace 
diff --git a/Phys/LoKiTrigger/src/MatchTool.cpp b/Phys/LoKiTrigger/src/MatchTool.cpp
index 7746d1dacb3c1dae02403bc806493d271e97dc61..a09d4955da3cb6e918f83f27c8183245b3734175 100644
--- a/Phys/LoKiTrigger/src/MatchTool.cpp
+++ b/Phys/LoKiTrigger/src/MatchTool.cpp
@@ -1,4 +1,3 @@
-// $Id: MatchTool.cpp 124376 2011-06-07 10:44:10Z ibelyaev $
 // ============================================================================
 // Include files
 // ============================================================================
@@ -6,11 +5,6 @@
 // ============================================================================
 #include "GaudiAlg/GaudiAlgorithm.h"
 // ============================================================================
-#ifdef __INTEL_COMPILER
-#pragma warning(disable:1572) // non-pointer conversion ... may lose significant bits
-#pragma warning(push)
-#endif
-// ============================================================================
 // Kernel
 // ============================================================================
 #include "Kernel/IANNSvc.h"
@@ -28,26 +22,14 @@
 // ============================================================================
 #include "LTTools.h"
 // ============================================================================
-#ifdef __INTEL_COMPILER
-#pragma warning(pop)
-#endif
-// ============================================================================
 /** @file 
  *  Implementation file for class LoKi::Hlt1::MatchTool 
  * 
  *  This file is part of LoKi project: 
  *   ``C++ ToolKit for Smart and Friendly Physics Analysis''
- * 
- *  By usage of this code one clearly states the disagreement 
- *  with the campain of Dr.O.Callot et al.: 
- *  ``No Vanya's lines are allowed in LHCb/Gaudi software.''
- *  
+ *
  *  @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
  *  @date   2010-10-28
- *
- *  $Revision: 124376 $
- *  Last Modification $Date: 2011-06-07 12:44:10 +0200 (Tue, 07 Jun 2011) $ 
- *                 by $Author: ibelyaev $
  */
 // ============================================================================
 
diff --git a/Phys/LoKiTrigger/src/UpgradeTool.cpp b/Phys/LoKiTrigger/src/UpgradeTool.cpp
index b2ba02919b77955199c0c859673e826206b204d1..6d0379957a249fbb2a84b52f5af0945e913b810f 100755
--- a/Phys/LoKiTrigger/src/UpgradeTool.cpp
+++ b/Phys/LoKiTrigger/src/UpgradeTool.cpp
@@ -1,4 +1,3 @@
-// $Id: UpgradeTool.cpp 124376 2011-06-07 10:44:10Z ibelyaev $
 // ============================================================================
 // Include files 
 // ============================================================================
@@ -14,11 +13,6 @@
 // ============================================================================
 #include "GaudiAlg/GaudiAlgorithm.h"
 // ============================================================================
-#ifdef __INTEL_COMPILER
-#pragma warning(disable:1572) // non-pointer conversion ... may lose significant bits
-#pragma warning(push)
-#endif
-// ============================================================================
 // HltBase 
 // ============================================================================
 #include "HltBase/HltUtils.h"
@@ -33,9 +27,6 @@
 // Local 
 // ============================================================================
 #include  "LTTools.h"
-#ifdef __INTEL_COMPILER
-#pragma warning(pop)
-#endif
 // ============================================================================
 /** @file
  *  Implementation file for class LoKi::Hlt1::UpgradeTool
@@ -70,10 +61,6 @@ LoKi::Hlt1::UpgradeTool::UpgradeTool
 namespace
 {
   // ==========================================================================
-#ifdef __INTEL_COMPILER
-#pragma warning(disable:177) //  function .. was declared but never referenced
-#endif
-  // ==========================================================================
   /// move LHCbIDs
   inline void moveIDs ( const LHCb::Track* tr1 , LHCb::Track* tr2 )
   {
diff --git a/Phys/LoKiTrigger/src/VxCreator.cpp b/Phys/LoKiTrigger/src/VxCreator.cpp
index b5cf88e100d715529824f4aa3de1758add6418d3..2e6d9e9a3401703c6fd0402a4f4b013f330e41e6 100755
--- a/Phys/LoKiTrigger/src/VxCreator.cpp
+++ b/Phys/LoKiTrigger/src/VxCreator.cpp
@@ -1,12 +1,6 @@
-// $Id: VxCreator.cpp 124376 2011-06-07 10:44:10Z ibelyaev $
 // ============================================================================
 // Include files 
 // ============================================================================
-#ifdef __INTEL_COMPILER
-#pragma warning(disable:1572) // non-pointer conversion ... may lose significant bits
-#pragma warning(push)
-#endif
-// ============================================================================
 // HltBase 
 // ============================================================================
 #include "HltBase/HltUtils.h"
@@ -20,10 +14,6 @@
 // ============================================================================
 #include "LTTools.h"
 // ============================================================================
-#ifdef __INTEL_COMPILER
-#pragma warning(pop)
-#endif
-// ============================================================================
 /** @file 
  *  Implementation file for class LoKi::Hlt1::VxCreator
  *  @date 2008-11-14 
diff --git a/Phys/LoKiTrigger/src/VxMaker.cpp b/Phys/LoKiTrigger/src/VxMaker.cpp
index d5234f44af237b43d6046bb2fe7743933ec5ede9..ddfc043e3460ce2c09ce03ca9dbc326d05056109 100755
--- a/Phys/LoKiTrigger/src/VxMaker.cpp
+++ b/Phys/LoKiTrigger/src/VxMaker.cpp
@@ -1,12 +1,6 @@
-// $Id: VxMaker.cpp 124376 2011-06-07 10:44:10Z ibelyaev $
 // ============================================================================
 // Include files 
 // ============================================================================
-#ifdef __INTEL_COMPILER
-#pragma warning(disable:1572) // non-pointer conversion ... may lose significant bits
-#pragma warning(push)
-#endif
-// ============================================================================
 // HltBase 
 // ============================================================================
 #include "HltBase/HltUtils.h"
@@ -28,10 +22,6 @@
 #include "LoKi/Constants.h"
 #include  "LTTools.h"
 // ============================================================================
-#ifdef __INTEL_COMPILER
-#pragma warning(pop)
-#endif
-// ============================================================================
 /** @file 
  *
  *  Implementation file for class LoKi::Hlt1::VxMaker
@@ -42,17 +32,9 @@
  *  Galina PAKHLOVA and Sergey BARSUK.  Many bright ideas, 
  *  contributions and advices from G.Raven, J.van Tilburg, 
  *  A.Golutvin, P.Koppenburg have been used in the design.
- *
- *  By usage of this code one clearly states the disagreement 
- *  with the smear campaign of Dr.O.Callot et al.: 
- *  ``No Vanya's lines are allowed in LHCb/Gaudi software.''
  *  
  *  @author Vanya BELYAEV Ivan.Belyaev@nikhef.nl
  *  @date   2010-10-28
- *
- *                    $Revision: 124376 $
- *  Last Modification $Date: 2011-06-07 12:44:10 +0200 (Tue, 07 Jun 2011) $ 
- *                 by $Author: ibelyaev $
  */ 
 // ============================================================================
 namespace