diff --git a/.gitignore b/.gitignore
index 7ed00b371824a8816c3ef9d10c186352e00fef2c..abf509445a599ccd38f7ccae97872ea144e090bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,13 @@
 *.pyc
 .asetup*
 .cproject
+*.kdevelop
+#Binary formats
+*.so*
+*.out
+*.exe*
+*.a
+*.la
+*.lib
+*.root
+tmp.*
diff --git a/InnerDetector/InDetEventCnv/InDetEventCnvTools/InDetEventCnvTools.kdevelop b/InnerDetector/InDetEventCnv/InDetEventCnvTools/InDetEventCnvTools.kdevelop
deleted file mode 100755
index 2f16b045790f2c9e70c2f127de1e4c904496374a..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetEventCnv/InDetEventCnvTools/InDetEventCnvTools.kdevelop
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version = '1.0'?>
-<kdevelop>
-  <general>
-    <author>Edward Moyse</author>
-    <email>emoyse@macatc06.cern.ch</email>
-    <version>$VERSION$</version>
-    <projectmanagement>KDevCustomProject</projectmanagement>
-    <primarylanguage>C</primarylanguage>
-    <ignoreparts/>
-  </general>
-  <kdevcustomproject>
-    <run>
-      <mainprogram>InDetEventCnvTools</mainprogram>
-      <directoryradio>executable</directoryradio>
-    </run>
-  </kdevcustomproject>
-  <kdevdebugger>
-    <general>
-      <dbgshell/>
-    </general>
-  </kdevdebugger>
-  <kdevdoctreeview>
-    <ignoretocs>
-      <toc>ada</toc>
-      <toc>ada_bugs_gcc</toc>
-      <toc>bash</toc>
-      <toc>bash_bugs</toc>
-      <toc>clanlib</toc>
-      <toc>fortran_bugs_gcc</toc>
-      <toc>gnome1</toc>
-      <toc>gnustep</toc>
-      <toc>gtk</toc>
-      <toc>gtk_bugs</toc>
-      <toc>haskell</toc>
-      <toc>haskell_bugs_ghc</toc>
-      <toc>java_bugs_gcc</toc>
-      <toc>java_bugs_sun</toc>
-      <toc>kde2book</toc>
-      <toc>libstdc++</toc>
-      <toc>opengl</toc>
-      <toc>pascal_bugs_fp</toc>
-      <toc>php</toc>
-      <toc>php_bugs</toc>
-      <toc>perl</toc>
-      <toc>perl_bugs</toc>
-      <toc>python</toc>
-      <toc>python_bugs</toc>
-      <toc>qt-kdev3</toc>
-      <toc>ruby</toc>
-      <toc>ruby_bugs</toc>
-      <toc>sdl</toc>
-      <toc>stl</toc>
-      <toc>sw</toc>
-      <toc>w3c-dom-level2-html</toc>
-      <toc>w3c-svg</toc>
-      <toc>w3c-uaag10</toc>
-      <toc>wxwidgets_bugs</toc>
-    </ignoretocs>
-    <ignoreqt_xml>
-      <toc>Guide to the Qt Translation Tools</toc>
-      <toc>Qt Assistant Manual</toc>
-      <toc>Qt Designer Manual</toc>
-      <toc>Qt Reference Documentation</toc>
-      <toc>qmake User Guide</toc>
-    </ignoreqt_xml>
-    <ignoredoxygen>
-      <toc>KDE Libraries (Doxygen)</toc>
-    </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevfilecreate>
-    <filetypes/>
-    <useglobaltypes>
-      <type ext="c" />
-      <type ext="h" />
-    </useglobaltypes>
-  </kdevfilecreate>
-  <kdevcppsupport>
-    <references/>
-    <codecompletion>
-      <includeGlobalFunctions>true</includeGlobalFunctions>
-      <includeTypes>true</includeTypes>
-      <includeEnums>true</includeEnums>
-      <includeTypedefs>false</includeTypedefs>
-      <automaticCodeCompletion>true</automaticCodeCompletion>
-      <automaticArgumentsHint>true</automaticArgumentsHint>
-      <automaticHeaderCompletion>true</automaticHeaderCompletion>
-      <codeCompletionDelay>250</codeCompletionDelay>
-      <argumentsHintDelay>400</argumentsHintDelay>
-      <headerCompletionDelay>250</headerCompletionDelay>
-    </codecompletion>
-  </kdevcppsupport>
-  <kdevfileview>
-    <groups>
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidenonlocation>false</hidenonlocation>
-    </groups>
-    <tree>
-      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-    </tree>
-  </kdevfileview>
-</kdevelop>
diff --git a/InnerDetector/InDetRecEvent/InDetPrepRawData/InDetPrepRawData.kdevelop b/InnerDetector/InDetRecEvent/InDetPrepRawData/InDetPrepRawData.kdevelop
deleted file mode 100755
index c971aab855749e026b84ce5ea92544865b65d273..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecEvent/InDetPrepRawData/InDetPrepRawData.kdevelop
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version = '1.0'?>
-<kdevelop>
-  <general>
-    <author>Andreas WILDAUER</author>
-    <email>andreas.wildauer@cern.ch</email>
-    <version>$VERSION$</version>
-    <projectmanagement>KDevCustomProject</projectmanagement>
-    <primarylanguage>C++</primarylanguage>
-    <ignoreparts/>
-    <projectname>InDetPrepRawData</projectname>
-  </general>
-  <kdevcustomproject>
-    <run>
-      <mainprogram>$APPNAMELC$</mainprogram>
-    </run>
-  </kdevcustomproject>
-  <kdevdebugger>
-    <general>
-      <dbgshell/>
-    </general>
-  </kdevdebugger>
-  <kdevdoctreeview>
-    <ignoretocs>
-      <toc>ada</toc>
-      <toc>ada_bugs_gcc</toc>
-      <toc>bash</toc>
-      <toc>bash_bugs</toc>
-      <toc>clanlib</toc>
-      <toc>fortran_bugs_gcc</toc>
-      <toc>gnome1</toc>
-      <toc>gnustep</toc>
-      <toc>gtk</toc>
-      <toc>gtk_bugs</toc>
-      <toc>haskell</toc>
-      <toc>haskell_bugs_ghc</toc>
-      <toc>java_bugs_gcc</toc>
-      <toc>java_bugs_sun</toc>
-      <toc>kde2book</toc>
-      <toc>opengl</toc>
-      <toc>pascal_bugs_fp</toc>
-      <toc>php</toc>
-      <toc>php_bugs</toc>
-      <toc>perl</toc>
-      <toc>perl_bugs</toc>
-      <toc>python</toc>
-      <toc>python_bugs</toc>
-      <toc>qt-kdev3</toc>
-      <toc>ruby</toc>
-      <toc>ruby_bugs</toc>
-      <toc>sdl</toc>
-      <toc>sw</toc>
-      <toc>w3c-dom-level2-html</toc>
-      <toc>w3c-svg</toc>
-      <toc>w3c-uaag10</toc>
-      <toc>wxwidgets_bugs</toc>
-    </ignoretocs>
-    <ignoreqt_xml>
-      <toc>Guide to the Qt Translation Tools</toc>
-      <toc>Qt Assistant Manual</toc>
-      <toc>Qt Designer Manual</toc>
-      <toc>Qt Reference Documentation</toc>
-      <toc>qmake User Guide</toc>
-    </ignoreqt_xml>
-    <ignoredoxygen>
-      <toc>KDE Libraries (Doxygen)</toc>
-    </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevfilecreate>
-    <filetypes/>
-    <useglobaltypes>
-      <type ext="ui" />
-      <type ext="cpp" />
-      <type ext="h" />
-    </useglobaltypes>
-  </kdevfilecreate>
-</kdevelop>
diff --git a/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/InDetRIO_OnTrack.kdevelop b/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/InDetRIO_OnTrack.kdevelop
deleted file mode 100755
index 03d61ae790e91989bd18adb51f928e5ae8c55646..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/InDetRIO_OnTrack.kdevelop
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version = '1.0'?>
-<kdevelop>
-  <general>
-    <author>Andreas WILDAUER</author>
-    <email>andreas.wildauer@cern.ch</email>
-    <version>$VERSION$</version>
-    <projectmanagement>KDevCustomProject</projectmanagement>
-    <primarylanguage>C++</primarylanguage>
-    <ignoreparts/>
-    <projectname>InDetRIO_OnTrack</projectname>
-  </general>
-  <kdevcustomproject>
-    <run>
-      <mainprogram>$APPNAMELC$</mainprogram>
-    </run>
-  </kdevcustomproject>
-  <kdevdebugger>
-    <general>
-      <dbgshell/>
-    </general>
-  </kdevdebugger>
-  <kdevdoctreeview>
-    <ignoretocs>
-      <toc>ada</toc>
-      <toc>ada_bugs_gcc</toc>
-      <toc>bash</toc>
-      <toc>bash_bugs</toc>
-      <toc>clanlib</toc>
-      <toc>fortran_bugs_gcc</toc>
-      <toc>gnome1</toc>
-      <toc>gnustep</toc>
-      <toc>gtk</toc>
-      <toc>gtk_bugs</toc>
-      <toc>haskell</toc>
-      <toc>haskell_bugs_ghc</toc>
-      <toc>java_bugs_gcc</toc>
-      <toc>java_bugs_sun</toc>
-      <toc>kde2book</toc>
-      <toc>opengl</toc>
-      <toc>pascal_bugs_fp</toc>
-      <toc>php</toc>
-      <toc>php_bugs</toc>
-      <toc>perl</toc>
-      <toc>perl_bugs</toc>
-      <toc>python</toc>
-      <toc>python_bugs</toc>
-      <toc>qt-kdev3</toc>
-      <toc>ruby</toc>
-      <toc>ruby_bugs</toc>
-      <toc>sdl</toc>
-      <toc>sw</toc>
-      <toc>w3c-dom-level2-html</toc>
-      <toc>w3c-svg</toc>
-      <toc>w3c-uaag10</toc>
-      <toc>wxwidgets_bugs</toc>
-    </ignoretocs>
-    <ignoreqt_xml>
-      <toc>Guide to the Qt Translation Tools</toc>
-      <toc>Qt Assistant Manual</toc>
-      <toc>Qt Designer Manual</toc>
-      <toc>Qt Reference Documentation</toc>
-      <toc>qmake User Guide</toc>
-    </ignoreqt_xml>
-    <ignoredoxygen>
-      <toc>KDE Libraries (Doxygen)</toc>
-    </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevfilecreate>
-    <filetypes/>
-    <useglobaltypes>
-      <type ext="ui" />
-      <type ext="cpp" />
-      <type ext="h" />
-    </useglobaltypes>
-  </kdevfilecreate>
-</kdevelop>
diff --git a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/cmt/cdb.log b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/cmt/cdb.log
old mode 100644
new mode 100755
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/doc/BTagging.kdevelop b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/doc/BTagging.kdevelop
deleted file mode 100755
index 4a2e1108321220d491b4cb97fae2e390c2584740..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/doc/BTagging.kdevelop
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version = '1.0'?>
-<kdevelop>
-  <general>
-    <author>Per Fredrik AKESSON</author>
-    <email>fredrik.akesson@cern.ch</email>
-    <version>$VERSION$</version>
-    <projectmanagement>KDevCustomProject</projectmanagement>
-    <primarylanguage>C++</primarylanguage>
-    <ignoreparts/>
-    <projectdirectory>../</projectdirectory>
-    <absoluteprojectpath>false</absoluteprojectpath>
-    <description/>
-    <secondaryLanguages/>
-  </general>
-  <kdevcustomproject>
-    <run>
-      <mainprogram>BTagging</mainprogram>
-      <directoryradio>executable</directoryradio>
-      <customdirectory>/</customdirectory>
-      <programargs/>
-      <terminal>false</terminal>
-      <autocompile>true</autocompile>
-      <envvars/>
-    </run>
-    <build>
-      <buildtool>make</buildtool>
-      <builddir/>
-    </build>
-    <make>
-      <abortonerror>false</abortonerror>
-      <numberofjobs>1</numberofjobs>
-      <prio>0</prio>
-      <dontact>false</dontact>
-      <makebin/>
-      <makeoptions/>
-      <selectedenvironment>default</selectedenvironment>
-      <environments>
-        <default/>
-      </environments>
-    </make>
-  </kdevcustomproject>
-  <kdevdebugger>
-    <general>
-      <dbgshell/>
-      <programargs/>
-      <gdbpath/>
-      <configGdbScript/>
-      <runShellScript/>
-      <runGdbScript/>
-      <breakonloadinglibs>true</breakonloadinglibs>
-      <separatetty>false</separatetty>
-      <floatingtoolbar>false</floatingtoolbar>
-    </general>
-    <display>
-      <staticmembers>false</staticmembers>
-      <demanglenames>true</demanglenames>
-      <outputradix>10</outputradix>
-    </display>
-  </kdevdebugger>
-  <kdevdoctreeview>
-    <ignoretocs>
-      <toc>ada</toc>
-      <toc>ada_bugs_gcc</toc>
-      <toc>bash</toc>
-      <toc>bash_bugs</toc>
-      <toc>clanlib</toc>
-      <toc>fortran_bugs_gcc</toc>
-      <toc>gnome1</toc>
-      <toc>gnustep</toc>
-      <toc>gtk</toc>
-      <toc>gtk_bugs</toc>
-      <toc>haskell</toc>
-      <toc>haskell_bugs_ghc</toc>
-      <toc>java_bugs_gcc</toc>
-      <toc>java_bugs_sun</toc>
-      <toc>kde2book</toc>
-      <toc>opengl</toc>
-      <toc>pascal_bugs_fp</toc>
-      <toc>php</toc>
-      <toc>php_bugs</toc>
-      <toc>perl</toc>
-      <toc>perl_bugs</toc>
-      <toc>python</toc>
-      <toc>python_bugs</toc>
-      <toc>qt-kdev3</toc>
-      <toc>ruby</toc>
-      <toc>ruby_bugs</toc>
-      <toc>sdl</toc>
-      <toc>sw</toc>
-      <toc>w3c-dom-level2-html</toc>
-      <toc>w3c-svg</toc>
-      <toc>w3c-uaag10</toc>
-      <toc>wxwidgets_bugs</toc>
-    </ignoretocs>
-    <ignoreqt_xml>
-      <toc>Guide to the Qt Translation Tools</toc>
-      <toc>Qt Assistant Manual</toc>
-      <toc>Qt Designer Manual</toc>
-      <toc>Qt Reference Documentation</toc>
-      <toc>qmake User Guide</toc>
-    </ignoreqt_xml>
-    <ignoredoxygen>
-      <toc>KDE Libraries (Doxygen)</toc>
-    </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevfilecreate>
-    <filetypes/>
-    <useglobaltypes>
-      <type ext="ui" />
-      <type ext="cpp" />
-      <type ext="h" />
-    </useglobaltypes>
-  </kdevfilecreate>
-  <cppsupportpart>
-    <filetemplates>
-      <interfacesuffix>.h</interfacesuffix>
-      <implementationsuffix>.cpp</implementationsuffix>
-    </filetemplates>
-  </cppsupportpart>
-  <kdevcppsupport>
-    <codecompletion>
-      <includeGlobalFunctions>true</includeGlobalFunctions>
-      <includeTypes>true</includeTypes>
-      <includeEnums>true</includeEnums>
-      <includeTypedefs>false</includeTypedefs>
-      <automaticCodeCompletion>true</automaticCodeCompletion>
-      <automaticArgumentsHint>true</automaticArgumentsHint>
-      <automaticHeaderCompletion>true</automaticHeaderCompletion>
-      <codeCompletionDelay>250</codeCompletionDelay>
-      <argumentsHintDelay>400</argumentsHintDelay>
-      <headerCompletionDelay>250</headerCompletionDelay>
-    </codecompletion>
-    <references/>
-  </kdevcppsupport>
-  <kdevcvsservice>
-    <recursivewhenupdate>true</recursivewhenupdate>
-    <prunedirswhenupdate>true</prunedirswhenupdate>
-    <createdirswhenupdate>true</createdirswhenupdate>
-    <recursivewhencommitremove>true</recursivewhencommitremove>
-    <revertoptions>-C</revertoptions>
-  </kdevcvsservice>
-  <kdevfileview>
-    <groups>
-      <group pattern="*.py" name="JobOptions" />
-      <group pattern="*.h" name="Header" />
-      <group pattern="*.cxx" name="Source" />
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidenonlocation>false</hidenonlocation>
-    </groups>
-    <tree>
-      <showvcsfields>false</showvcsfields>
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
-    </tree>
-  </kdevfileview>
-</kdevelop>
diff --git a/PhysicsAnalysis/JetTagging/JetTagEvent/doc/JetTagEvent.kdevelop b/PhysicsAnalysis/JetTagging/JetTagEvent/doc/JetTagEvent.kdevelop
deleted file mode 100755
index d7efb34858ffb33c810c295346be5a4563f6b924..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/JetTagging/JetTagEvent/doc/JetTagEvent.kdevelop
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version = '1.0'?>
-<kdevelop>
-  <general>
-    <author>Per Fredrik AKESSON</author>
-    <email>fredrik.akesson@cern.ch</email>
-    <version>$VERSION$</version>
-    <projectmanagement>KDevCustomProject</projectmanagement>
-    <primarylanguage>C++</primarylanguage>
-    <ignoreparts/>
-    <projectdirectory>../</projectdirectory>
-    <absoluteprojectpath>false</absoluteprojectpath>
-    <description/>
-    <secondaryLanguages/>
-  </general>
-  <kdevcustomproject>
-    <run>
-      <mainprogram>JetTagEvent</mainprogram>
-      <directoryradio>executable</directoryradio>
-      <customdirectory>/</customdirectory>
-      <programargs/>
-      <terminal>false</terminal>
-      <autocompile>true</autocompile>
-      <envvars/>
-    </run>
-    <build>
-      <buildtool>make</buildtool>
-      <builddir/>
-    </build>
-    <make>
-      <abortonerror>false</abortonerror>
-      <numberofjobs>1</numberofjobs>
-      <prio>0</prio>
-      <dontact>false</dontact>
-      <makebin/>
-      <makeoptions/>
-      <selectedenvironment>default</selectedenvironment>
-      <environments>
-        <default/>
-      </environments>
-    </make>
-  </kdevcustomproject>
-  <kdevdebugger>
-    <general>
-      <dbgshell/>
-      <programargs/>
-      <gdbpath/>
-      <configGdbScript/>
-      <runShellScript/>
-      <runGdbScript/>
-      <breakonloadinglibs>true</breakonloadinglibs>
-      <separatetty>false</separatetty>
-      <floatingtoolbar>false</floatingtoolbar>
-    </general>
-    <display>
-      <staticmembers>false</staticmembers>
-      <demanglenames>true</demanglenames>
-      <outputradix>10</outputradix>
-    </display>
-  </kdevdebugger>
-  <kdevdoctreeview>
-    <ignoretocs>
-      <toc>ada</toc>
-      <toc>ada_bugs_gcc</toc>
-      <toc>bash</toc>
-      <toc>bash_bugs</toc>
-      <toc>clanlib</toc>
-      <toc>fortran_bugs_gcc</toc>
-      <toc>gnome1</toc>
-      <toc>gnustep</toc>
-      <toc>gtk</toc>
-      <toc>gtk_bugs</toc>
-      <toc>haskell</toc>
-      <toc>haskell_bugs_ghc</toc>
-      <toc>java_bugs_gcc</toc>
-      <toc>java_bugs_sun</toc>
-      <toc>kde2book</toc>
-      <toc>opengl</toc>
-      <toc>pascal_bugs_fp</toc>
-      <toc>php</toc>
-      <toc>php_bugs</toc>
-      <toc>perl</toc>
-      <toc>perl_bugs</toc>
-      <toc>python</toc>
-      <toc>python_bugs</toc>
-      <toc>qt-kdev3</toc>
-      <toc>ruby</toc>
-      <toc>ruby_bugs</toc>
-      <toc>sdl</toc>
-      <toc>sw</toc>
-      <toc>w3c-dom-level2-html</toc>
-      <toc>w3c-svg</toc>
-      <toc>w3c-uaag10</toc>
-      <toc>wxwidgets_bugs</toc>
-    </ignoretocs>
-    <ignoreqt_xml>
-      <toc>Guide to the Qt Translation Tools</toc>
-      <toc>Qt Assistant Manual</toc>
-      <toc>Qt Designer Manual</toc>
-      <toc>Qt Reference Documentation</toc>
-      <toc>qmake User Guide</toc>
-    </ignoreqt_xml>
-    <ignoredoxygen>
-      <toc>KDE Libraries (Doxygen)</toc>
-    </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevfilecreate>
-    <filetypes/>
-    <useglobaltypes>
-      <type ext="ui" />
-      <type ext="cpp" />
-      <type ext="h" />
-    </useglobaltypes>
-  </kdevfilecreate>
-  <cppsupportpart>
-    <filetemplates>
-      <interfacesuffix>.h</interfacesuffix>
-      <implementationsuffix>.cpp</implementationsuffix>
-    </filetemplates>
-  </cppsupportpart>
-  <kdevcppsupport>
-    <codecompletion>
-      <includeGlobalFunctions>true</includeGlobalFunctions>
-      <includeTypes>true</includeTypes>
-      <includeEnums>true</includeEnums>
-      <includeTypedefs>false</includeTypedefs>
-      <automaticCodeCompletion>true</automaticCodeCompletion>
-      <automaticArgumentsHint>true</automaticArgumentsHint>
-      <automaticHeaderCompletion>true</automaticHeaderCompletion>
-      <codeCompletionDelay>250</codeCompletionDelay>
-      <argumentsHintDelay>400</argumentsHintDelay>
-      <headerCompletionDelay>250</headerCompletionDelay>
-    </codecompletion>
-    <references/>
-  </kdevcppsupport>
-  <kdevcvsservice>
-    <recursivewhenupdate>true</recursivewhenupdate>
-    <prunedirswhenupdate>true</prunedirswhenupdate>
-    <createdirswhenupdate>true</createdirswhenupdate>
-    <recursivewhencommitremove>true</recursivewhencommitremove>
-    <revertoptions>-C</revertoptions>
-  </kdevcvsservice>
-  <kdevfileview>
-    <groups>
-      <group pattern="requirements" name="Requirements" />
-      <group pattern="*.xml" name="XML Files" />
-      <group pattern="*.py" name="JobOptions" />
-      <group pattern="*.h" name="Header" />
-      <group pattern="*.cxx" name="Source" />
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidenonlocation>false</hidenonlocation>
-    </groups>
-    <tree>
-      <showvcsfields>false</showvcsfields>
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
-    </tree>
-  </kdevfileview>
-</kdevelop>
diff --git a/Tools/RunTimeTester/src/TestSuiteFixtures/Fixtures1/Readme.txt~ b/Tools/RunTimeTester/src/TestSuiteFixtures/Fixtures1/Readme.txt~
deleted file mode 100755
index f685b2339280480bb023c37b42f5aa2907caf7df..0000000000000000000000000000000000000000
--- a/Tools/RunTimeTester/src/TestSuiteFixtures/Fixtures1/Readme.txt~
+++ /dev/null
@@ -1,2 +0,0 @@
-monolithic builds
-RTT provides package conf file
diff --git a/Tools/RunTimeTester/src/TestSuiteFixtures/Fixtures1/cfg/rttUnitTests.xml~ b/Tools/RunTimeTester/src/TestSuiteFixtures/Fixtures1/cfg/rttUnitTests.xml~
deleted file mode 100755
index 1a67f0efcbaefc58da2ebea844cfed8ab68d4754..0000000000000000000000000000000000000000
--- a/Tools/RunTimeTester/src/TestSuiteFixtures/Fixtures1/cfg/rttUnitTests.xml~
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-
-
-<!DOCTYPE rttconfig SYSTEM "http://www.hep.ucl.ac.uk/atlas/AtlasTesting/DTD/RTT.dtd">
-
-
-<!-- <!DOCTYPE rttconfig SYSTEM "RTT.dtd"> -->
-<rttconfig>
-   <mode>PBS</mode>
-   <release>11.0.0</release>
-   <refRelease>11.0.0</refRelease>
-   <build>opt</build>
-   <branch>N.X.0</branch>
-   <workBasePath>TESTSUITESCRATCH/Work</workBasePath>
-   <resultsBasePath>TESTSUITESCRATCH/Results</resultsBasePath>
-   <site>CERN</site>
-   <dataSetCatalog>TESTSUITESCRATCH/xml/rttUnitTestDataSetCatalog.xml</dataSetCatalog>
-   <jobGroupConfig>TESTSUITESCRATCH/xml/rttUnitTestTopLevelJobGroup.xml</jobGroupConfig>
-   <refDB>
-      <file>TESTSUITESCRATCH/rttUnitTestRefFile.db</file>
-      <enable>1</enable>
-   </refDB>
-
-
-   <confFileSrc>
-      <rttProvides>
-        <!-- <packageConfFile> -->
-           <!-- <package>HelloWorld</package> -->
-           <!-- <pathToFile>/local_disk/sherwood/RTT/HelloWorld_TestConfiguration.xml</pathToFile> -->
-        <!-- </packageConfFile> -->
-        <packageConfFile>
-           <package>Simulation/Atlfast/TestAtlfast</package>
-           <!-- <pathToFile>/afs/cern.ch/atlas/software/dist/11.0.0/Simulation/Atlfast/TestAtlfast/TestAtlfast-00-00-55/test/TestAtlfast_TestConfiguration.xml</pathToFile> -->
-           <pathToFile>TESTSUITESCRATCH/xml/TestAtlfast_TestConfiguration.xml</pathToFile>
-           <cmtdir>/afs/cern.ch/atlas/software/dist/11.0.0/Simulation/Atlfast/TestAtlfast/TestAtlfast-00-00-55/</cmtdir>
-        </packageConfFile>
-      </rttProvides>
-      <!-- <localConfFiles> -->
-         <!-- <package>Simulation/Atlfast/TestAtlfast</package> -->
-      <!-- </localConfFiles> -->
-      <!-- <installedConfFiles/> -->
-   </confFileSrc>
-
-   <!-- <packageAccept>HelloWorld</packageAccept> -->
-   <!-- <packageVeto>TestAtlfast</packageVeto> -->
-<!--   <testMode>NoNewRunDirs</testMode> -->
-   <maxTime>
-      <hours>1</hours>
-   </maxTime>
-   <!-- <rttKitTest/> -->
-</rttconfig>
diff --git a/Tools/RunTimeTester/src/TestSuiteFixtures/Fixtures3/Readme.txt~ b/Tools/RunTimeTester/src/TestSuiteFixtures/Fixtures3/Readme.txt~
deleted file mode 100755
index 9161d9645a30d8e56c1b815f1a4e1b5e9f5fc921..0000000000000000000000000000000000000000
--- a/Tools/RunTimeTester/src/TestSuiteFixtures/Fixtures3/Readme.txt~
+++ /dev/null
@@ -1,2 +0,0 @@
-project builds
-RTT provides conf files
diff --git a/Tools/RunTimeTester/src/TestSuiteFixtures/Fixtures3/cfg/rttUnitTests.xml~ b/Tools/RunTimeTester/src/TestSuiteFixtures/Fixtures3/cfg/rttUnitTests.xml~
deleted file mode 100755
index b96a86cc6e2cf869ab001d42a4fa211007f8e294..0000000000000000000000000000000000000000
--- a/Tools/RunTimeTester/src/TestSuiteFixtures/Fixtures3/cfg/rttUnitTests.xml~
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-
-
-<!DOCTYPE rttconfig SYSTEM "http://www.hep.ucl.ac.uk/atlas/AtlasTesting/DTD/RTT.dtd">
-
-
-<!-- <!DOCTYPE rttconfig SYSTEM "RTT.dtd"> -->
-<rttconfig>
-   <mode>PBS</mode>
-   <release>11.0.0</release>
-   <refRelease>11.0.0</refRelease>
-   <build>opt</build>
-   <branch>N.X.0</branch>
-   <workBasePath>TESTSUITESCRATCH/Work</workBasePath>
-   <resultsBasePath>TESTSUITESCRATCH/Results</resultsBasePath>
-   <site>CERN</site>
-   <dataSetCatalog>TESTSUITESCRATCH/xml/rttUnitTestDataSetCatalog.xml</dataSetCatalog>
-   <jobGroupConfig>TESTSUITESCRATCH/xml/rttUnitTestTopLevelJobGroup.xml</jobGroupConfig>
-   <refDB>
-      <file>TESTSUITESCRATCH/rttUnitTestRefFile.db</file>
-      <enable>1</enable>
-   </refDB>
-
-
-   <confFileSrc>
-      <rttProvides>
-        <!-- <packageConfFile> -->
-           <!-- <package>HelloWorld</package> -->
-           <!-- <pathToFile>/local_disk/sherwood/RTT/HelloWorld_TestConfiguration.xml</pathToFile> -->
-        <!-- </packageConfFile> -->
-        <packageConfFile>
-           <package>Simulation/Atlfast/TestAtlfast</package>
-           <!-- <pathToFile>/afs/cern.ch/atlas/software/dist/11.0.0/Simulation/Atlfast/TestAtlfast/TestAtlfast-00-00-55/test/TestAtlfast_TestConfiguration.xml</pathToFile> -->
-           <pathToFile>TESTSUITESCRATCH/xml/TestAtlfast_TestConfiguration.xml</pathToFile>
-           <cmtdir>/afs/cern.ch/atlas/software/dist/11.0.0/Simulation/Atlfast/TestAtlfast/TestAtlfast-00-00-55/</cmtdir>
-        </packageConfFile>
-      </rttProvides>
-      <!-- <localConfFiles> -->
-         <!-- <package>Simulation/Atlfast/TestAtlfast</package> -->
-      <!-- </localConfFiles> -->
-      <!-- <installedConfFiles/> -->
-   </confFileSrc>
-
-   <!-- <packageAccept>HelloWorld</packageAccept> -->
-   <!-- <packageVeto>TestAtlfast</packageVeto> -->
-<!--   <testMode>NoNewRunDirs</testMode> -->
-   <maxTime>
-      <hours>1</hours>
-   </maxTime>
-   <!-- <rttKitTest/> -->
-   <releaseType>project</releaseType>
-</rttconfig>
diff --git a/Tools/RunTimeTester/src/TestSuiteFixtures/Fixtures4/cfg/rttUnitTests.xml~ b/Tools/RunTimeTester/src/TestSuiteFixtures/Fixtures4/cfg/rttUnitTests.xml~
deleted file mode 100755
index 1b10a8ffbce2685fdd4b7417e8ab9a29ac73c1cb..0000000000000000000000000000000000000000
--- a/Tools/RunTimeTester/src/TestSuiteFixtures/Fixtures4/cfg/rttUnitTests.xml~
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-
-
-<!DOCTYPE rttconfig SYSTEM "http://www.hep.ucl.ac.uk/atlas/AtlasTesting/DTD/RTT.dtd">
-
-
-<!-- <!DOCTYPE rttconfig SYSTEM "RTT.dtd"> -->
-<rttconfig>
-   <mode>PBS</mode>
-   <release>11.0.0</release>
-   <refRelease>11.0.0</refRelease>
-   <build>opt</build>
-   <branch>N.X.0</branch>
-   <workBasePath>TESTSUITESCRATCH/Work</workBasePath>
-   <resultsBasePath>TESTSUITESCRATCH/Results</resultsBasePath>
-   <site>CERN</site>
-   <dataSetCatalog>TESTSUITESCRATCH/xml/rttUnitTestDataSetCatalog.xml</dataSetCatalog>
-   <jobGroupConfig>TESTSUITESCRATCH/xml/rttUnitTestTopLevelJobGroup.xml</jobGroupConfig>
-   <refDB>
-      <file>TESTSUITESCRATCH/rttUnitTestRefFile.db</file>
-      <enable>1</enable>
-   </refDB>
-
-
-   <confFileSrc>
-      <rttProvides>
-        <!-- <packageConfFile> -->
-           <!-- <package>HelloWorld</package> -->
-           <!-- <pathToFile>/local_disk/sherwood/RTT/HelloWorld_TestConfiguration.xml</pathToFile> -->
-        <!-- </packageConfFile> -->
-        <packageConfFile>
-           <package>AthenaAtlfast</package>
-           <!-- <pathToFile>/afs/cern.ch/atlas/software/dist/11.0.0/Simulation/Atlfast/TestAtlfast/TestAtlfast-00-00-55/test/TestAtlfast_TestConfiguration.xml</pathToFile> -->
-           <pathToFile>TESTSUITESCRATCH/xml/TestAtlfast_TestConfiguration.xml</pathToFile>
-           <cmtdir>/afs/cern.ch/atlas/software/dist/11.0.0/Simulation/Atlfast/TestAtlfast/TestAtlfast-00-00-55/</cmtdir>
-        </packageConfFile>
-      </rttProvides>
-      <!-- <localConfFiles> -->
-         <!-- <package>Simulation/Atlfast/TestAtlfast</package> -->
-      <!-- </localConfFiles> -->
-      <installedConfFiles>
-         <releaseType>project</releaseType>
-      </installedConfFiles>
-   </confFileSrc>
-
-   <!-- <packageAccept>HelloWorld</packageAccept> -->
-   <!-- <packageVeto>TestAtlfast</packageVeto> -->
-<!--   <testMode>NoNewRunDirs</testMode> -->
-   <maxTime>
-      <hours>1</hours>
-   </maxTime>
-</rttconfig>
diff --git a/Tools/RunTimeTester/src/TestSuiteFixtures/Fixtures5/Readme.txt~ b/Tools/RunTimeTester/src/TestSuiteFixtures/Fixtures5/Readme.txt~
deleted file mode 100755
index f685b2339280480bb023c37b42f5aa2907caf7df..0000000000000000000000000000000000000000
--- a/Tools/RunTimeTester/src/TestSuiteFixtures/Fixtures5/Readme.txt~
+++ /dev/null
@@ -1,2 +0,0 @@
-monolithic builds
-RTT provides package conf file
diff --git a/Tools/RunTimeTester/src/TestSuiteFixtures/Fixtures5/cfg/rttUnitTests.xml~ b/Tools/RunTimeTester/src/TestSuiteFixtures/Fixtures5/cfg/rttUnitTests.xml~
deleted file mode 100755
index 1a67f0efcbaefc58da2ebea844cfed8ab68d4754..0000000000000000000000000000000000000000
--- a/Tools/RunTimeTester/src/TestSuiteFixtures/Fixtures5/cfg/rttUnitTests.xml~
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-
-
-<!DOCTYPE rttconfig SYSTEM "http://www.hep.ucl.ac.uk/atlas/AtlasTesting/DTD/RTT.dtd">
-
-
-<!-- <!DOCTYPE rttconfig SYSTEM "RTT.dtd"> -->
-<rttconfig>
-   <mode>PBS</mode>
-   <release>11.0.0</release>
-   <refRelease>11.0.0</refRelease>
-   <build>opt</build>
-   <branch>N.X.0</branch>
-   <workBasePath>TESTSUITESCRATCH/Work</workBasePath>
-   <resultsBasePath>TESTSUITESCRATCH/Results</resultsBasePath>
-   <site>CERN</site>
-   <dataSetCatalog>TESTSUITESCRATCH/xml/rttUnitTestDataSetCatalog.xml</dataSetCatalog>
-   <jobGroupConfig>TESTSUITESCRATCH/xml/rttUnitTestTopLevelJobGroup.xml</jobGroupConfig>
-   <refDB>
-      <file>TESTSUITESCRATCH/rttUnitTestRefFile.db</file>
-      <enable>1</enable>
-   </refDB>
-
-
-   <confFileSrc>
-      <rttProvides>
-        <!-- <packageConfFile> -->
-           <!-- <package>HelloWorld</package> -->
-           <!-- <pathToFile>/local_disk/sherwood/RTT/HelloWorld_TestConfiguration.xml</pathToFile> -->
-        <!-- </packageConfFile> -->
-        <packageConfFile>
-           <package>Simulation/Atlfast/TestAtlfast</package>
-           <!-- <pathToFile>/afs/cern.ch/atlas/software/dist/11.0.0/Simulation/Atlfast/TestAtlfast/TestAtlfast-00-00-55/test/TestAtlfast_TestConfiguration.xml</pathToFile> -->
-           <pathToFile>TESTSUITESCRATCH/xml/TestAtlfast_TestConfiguration.xml</pathToFile>
-           <cmtdir>/afs/cern.ch/atlas/software/dist/11.0.0/Simulation/Atlfast/TestAtlfast/TestAtlfast-00-00-55/</cmtdir>
-        </packageConfFile>
-      </rttProvides>
-      <!-- <localConfFiles> -->
-         <!-- <package>Simulation/Atlfast/TestAtlfast</package> -->
-      <!-- </localConfFiles> -->
-      <!-- <installedConfFiles/> -->
-   </confFileSrc>
-
-   <!-- <packageAccept>HelloWorld</packageAccept> -->
-   <!-- <packageVeto>TestAtlfast</packageVeto> -->
-<!--   <testMode>NoNewRunDirs</testMode> -->
-   <maxTime>
-      <hours>1</hours>
-   </maxTime>
-   <!-- <rttKitTest/> -->
-</rttconfig>
diff --git a/Tracking/TrkEvent/TrkEventUtils/TrkEventUtils.kdevelop b/Tracking/TrkEvent/TrkEventUtils/TrkEventUtils.kdevelop
deleted file mode 100755
index 69d701c48534e33b8aa5deb6271ca862ee36fe05..0000000000000000000000000000000000000000
--- a/Tracking/TrkEvent/TrkEventUtils/TrkEventUtils.kdevelop
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-<kdevelop>
- <general>
-  <author>Edward Moyse</author>
-  <email>edward.moyse@cern.ch</email>
-  <version>$VERSION$</version>
-  <projectmanagement>KDevCustomProject</projectmanagement>
-  <primarylanguage>C++</primarylanguage>
-  <ignoreparts>
-  </ignoreparts>
- </general>
- <kdevcustomproject>
-  <run>
-   <mainprogram>TrkEventUtils</mainprogram>
-  </run>
- </kdevcustomproject>
- <kdevdebugger>
-  <general>
-   <dbgshell></dbgshell>
-  </general>
- </kdevdebugger>
- <kdevdoctreeview>
-    <ignoretocs>
-      <toc>ada</toc>
-      <toc>ada_bugs_gcc</toc>
-      <toc>bash</toc>
-      <toc>bash_bugs</toc>
-      <toc>clanlib</toc>
-      <toc>fortran_bugs_gcc</toc>
-      <toc>gnome1</toc>
-      <toc>gnustep</toc>
-      <toc>gtk</toc>
-      <toc>gtk_bugs</toc>
-      <toc>haskell</toc>
-      <toc>haskell_bugs_ghc</toc>
-      <toc>java_bugs_gcc</toc>
-      <toc>java_bugs_sun</toc>
-      <toc>kde2book</toc>
-      <toc>opengl</toc>
-      <toc>pascal_bugs_fp</toc>
-      <toc>php</toc>
-      <toc>php_bugs</toc>
-      <toc>perl</toc>
-      <toc>perl_bugs</toc>
-      <toc>python</toc>
-      <toc>python_bugs</toc>
-      <toc>qt-kdev3</toc>
-      <toc>ruby</toc>
-      <toc>ruby_bugs</toc>
-      <toc>sdl</toc>
-      <toc>sw</toc>
-      <toc>w3c-dom-level2-html</toc>
-      <toc>w3c-svg</toc>
-      <toc>w3c-uaag10</toc>
-      <toc>wxwidgets_bugs</toc>
-    </ignoretocs>
-    <ignoreqt_xml>
-      <toc>Guide to the Qt Translation Tools</toc>
-      <toc>Qt Assistant Manual</toc>
-      <toc>Qt Designer Manual</toc>
-      <toc>Qt Reference Documentation</toc>
-      <toc>qmake User Guide</toc>
-    </ignoreqt_xml>
-    <ignoredoxygen>
-      <toc>KDE Libraries (Doxygen)</toc>
-    </ignoredoxygen>
- </kdevdoctreeview>
-  <kdevfilecreate>
-    <filetypes/>
-    <useglobaltypes>
-      <type ext="ui" />
-      <type ext="cpp" />
-      <type ext="h" />
-    </useglobaltypes>
-  </kdevfilecreate>
-</kdevelop>
diff --git a/Tracking/TrkEvent/TrkPrepRawData/TrkPrepRawData.kdevelop b/Tracking/TrkEvent/TrkPrepRawData/TrkPrepRawData.kdevelop
deleted file mode 100755
index 23f202c262588ba2ea8c88e2ece8508dbad20f11..0000000000000000000000000000000000000000
--- a/Tracking/TrkEvent/TrkPrepRawData/TrkPrepRawData.kdevelop
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version = '1.0'?>
-<kdevelop>
-  <general>
-    <author>Andreas WILDAUER</author>
-    <email>andreas.wildauer@cern.ch</email>
-    <version>$VERSION$</version>
-    <projectmanagement>KDevCustomProject</projectmanagement>
-    <primarylanguage>C++</primarylanguage>
-    <ignoreparts/>
-    <projectname>TrkPrepRawData</projectname>
-  </general>
-  <kdevcustomproject>
-    <run>
-      <mainprogram>$APPNAMELC$</mainprogram>
-    </run>
-  </kdevcustomproject>
-  <kdevdebugger>
-    <general>
-      <dbgshell/>
-    </general>
-  </kdevdebugger>
-  <kdevdoctreeview>
-    <ignoretocs>
-      <toc>ada</toc>
-      <toc>ada_bugs_gcc</toc>
-      <toc>bash</toc>
-      <toc>bash_bugs</toc>
-      <toc>clanlib</toc>
-      <toc>fortran_bugs_gcc</toc>
-      <toc>gnome1</toc>
-      <toc>gnustep</toc>
-      <toc>gtk</toc>
-      <toc>gtk_bugs</toc>
-      <toc>haskell</toc>
-      <toc>haskell_bugs_ghc</toc>
-      <toc>java_bugs_gcc</toc>
-      <toc>java_bugs_sun</toc>
-      <toc>kde2book</toc>
-      <toc>opengl</toc>
-      <toc>pascal_bugs_fp</toc>
-      <toc>php</toc>
-      <toc>php_bugs</toc>
-      <toc>perl</toc>
-      <toc>perl_bugs</toc>
-      <toc>python</toc>
-      <toc>python_bugs</toc>
-      <toc>qt-kdev3</toc>
-      <toc>ruby</toc>
-      <toc>ruby_bugs</toc>
-      <toc>sdl</toc>
-      <toc>sw</toc>
-      <toc>w3c-dom-level2-html</toc>
-      <toc>w3c-svg</toc>
-      <toc>w3c-uaag10</toc>
-      <toc>wxwidgets_bugs</toc>
-    </ignoretocs>
-    <ignoreqt_xml>
-      <toc>Guide to the Qt Translation Tools</toc>
-      <toc>Qt Assistant Manual</toc>
-      <toc>Qt Designer Manual</toc>
-      <toc>Qt Reference Documentation</toc>
-      <toc>qmake User Guide</toc>
-    </ignoreqt_xml>
-    <ignoredoxygen>
-      <toc>KDE Libraries (Doxygen)</toc>
-    </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevfilecreate>
-    <filetypes/>
-    <useglobaltypes>
-      <type ext="ui" />
-      <type ext="cpp" />
-      <type ext="h" />
-    </useglobaltypes>
-  </kdevfilecreate>
-</kdevelop>
diff --git a/Tracking/TrkEvent/TrkRIO_OnTrack/TrkRIO_OnTrack.kdevelop b/Tracking/TrkEvent/TrkRIO_OnTrack/TrkRIO_OnTrack.kdevelop
deleted file mode 100755
index 8cd01f45765e0b7f377314c7f1d0231503746925..0000000000000000000000000000000000000000
--- a/Tracking/TrkEvent/TrkRIO_OnTrack/TrkRIO_OnTrack.kdevelop
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-<kdevelop>
- <general>
-  <author>Edward Moyse</author>
-  <email>Edward.Moyse@cern.ch</email>
-  <version>$VERSION$</version>
-  <projectmanagement>KDevCustomProject</projectmanagement>
-  <primarylanguage>C++</primarylanguage>
-  <ignoreparts>
-  </ignoreparts>
- </general>
- <kdevcustomproject>
-  <run>
-   <mainprogram>TrkRIO_OnTrack</mainprogram>
-  </run>
- </kdevcustomproject>
- <kdevdebugger>
-  <general>
-   <dbgshell></dbgshell>
-  </general>
- </kdevdebugger>
- <kdevdoctreeview>
-    <ignoretocs>
-      <toc>ada</toc>
-      <toc>ada_bugs_gcc</toc>
-      <toc>bash</toc>
-      <toc>bash_bugs</toc>
-      <toc>clanlib</toc>
-      <toc>fortran_bugs_gcc</toc>
-      <toc>gnome1</toc>
-      <toc>gnustep</toc>
-      <toc>gtk</toc>
-      <toc>gtk_bugs</toc>
-      <toc>haskell</toc>
-      <toc>haskell_bugs_ghc</toc>
-      <toc>java_bugs_gcc</toc>
-      <toc>java_bugs_sun</toc>
-      <toc>kde2book</toc>
-      <toc>opengl</toc>
-      <toc>pascal_bugs_fp</toc>
-      <toc>php</toc>
-      <toc>php_bugs</toc>
-      <toc>perl</toc>
-      <toc>perl_bugs</toc>
-      <toc>python</toc>
-      <toc>python_bugs</toc>
-      <toc>qt-kdev3</toc>
-      <toc>ruby</toc>
-      <toc>ruby_bugs</toc>
-      <toc>sdl</toc>
-      <toc>sw</toc>
-      <toc>w3c-dom-level2-html</toc>
-      <toc>w3c-svg</toc>
-      <toc>w3c-uaag10</toc>
-      <toc>wxwidgets_bugs</toc>
-    </ignoretocs>
-    <ignoreqt_xml>
-      <toc>Guide to the Qt Translation Tools</toc>
-      <toc>Qt Assistant Manual</toc>
-      <toc>Qt Designer Manual</toc>
-      <toc>Qt Reference Documentation</toc>
-      <toc>qmake User Guide</toc>
-    </ignoreqt_xml>
-    <ignoredoxygen>
-      <toc>KDE Libraries (Doxygen)</toc>
-    </ignoredoxygen>
- </kdevdoctreeview>
-  <kdevfilecreate>
-    <filetypes/>
-    <useglobaltypes>
-      <type ext="ui" />
-      <type ext="cpp" />
-      <type ext="h" />
-    </useglobaltypes>
-  </kdevfilecreate>
-</kdevelop>
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/TrkEventAthenaPool.kdevelop b/Tracking/TrkEventCnv/TrkEventAthenaPool/TrkEventAthenaPool.kdevelop
deleted file mode 100755
index db8263db119ef1069dd89dbb868512533b085465..0000000000000000000000000000000000000000
--- a/Tracking/TrkEventCnv/TrkEventAthenaPool/TrkEventAthenaPool.kdevelop
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version = '1.0'?>
-<kdevelop>
-  <general>
-    <author>Andreas WILDAUER</author>
-    <email>andreas.wildauer@cern.ch</email>
-    <version>$VERSION$</version>
-    <projectmanagement>KDevCustomProject</projectmanagement>
-    <primarylanguage>C++</primarylanguage>
-    <ignoreparts/>
-    <projectname>TrkEventAthenaPool</projectname>
-  </general>
-  <kdevcustomproject>
-    <run>
-      <mainprogram>$APPNAMELC$</mainprogram>
-      <directoryradio>executable</directoryradio>
-    </run>
-  </kdevcustomproject>
-  <kdevdebugger>
-    <general>
-      <dbgshell/>
-    </general>
-  </kdevdebugger>
-  <kdevdoctreeview>
-    <ignoretocs>
-      <toc>ada</toc>
-      <toc>ada_bugs_gcc</toc>
-      <toc>bash</toc>
-      <toc>bash_bugs</toc>
-      <toc>clanlib</toc>
-      <toc>fortran_bugs_gcc</toc>
-      <toc>gnome1</toc>
-      <toc>gnustep</toc>
-      <toc>gtk</toc>
-      <toc>gtk_bugs</toc>
-      <toc>haskell</toc>
-      <toc>haskell_bugs_ghc</toc>
-      <toc>java_bugs_gcc</toc>
-      <toc>java_bugs_sun</toc>
-      <toc>kde2book</toc>
-      <toc>opengl</toc>
-      <toc>pascal_bugs_fp</toc>
-      <toc>php</toc>
-      <toc>php_bugs</toc>
-      <toc>perl</toc>
-      <toc>perl_bugs</toc>
-      <toc>python</toc>
-      <toc>python_bugs</toc>
-      <toc>qt-kdev3</toc>
-      <toc>ruby</toc>
-      <toc>ruby_bugs</toc>
-      <toc>sdl</toc>
-      <toc>sw</toc>
-      <toc>w3c-dom-level2-html</toc>
-      <toc>w3c-svg</toc>
-      <toc>w3c-uaag10</toc>
-      <toc>wxwidgets_bugs</toc>
-    </ignoretocs>
-    <ignoreqt_xml>
-      <toc>Guide to the Qt Translation Tools</toc>
-      <toc>Qt Assistant Manual</toc>
-      <toc>Qt Designer Manual</toc>
-      <toc>Qt Reference Documentation</toc>
-      <toc>qmake User Guide</toc>
-    </ignoreqt_xml>
-    <ignoredoxygen>
-      <toc>KDE Libraries (Doxygen)</toc>
-    </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevfilecreate>
-    <filetypes/>
-    <useglobaltypes>
-      <type ext="ui" />
-      <type ext="cpp" />
-      <type ext="h" />
-    </useglobaltypes>
-  </kdevfilecreate>
-  <kdevcppsupport>
-    <qt>
-      <used>false</used>
-      <version>3</version>
-      <includestyle>3</includestyle>
-      <root>/opt/programs/kde/kde3.5.6</root>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
-      <qmake>/opt/programs/kde/kde3.5.6/bin/qmake</qmake>
-      <designer>/opt/programs/kde/kde3.5.6/bin/designer</designer>
-      <designerpluginpaths/>
-    </qt>
-    <references/>
-    <codecompletion>
-      <automaticCodeCompletion>false</automaticCodeCompletion>
-      <automaticArgumentsHint>true</automaticArgumentsHint>
-      <automaticHeaderCompletion>true</automaticHeaderCompletion>
-      <codeCompletionDelay>250</codeCompletionDelay>
-      <argumentsHintDelay>400</argumentsHintDelay>
-      <headerCompletionDelay>250</headerCompletionDelay>
-      <showOnlyAccessibleItems>false</showOnlyAccessibleItems>
-      <completionBoxItemOrder>0</completionBoxItemOrder>
-      <howEvaluationContextMenu>true</howEvaluationContextMenu>
-      <showCommentWithArgumentHint>true</showCommentWithArgumentHint>
-      <statusBarTypeEvaluation>false</statusBarTypeEvaluation>
-      <namespaceAliases>std=_GLIBCXX_STD;__gnu_cxx=std</namespaceAliases>
-      <processPrimaryTypes>true</processPrimaryTypes>
-      <processFunctionArguments>false</processFunctionArguments>
-      <preProcessAllHeaders>false</preProcessAllHeaders>
-      <parseMissingHeaders>false</parseMissingHeaders>
-      <resolveIncludePaths>true</resolveIncludePaths>
-      <alwaysParseInBackground>true</alwaysParseInBackground>
-      <usePermanentCaching>true</usePermanentCaching>
-      <alwaysIncludeNamespaces>false</alwaysIncludeNamespaces>
-      <includePaths>.;</includePaths>
-    </codecompletion>
-  </kdevcppsupport>
-  <kdevfileview>
-    <groups>
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidenonlocation>false</hidenonlocation>
-    </groups>
-    <tree>
-      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-    </tree>
-  </kdevfileview>
-</kdevelop>
diff --git a/Tracking/TrkEventCnv/TrkEventCnvTools/TrkEventCnvTools.kdevelop b/Tracking/TrkEventCnv/TrkEventCnvTools/TrkEventCnvTools.kdevelop
deleted file mode 100755
index fcaff507e77bcf8abdd56b1691bf29de1ad0c3c8..0000000000000000000000000000000000000000
--- a/Tracking/TrkEventCnv/TrkEventCnvTools/TrkEventCnvTools.kdevelop
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version = '1.0'?>
-<kdevelop>
-  <general>
-    <author>Edward Moyse</author>
-    <email>emoyse@macatc06.cern.ch</email>
-    <version>$VERSION$</version>
-    <projectmanagement>KDevCustomProject</projectmanagement>
-    <primarylanguage>C</primarylanguage>
-    <ignoreparts/>
-  </general>
-  <kdevcustomproject>
-    <run>
-      <mainprogram>TrkEventCnvTools</mainprogram>
-      <directoryradio>executable</directoryradio>
-    </run>
-  </kdevcustomproject>
-  <kdevdebugger>
-    <general>
-      <dbgshell/>
-    </general>
-  </kdevdebugger>
-  <kdevdoctreeview>
-    <ignoretocs>
-      <toc>ada</toc>
-      <toc>ada_bugs_gcc</toc>
-      <toc>bash</toc>
-      <toc>bash_bugs</toc>
-      <toc>clanlib</toc>
-      <toc>fortran_bugs_gcc</toc>
-      <toc>gnome1</toc>
-      <toc>gnustep</toc>
-      <toc>gtk</toc>
-      <toc>gtk_bugs</toc>
-      <toc>haskell</toc>
-      <toc>haskell_bugs_ghc</toc>
-      <toc>java_bugs_gcc</toc>
-      <toc>java_bugs_sun</toc>
-      <toc>kde2book</toc>
-      <toc>libstdc++</toc>
-      <toc>opengl</toc>
-      <toc>pascal_bugs_fp</toc>
-      <toc>php</toc>
-      <toc>php_bugs</toc>
-      <toc>perl</toc>
-      <toc>perl_bugs</toc>
-      <toc>python</toc>
-      <toc>python_bugs</toc>
-      <toc>qt-kdev3</toc>
-      <toc>ruby</toc>
-      <toc>ruby_bugs</toc>
-      <toc>sdl</toc>
-      <toc>stl</toc>
-      <toc>sw</toc>
-      <toc>w3c-dom-level2-html</toc>
-      <toc>w3c-svg</toc>
-      <toc>w3c-uaag10</toc>
-      <toc>wxwidgets_bugs</toc>
-    </ignoretocs>
-    <ignoreqt_xml>
-      <toc>Guide to the Qt Translation Tools</toc>
-      <toc>Qt Assistant Manual</toc>
-      <toc>Qt Designer Manual</toc>
-      <toc>Qt Reference Documentation</toc>
-      <toc>qmake User Guide</toc>
-    </ignoreqt_xml>
-    <ignoredoxygen>
-      <toc>KDE Libraries (Doxygen)</toc>
-    </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevfilecreate>
-    <filetypes/>
-    <useglobaltypes>
-      <type ext="c" />
-      <type ext="h" />
-    </useglobaltypes>
-  </kdevfilecreate>
-  <kdevcppsupport>
-    <references/>
-    <codecompletion>
-      <includeGlobalFunctions>true</includeGlobalFunctions>
-      <includeTypes>true</includeTypes>
-      <includeEnums>true</includeEnums>
-      <includeTypedefs>false</includeTypedefs>
-      <automaticCodeCompletion>true</automaticCodeCompletion>
-      <automaticArgumentsHint>true</automaticArgumentsHint>
-      <automaticHeaderCompletion>true</automaticHeaderCompletion>
-      <codeCompletionDelay>250</codeCompletionDelay>
-      <argumentsHintDelay>400</argumentsHintDelay>
-      <headerCompletionDelay>250</headerCompletionDelay>
-    </codecompletion>
-  </kdevcppsupport>
-  <kdevfileview>
-    <groups>
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidenonlocation>false</hidenonlocation>
-    </groups>
-    <tree>
-      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-    </tree>
-  </kdevfileview>
-</kdevelop>
diff --git a/Tracking/TrkTools/TrkAmbiguityProcessor/TrkAmbiguityProcessor.kdevelop b/Tracking/TrkTools/TrkAmbiguityProcessor/TrkAmbiguityProcessor.kdevelop
deleted file mode 100644
index 140ab4d9e0888ebf2022eda2d3d46ca6f89a9af2..0000000000000000000000000000000000000000
--- a/Tracking/TrkTools/TrkAmbiguityProcessor/TrkAmbiguityProcessor.kdevelop
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version = '1.0'?>
-<kdevelop>
-  <general>
-    <author>Per Fredrik AKESSON</author>
-    <email>fredrik.akesson@cern.ch</email>
-    <version>$VERSION$</version>
-    <projectmanagement>KDevCustomProject</projectmanagement>
-    <primarylanguage>C++</primarylanguage>
-    <ignoreparts/>
-  </general>
-  <kdevcustomproject>
-    <run>
-      <mainprogram>TrkAmbiguityProcessor</mainprogram>
-      <directoryradio>executable</directoryradio>
-    </run>
-  </kdevcustomproject>
-  <kdevdebugger>
-    <general>
-      <dbgshell/>
-    </general>
-  </kdevdebugger>
-  <kdevdoctreeview>
-    <ignoretocs>
-      <toc>ada</toc>
-      <toc>ada_bugs_gcc</toc>
-      <toc>bash</toc>
-      <toc>bash_bugs</toc>
-      <toc>clanlib</toc>
-      <toc>fortran_bugs_gcc</toc>
-      <toc>gnome1</toc>
-      <toc>gnustep</toc>
-      <toc>gtk</toc>
-      <toc>gtk_bugs</toc>
-      <toc>haskell</toc>
-      <toc>haskell_bugs_ghc</toc>
-      <toc>java_bugs_gcc</toc>
-      <toc>java_bugs_sun</toc>
-      <toc>kde2book</toc>
-      <toc>opengl</toc>
-      <toc>pascal_bugs_fp</toc>
-      <toc>php</toc>
-      <toc>php_bugs</toc>
-      <toc>perl</toc>
-      <toc>perl_bugs</toc>
-      <toc>python</toc>
-      <toc>python_bugs</toc>
-      <toc>qt-kdev3</toc>
-      <toc>ruby</toc>
-      <toc>ruby_bugs</toc>
-      <toc>sdl</toc>
-      <toc>sw</toc>
-      <toc>w3c-dom-level2-html</toc>
-      <toc>w3c-svg</toc>
-      <toc>w3c-uaag10</toc>
-      <toc>wxwidgets_bugs</toc>
-    </ignoretocs>
-    <ignoreqt_xml>
-      <toc>Guide to the Qt Translation Tools</toc>
-      <toc>Qt Assistant Manual</toc>
-      <toc>Qt Designer Manual</toc>
-      <toc>Qt Reference Documentation</toc>
-      <toc>qmake User Guide</toc>
-    </ignoreqt_xml>
-    <ignoredoxygen>
-      <toc>KDE Libraries (Doxygen)</toc>
-    </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevfilecreate>
-    <filetypes/>
-    <useglobaltypes>
-      <type ext="ui" />
-      <type ext="cpp" />
-      <type ext="h" />
-    </useglobaltypes>
-  </kdevfilecreate>
-  <kdevcppsupport>
-    <references/>
-    <codecompletion>
-      <includeGlobalFunctions>true</includeGlobalFunctions>
-      <includeTypes>true</includeTypes>
-      <includeEnums>true</includeEnums>
-      <includeTypedefs>false</includeTypedefs>
-      <automaticCodeCompletion>true</automaticCodeCompletion>
-      <automaticArgumentsHint>true</automaticArgumentsHint>
-      <automaticHeaderCompletion>true</automaticHeaderCompletion>
-      <codeCompletionDelay>250</codeCompletionDelay>
-      <argumentsHintDelay>400</argumentsHintDelay>
-      <headerCompletionDelay>250</headerCompletionDelay>
-    </codecompletion>
-  </kdevcppsupport>
-  <kdevcvsservice>
-    <recursivewhenupdate>true</recursivewhenupdate>
-    <prunedirswhenupdate>true</prunedirswhenupdate>
-    <createdirswhenupdate>true</createdirswhenupdate>
-    <recursivewhencommitremove>true</recursivewhencommitremove>
-    <revertoptions>-C</revertoptions>
-  </kdevcvsservice>
-  <kdevfileview>
-    <groups>
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidenonlocation>false</hidenonlocation>
-    </groups>
-    <tree>
-      <showvcsfields>false</showvcsfields>
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
-    </tree>
-  </kdevfileview>
-</kdevelop>
diff --git a/Tracking/TrkTools/TrkTrackSummaryTool/TrkTrackSummaryTool.kdevelop b/Tracking/TrkTools/TrkTrackSummaryTool/TrkTrackSummaryTool.kdevelop
deleted file mode 100755
index 7d31bb1f573fcac8068c2a56b0313d53b8c7e91e..0000000000000000000000000000000000000000
--- a/Tracking/TrkTools/TrkTrackSummaryTool/TrkTrackSummaryTool.kdevelop
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version = '1.0'?>
-<kdevelop>
-  <general>
-    <author>Andreas WILDAUER</author>
-    <email>andreas.wildauer@cern.ch</email>
-    <version>$VERSION$</version>
-    <projectmanagement>KDevCustomProject</projectmanagement>
-    <primarylanguage>C++</primarylanguage>
-    <ignoreparts/>
-    <projectname>TrkTrackSummaryTool</projectname>
-  </general>
-  <kdevcustomproject>
-    <run>
-      <mainprogram>$APPNAMELC$</mainprogram>
-    </run>
-  </kdevcustomproject>
-  <kdevdebugger>
-    <general>
-      <dbgshell/>
-    </general>
-  </kdevdebugger>
-  <kdevdoctreeview>
-    <ignoretocs>
-      <toc>ada</toc>
-      <toc>ada_bugs_gcc</toc>
-      <toc>bash</toc>
-      <toc>bash_bugs</toc>
-      <toc>clanlib</toc>
-      <toc>fortran_bugs_gcc</toc>
-      <toc>gnome1</toc>
-      <toc>gnustep</toc>
-      <toc>gtk</toc>
-      <toc>gtk_bugs</toc>
-      <toc>haskell</toc>
-      <toc>haskell_bugs_ghc</toc>
-      <toc>java_bugs_gcc</toc>
-      <toc>java_bugs_sun</toc>
-      <toc>kde2book</toc>
-      <toc>opengl</toc>
-      <toc>pascal_bugs_fp</toc>
-      <toc>php</toc>
-      <toc>php_bugs</toc>
-      <toc>perl</toc>
-      <toc>perl_bugs</toc>
-      <toc>python</toc>
-      <toc>python_bugs</toc>
-      <toc>qt-kdev3</toc>
-      <toc>ruby</toc>
-      <toc>ruby_bugs</toc>
-      <toc>sdl</toc>
-      <toc>sw</toc>
-      <toc>w3c-dom-level2-html</toc>
-      <toc>w3c-svg</toc>
-      <toc>w3c-uaag10</toc>
-      <toc>wxwidgets_bugs</toc>
-    </ignoretocs>
-    <ignoreqt_xml>
-      <toc>Guide to the Qt Translation Tools</toc>
-      <toc>Qt Assistant Manual</toc>
-      <toc>Qt Designer Manual</toc>
-      <toc>Qt Reference Documentation</toc>
-      <toc>qmake User Guide</toc>
-    </ignoreqt_xml>
-    <ignoredoxygen>
-      <toc>KDE Libraries (Doxygen)</toc>
-    </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevfilecreate>
-    <filetypes/>
-    <useglobaltypes>
-      <type ext="ui" />
-      <type ext="cpp" />
-      <type ext="h" />
-    </useglobaltypes>
-  </kdevfilecreate>
-</kdevelop>
diff --git a/Trigger/TrigFTK/TrigFTKSim/config/ss_file/raw_15x16x188Lbunused.ss~ b/Trigger/TrigFTK/TrigFTKSim/config/ss_file/raw_15x16x188Lbunused.ss~
deleted file mode 100644
index 408e57e013916b6dddef1d747790640007cda51e..0000000000000000000000000000000000000000
--- a/Trigger/TrigFTK/TrigFTKSim/config/ss_file/raw_15x16x188Lbunused.ss~
+++ /dev/null
@@ -1,51 +0,0 @@
-Version 9
-! PIX: 3mm SS, so we use 328/(20mm/3mm)=328/6.6=50
-! SCT: 5mm SS, so we use 768/(60mm/5mm)=768/12=64
-1 0 0 15 328 36 144
-1 0 1 15 328 36 144
-1 0 2 15 328 36 144
-0 0 0 16 768
-0 0 1 4 768
-0 0 2 16 768
-0 0 3 4 768
-0 0 4 16 768
-0 0 5 4 768
-0 0 6 16 768
-0 0 7 4 768
-1 1 0 15 328 36 144
-1 1 1 15 328 36 144
-1 1 2 15 328 36 144
-0 1 0 4 768
-0 1 1 16 768
-0 1 2 4 768
-0 1 3 16 768
-0 1 4 16 768
-0 1 5 4 768
-0 1 6 16 768
-0 1 7 4 768
-0 1 8 4 768
-0 1 9 16 768
-0 1 10 4 768
-0 1 11 16 768
-0 1 12 16 768
-0 1 13 4 768
-0 1 14 16 768
-0 1 15 4 768
-0 1 16 4 768
-0 1 17 16 768
-0 1 18 4 768
-0 1 19 16 768
-0 1 20 16 768
-0 1 21 4 768
-0 1 22 16 768
-0 1 23 4 768
-0 1 16 4 768
-0 1 25 16 768
-0 1 26 4 768
-0 1 27 16 768
-0 1 28 16 768
-0 1 29 4 768
-0 1 30 16 768
-0 1 31 4 768
-0 1 32 4 768
-0 1 33 16 768
diff --git a/graphics/VP1/VP1Systems/VP1TestSystems/src/TrackingSurfacesSystem.cxx~ b/graphics/VP1/VP1Systems/VP1TestSystems/src/TrackingSurfacesSystem.cxx~
deleted file mode 100755
index 5ec7f944b86d4db36cb4e69d078fd767ef4c998d..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Systems/VP1TestSystems/src/TrackingSurfacesSystem.cxx~
+++ /dev/null
@@ -1,185 +0,0 @@
-/////////////////////////////////////////////////////////////////////////
-//                                                                     //
-//  Implementation of class TrackingSurfacesSystem                           //
-//                                                                     //
-//  Author: Thomas Kittelmann <Thomas.Kittelmann@cern.ch>              //
-//                                                                     //
-//  Initial version: June 2007                                         //
-//                                                                     //
-/////////////////////////////////////////////////////////////////////////
-
-#include "VP1TestSystems/TrackingSurfacesSystem.h"
-#include "ui_trackingsurfacescontrollerform.h"
-
-#include "StoreGate/StoreGate.h"
-#include "TrkSurfaces/Surface.h"
-#include "TrkSurfaces/SurfaceCollection.h"
-#include "GeoPrimitives/GeoPrimitives.h"
-//#include "CLHEP/Units/SystemOfUnits.h"
-#include "GaudiKernel/SystemOfUnits.h"
-
-#include <Inventor/nodes/SoSeparator.h>
-#include <Inventor/nodes/SoLineSet.h>
-#include <Inventor/nodes/SoVertexProperty.h>
-#include <Inventor/nodes/SoSwitch.h>
-#include <Inventor/nodes/SoMaterial.h>
-
-#include "VP1Base/SoCooperativeSelection.h"
-#include "VP1Base/VP1CameraHelper.h"
-#include "VP1Utils/SurfaceToSoNode.h"
-
-//_____________________________________________________________________________________
-TrackingSurfacesSystem::TrackingSurfacesSystem()
-  : IVP13DSystemSimple("TrackingSurfacesSystem","This is an illustration of a very basic 3D system.","edward.moyse@gmail.com"), m_multiselection(0)
-{
-}
-
-//_____________________________________________________________________________________
-void TrackingSurfacesSystem::buildEventSceneGraph(StoreGateSvc* sg, SoSeparator *root)
-{
-  //Clear maps:
-  m_nodeToSurface.clear();
-  // std::cout<<&m_surfConvertor<<std::endl;
-  //1) Try to get the collection of (InDet) tracks from storegate:
-
-  //Sanity check:
-  if (!sg) {
-    message("Error: Got null storegate pointer");
-    return;
-  }
-
-
-  // SurfaceCollection* testsrfcol;
-  // StatusCode sc2 = evtStore()->retrieve(testsrfcol,"SurfaceCollection");
-  // if ( sc2.isFailure() )
-  //   ATH_MSG_ERROR("Could not retrieve SurfaceCollection in StoreGate");
-  // else
-  //   ATH_MSG_INFO("SurfaceCollection with " << testsrfcol->size() << " elements successfully retrieved in StoreGate");
-  //
-
-  const SurfaceCollection *surfColl;
-  std::string surfname="SurfaceCollection";
-  StatusCode status = sg->retrieve(surfColl, surfname);
-  if (status != StatusCode::SUCCESS || !surfColl) {
-    message("Error: Could not retrieve SurfaceCollection (used key="+QString(surfname.c_str())+")");
-    return;
-  }
-  message( "Loaded SurfaceCollection with key [" +QString(surfname.c_str())+"] and which contains [" + QString::number(surfColl->size()) + "] surfaces.");
-  //2) Add SoCooperativeSelection node under which we will put all the
-  //tracks. Register it and put its policy to TOGGLE (i.e. clicking
-  //adds or removes tracks from selection). In updateSelectionMode we
-  //will update its ACTIVE/INERT status depending on whether multiple
-  //selections are enabled: If ACTIVE, we get lists of selected nodes
-  //in the userChangedSelection(...) method, otherwise we get single
-  //nodes in the userPickedNode(...) method as always. We could also
-  //simply have changed its policy and gotten information about the
-  //clicks in a userSelectedSingleNode(...)  method instead (the
-  //reason for the two available ways of doing this is that you might
-  //want to have several different selection nodes in your graph in
-  //the case where you have different types of physics objects
-  //displayed from the same system):
-  m_multiselection = new SoCooperativeSelection;
-  m_multiselection->policy = SoCooperativeSelection::TOGGLE;
-  registerSelectionNode(m_multiselection);//Always do this for SoCooperativeSelection nodes in your graph.
-  updateSelectionMode( true );//Since our controller starts with the single mode selected, we init like that also.
-
-  //2) Loop over the tracks and construct a relevant 3D object for each of them (a SoLineSet):
-
-  SurfaceCollection::const_iterator surfItr, surfItrEnd = surfColl->end();
-  SurfaceToSoNode surfCnv;
-  for ( surfItr = surfColl->begin() ; surfItr != surfItrEnd; ++surfItr) {
-      const Trk::Surface* surf = (*surfItr);
-
-      SoNode* node = surfCnv.translateSurface(*surf, false);
-      SoMaterial *material = new SoMaterial;
-      if(surf->isActive()){
-	material->diffuseColor.setValue(0.6, 0., 0.6);
-      } else {
-	material->diffuseColor.setValue(1., 0., 1.);
-      }
- 
-      m_multiselection->addChild(node);
-      m_multiselection->addChild(material);
-        
-      //Bookkeep which track this 3D object corresponds to (we will need this to display surface info when the user clicks):
-      m_nodeToSurface[node] = surf;
-
-      //To avoid GUI freeze-ups:
-      updateGUI();
-  }
-
-  //Add the selection node under the root:
-  root->addChild(m_multiselection);
-
-
-}
-
-//_____________________________________________________________________________________
-void TrackingSurfacesSystem::userPickedNode(SoNode* pickedNode, SoPath * /*pickedPath*/) {
-
-  //User clicked on "pickedNode". We should know which track this belongs to:
-  
-  messageDebug("TrackingSurfacesSystem::userPickedNode - have been passed node ["+QString("0x%1").arg((quintptr)pickedNode, 
-                    QT_POINTER_SIZE * 2, 16, QChar('0'))+"] and have ["+QString::number(m_nodeToSurface.size())+"] nodes.");
-  
-  if (m_nodeToSurface.find(pickedNode)==m_nodeToSurface.end()) {
-    message("Error: Do not have surface information for picked node");
-    return;
-  }
-  const Trk::Surface * matchedSurface=m_nodeToSurface.find(pickedNode)->second;
-
-  //Show some interesting information (from the first surface):
-  message("===> Surface info:");
-  QStringList l;
-  std::ostringstream s;
-  s << *(matchedSurface);
-  l << QString(s.str().c_str()).split('\n');
-  message(l);
-  
-  //Zoom to surf:
-  CamList cameras = getCameraList();
-  for (CamListItr itCam = cameras.begin(); itCam!=cameras.end(); ++itCam) {
-    VP1CameraHelper::animatedZoomToSubTree(*itCam,m_multiselection,pickedNode,2.0,1.0);
-  }
-}
-
-//_____________________________________________________________________________________
-void TrackingSurfacesSystem::userChangedSelection(SoCooperativeSelection*, QSet<SoNode*> nodes, QSet<SoPath*>)
-{
-  foreach (SoNode * node, nodes) {
-    //Surface pointer:
-    if (m_nodeToSurface.find(node)==m_nodeToSurface.end()) {
-      message("Error: Does not have surface information for all nodes");
-      return;
-    }
-  }
-}
-
-//_____________________________________________________________________________________
-QWidget * TrackingSurfacesSystem::buildController()
-{
-  QWidget * controller = new QWidget(0);
-  Ui::TrackingSurfacesControllerForm ui;
-  ui.setupUi(controller);
-
-  connect(ui.radioButton_select_single,SIGNAL(toggled(bool)),this,SLOT(updateSelectionMode(bool)));
-
-  return controller;
-}
-
-//_____________________________________________________________________________________
-void TrackingSurfacesSystem::updateSelectionMode( bool single )
-{
-  //If multiselection not created or if we dont need to change anything - abort:
-  if ( !m_multiselection || single == (m_multiselection->activePolicy.getValue()==SoCooperativeSelection::INERT) )
-    return;
-
-  //When we change selection mode we deselect everything - always a good idea to avoid hard to debug problems later:
-  deselectAll();
-
-  if (single)
-    m_multiselection->activePolicy = SoCooperativeSelection::INERT;
-  else
-    m_multiselection->activePolicy = SoCooperativeSelection::ACTIVE;
-
-}