diff --git a/.gitignore b/.gitignore
index 9143a2f976e12c11ab7fbf82b4487cc803281f10..0f0686f05720c53f94663fd84e9fdf541c29a55b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
-build*
+build
+build_*
 /VistaDemo/**/*.exe
 /VistaDemo/**/set_path_for_*.bat
 /VistaDemo/**/set_path_for_*.sh
@@ -50,3 +51,4 @@ build*
 /VistaDemo/21ClusterModeDemo/21ClusterModeDemoD
 /VistaDemo/22RecordReplayDemo/22RecordReplayDemo
 /VistaDemo/22RecordReplayDemo/22RecordReplayDemoD
+/VistaDemo/14DataFlowNetDemo/*.dot
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..68307f8845a0d5cff4a79ae6a73285da8d3fe268
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,36 @@
+cmake_minimum_required( VERSION 2.8 )
+project( Vista )
+
+# Add VistaCmakeCommon directory to CMakeModulePath
+file( TO_CMAKE_PATH "$ENV{VISTA_CMAKE_COMMON}" _CMAKE_PATH_ENV )
+if( EXISTS "${_CMAKE_PATH_ENV}" )
+	list( APPEND CMAKE_MODULE_PATH "${_CMAKE_PATH_ENV}" )
+elseif( EXISTS "${CMAKE_SOURCE_DIR}/VistaCoreLibs/VistaCMakeCommon" )
+	list( APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/VistaCoreLib/VistaCMakeCommon" )
+elseif( EXISTS "${CMAKE_SOURCE_DIR}/VistaCMakeCommon" )
+	list( APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/VistaCMakeCommon" )
+else()
+	find_file( VISTACORELIBS_CMAKE_COMMON_TEST_FILE "VistaCommon.cmake" 
+				PATH ${CMAKE_MODULE_PATH} $ENV{CMAKE_MODULE_PATH}
+				[NO_DEFAULT_PATH] )
+	set( VISTACORELIBS_CMAKE_COMMON_TEST_FILE ${VISTACORELIBS_CMAKE_COMMON_TEST_FILE} CACHE INTERNAL "" FORCE )
+	if( NOT VISTACORELIBS_CMAKE_COMMON_TEST_FILE )
+		message( FATAL_ERROR 
+			"ERROR: Folder VistaCMakeCommon not found, but is required for successful build. "
+			"Please make the VistaCMakeCommon folder available using one of the following methods:\n"
+			"\t - define VISTA_CMAKE_COMMON environment var pointing to the folder\n"
+			"\t - add folder to environment variables CMAKE_MODULE_PATH and CMAKE_PREFIX_PATH\n"
+			"\t - place VistaCMakeCommon as subdirectory of top-level ViSTA directory"
+			"\t - place VistaCMakeCommon as subdirectory of VistaCoreLibs directory"			
+		)
+	endif()
+endif()
+include( VistaCommon )
+
+set( VISTA_COMMON_BUILD TRUE )
+
+add_subdirectory( VistaCoreLibs )
+set( VISTADEMO_ENABLED TRUE CACHE BOOL "Enable building of VistaDemo" )
+if( VISTADEMO_ENABLED )
+	add_subdirectory( VistaDemo )
+endif()
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..4807238517201a82b6c27417a2cd009506e2a249
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,693 @@
+======================================================================
+                           ViSTA VR toolkit
+            Copyright (c) 1997-2016 RWTH Aachen University
+======================================================================
+
+ Contact Information
+
+ E-Mail:
+ info@vr.rwth-aachen.de
+
+ Address:
+ Virtual Reality Group
+ RWTH Aachen University
+ Seffenter Weg 23
+ 52074 Aachen
+
+======================================================================
+
+
+                    GNU GENERAL PUBLIC LICENSE
+                      Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/LICENSE.LESSER b/LICENSE.LESSER
new file mode 100644
index 0000000000000000000000000000000000000000..070c965348820432e578833676e03c90b21951d0
--- /dev/null
+++ b/LICENSE.LESSER
@@ -0,0 +1,184 @@
+======================================================================
+                           ViSTA VR toolkit
+            Copyright (c) 1997-2016 RWTH Aachen University
+======================================================================
+
+ Contact Information
+
+ E-Mail:
+ info@vr.rwth-aachen.de
+
+ Address:
+ Virtual Reality Group
+ RWTH Aachen University
+ Seffenter Weg 23
+ 52074 Aachen
+
+======================================================================
+
+
+		      GNU LESSER GENERAL PUBLIC LICENSE
+                   Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/README b/README
new file mode 100644
index 0000000000000000000000000000000000000000..a7843ba14591a2b934b6921ce51da84af59e811a
--- /dev/null
+++ b/README
@@ -0,0 +1,17 @@
+This is the ViSTA VR Toolkit.
+It consists of the main libraries (VistaCoreLibs) and example demos (VistaDemo).
+Please refer to the corresponding READMEs for more information, and BUILDINFOs 
+on instructions on how to build the libraries or demos.
+ViSTA is open source under the LGPL (see LICENSE and LICENSE.LESSER). For
+information on how to build ViSTA, see the BUILDINFO document.
+
+To contact the developers, mail to
+info@vr.rwth-aachen.de
+or use the mailing list at
+vistavrtoolkit-general@lists.sourceforge.net
+
+More information can be found on the sourceforge project page
+http://sourceforge.net/projects/vistavrtoolkit/
+or at
+www.vr.rwth-aachen.de
+
diff --git a/VistaCoreLibs/BUILDINFO b/VistaCoreLibs/BUILDINFO
index ec7ffad6fc52d627fad4c4b92b01c11de77d49ac..50c5197d30ee58272f2d0bff954e4ce98d6f8694 100644
--- a/VistaCoreLibs/BUILDINFO
+++ b/VistaCoreLibs/BUILDINFO
@@ -1,6 +1,6 @@
 Vista uses CMake (www.cmake.org/) with version 2.8.5 or greater.
 Furthermore, it requires custom cmake extensions called VistaCMakeCommon, which can be checked out from the svn or downloaded from sourceforge.
-To ensure cmake finds the VistaCMakeCommon, either define the VISTA_CMAKE_COMMON environment variable, set the CMakeModulePath appropriately, or place it as a subfolder under the VistaCoreLibs main directory.
+To ensure cmake finds the VistaCMakeCommon, either define the VISTA_CMAKE_COMMON environment variable, set the CMakeModulePath appropriately, or place it as a subfolder under the VistaCoreLibs main directory, or the ViSTA directory if building together with VistaDemo.
 
 External dependencies:
 The main external dependencies are OpenSG 1.8 and glut (recommended: freeglut), which are needed for the Kernel and KernelOpenSGExt.
diff --git a/VistaCoreLibs/CMakeLists.txt b/VistaCoreLibs/CMakeLists.txt
index f73b2e9d5671842ae567d0fcd8e7502886a1c9ca..b794b719306e1735c5e97743d3eb68f2947d4483 100644
--- a/VistaCoreLibs/CMakeLists.txt
+++ b/VistaCoreLibs/CMakeLists.txt
@@ -1,14 +1,16 @@
-# $Id$
-
-cmake_minimum_required( VERSION 2.8 )
-project( VistaCoreLibs )
+if( NOT VISTA_COMMON_BUILD )
+	cmake_minimum_required( VERSION 2.8 )
+	project( VistaCoreLibs )
+endif()
 
 # For the CoreLibs, we verify that the VistaCMakeCommon really exist
 file( TO_CMAKE_PATH "$ENV{VISTA_CMAKE_COMMON}" _CMAKE_PATH_ENV )
 if( EXISTS "${_CMAKE_PATH_ENV}" )
 	list( APPEND CMAKE_MODULE_PATH "${_CMAKE_PATH_ENV}" )
-elseif( EXISTS "${VistaCoreLibs_SOURCE_DIR}/VistaCMakeCommon" )
-	list( APPEND CMAKE_MODULE_PATH "${VistaCoreLibs_SOURCE_DIR}/VistaCMakeCommon" )
+elseif( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/VistaCMakeCommon" )
+	list( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/VistaCMakeCommon" )
+elseif( EXISTS "${CMAKE_SOURCE_DIR}/VistaCMakeCommon" )
+	list( APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/VistaCMakeCommon" )
 else()
 	find_file( VISTACORELIBS_CMAKE_COMMON_TEST_FILE "VistaCommon.cmake" 
 				PATH ${CMAKE_MODULE_PATH} $ENV{CMAKE_MODULE_PATH}
@@ -18,9 +20,10 @@ else()
 		message( FATAL_ERROR 
 			"ERROR: Folder VistaCMakeCommon not found, but is required for successful build. "
 			"Please make the VistaCMakeCommon folder available using one of the following methods:\n"
-			"\t- define VISTA_CMAKE_COMMON environment var pointing to the folder\n"
-			"\t- add folder to environment variables CMAKE_MODULE_PATH and CMAKE_PREFIX_PATH\n"
-			"\t- set folder as subdirectory of VistaCoreLibs"
+			"\t - define VISTA_CMAKE_COMMON environment var pointing to the folder\n"
+			"\t - add folder to environment variables CMAKE_MODULE_PATH and CMAKE_PREFIX_PATH\n"
+			"\t - place VistaCMakeCommon as subdirectory of VistaCoreLibs directory"
+			"\t - place VistaCMakeCommon as subdirectory of top-level ViSTA directory (if building from top-level cmake file, together with demos)"
 		)
 	endif()
 endif()
@@ -28,16 +31,13 @@ endif()
 include( VistaCommon )
 
 # Self include
-include_directories( ${VistaCoreLibs_SOURCE_DIR} )
+include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
 
 vista_enable_most_compiler_warnings()
 
 set( VISTACORELIBS_VERSION_MAJOR "1" CACHE STRING "Major package version" )
 set( VISTACORELIBS_VERSION_MINOR "0" CACHE STRING "Minor package version" )
-set( VISTACORELIBS_VERSION_PATCH "-1" CACHE STRING "Patch package version" )
-if( ${VISTACORELIBS_VERSION_PATCH} STREQUAL "-1" )
-	set( VISTACORELIBS_VERSION_PATCH "svn_rev" CACHE STRING "Patch package version" FORCE )
-endif( ${VISTACORELIBS_VERSION_PATCH} STREQUAL "-1" )
+set( VISTACORELIBS_VERSION_PATCH "0" CACHE STRING "Patch package version" )
 # the version type can be either HEAD, RELASE, BRANCH, or TAG
 vista_set_version( VistaCoreLibs BRANCH IMAGES ${VISTACORELIBS_VERSION_MAJOR} ${VISTACORELIBS_VERSION_MINOR} ${VISTACORELIBS_VERSION_PATCH} )
 
@@ -126,10 +126,10 @@ set( VISTACORELIBS_CONFIG_DEFINITIONS "${VISTA_PLATFORM_DEFINE}" )
 
 # Conflict with archive Packagers
 if( NOT ${VISTA_BUILD_PACKS} )
-vista_create_cmake_configs( VistaCoreLibs 
-						"${CMAKE_CURRENT_SOURCE_DIR}/VistaBuild/CMake/VistaCoreLibsConfig-build.cmake_proto"
-						"${CMAKE_CURRENT_SOURCE_DIR}/VistaBuild/CMake/VistaCoreLibsConfig-install.cmake_proto" )
-vista_create_uninstall_target()
+	vista_create_cmake_configs( VistaCoreLibs 
+							"${CMAKE_CURRENT_SOURCE_DIR}/VistaBuild/CMake/VistaCoreLibsConfig-build.cmake_proto"
+							"${CMAKE_CURRENT_SOURCE_DIR}/VistaBuild/CMake/VistaCoreLibsConfig-install.cmake_proto" )
+	vista_create_uninstall_target()
 else()
 	# VistaDrivers in lib-subdir
 	# install is not known to CPack, everything has to be prepared here.
diff --git a/VistaCoreLibs/Documentation/ViSTAStyleguides/code_skel.cpp b/VistaCoreLibs/Documentation/ViSTAStyleguides/code_skel.cpp
index ed3fb42882bca8319ed0fd01cf65b43924bf8a0a..8587f8dadea309ba56b520353cbc76fb46513715 100644
--- a/VistaCoreLibs/Documentation/ViSTAStyleguides/code_skel.cpp
+++ b/VistaCoreLibs/Documentation/ViSTAStyleguides/code_skel.cpp
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "code_skel.h" 
 
diff --git a/VistaCoreLibs/Documentation/ViSTAStyleguides/code_skel.h b/VistaCoreLibs/Documentation/ViSTAStyleguides/code_skel.h
index f31ee885620f01f208d37111fff34470d9b6d9ea..a14c2df315984e6d82b897b6a07cb87864440ecf 100644
--- a/VistaCoreLibs/Documentation/ViSTAStyleguides/code_skel.h
+++ b/VistaCoreLibs/Documentation/ViSTAStyleguides/code_skel.h
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef _NEWFILE_H
 #define _NEWFILE_H
diff --git a/VistaCoreLibs/Tests/CMakeLists.txt b/VistaCoreLibs/Tests/CMakeLists.txt
index 3dd16d40465fed07a9c5b1dd7f0f974d485f7759..3cb0894f27187c0bba3cfb497361a7f6c1aae8a9 100644
--- a/VistaCoreLibs/Tests/CMakeLists.txt
+++ b/VistaCoreLibs/Tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id$
+
 
 #require_vistacommon_version( 35191 )
 include( VistaTestingUtils )
@@ -51,6 +51,46 @@ if( VISTACORELIBS_BUILD_BASE )
 	#)
 endif()
 
+if( VISTACORELIBS_BUILD_ASPECTS )
+	vista_configure_test( VistaGenericFactoryTest VistaGenericFactoryTest.cpp )
+	target_link_libraries( VistaGenericFactoryTest
+		VistaBase
+		VistaAspects
+		${VISTA_USE_PACKAGE_LIBRARIES}
+	)
+endif()
+
+if( VISTACORELIBS_BUILD_DEVICEDRIVERSBASE )
+		vista_configure_test( VistaSensorMeasureTest
+											VistaSensorMeasureTest.cpp
+											VistaTestDriver.h
+											VistaTestDriver.cpp )
+	target_link_libraries( VistaSensorMeasureTest
+		VistaBase
+		VistaAspects
+		VistaInterProcComm
+		VistaTools
+		VistaDeviceDriversBase
+		${VISTA_USE_PACKAGE_LIBRARIES}
+	)
+endif()
+
+if( VISTACORELIBS_BUILD_DATAFLOWNET )
+		vista_configure_test( VistaHistoryProjectNodeTest
+											VistaHistoryProjectNodeTest.cpp
+											VistaTestDriver.h
+											VistaTestDriver.cpp )
+	target_link_libraries( VistaHistoryProjectNodeTest
+		VistaBase
+		VistaAspects
+		VistaInterProcComm
+		VistaTools
+		VistaDeviceDriversBase
+		VistaDataFlowNet
+		${VISTA_USE_PACKAGE_LIBRARIES}
+	)
+endif()
+
 if( VISTACORELIBS_BUILD_TOOLS )
 
 	vista_configure_test( VistaBase64Test VistaBase64Test.cpp
@@ -105,23 +145,7 @@ if( VISTACORELIBS_BUILD_TOOLS )
 		VistaTools
 		${VISTA_USE_PACKAGE_LIBRARIES}
 	)
-	
-	# Placed at the end such that CXX flag for C++11 can be added. Add all tests using C++11 
-	# below the C++11 switch below.
-	
-	if( UNIX )
-		SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" )
-	endif( UNIX )
-	
-	# C++11 tests from here.
-	
-	vista_configure_test( VistaGenericFactoryTest VistaGenericFactoryTest.cpp )
-	target_link_libraries( VistaGenericFactoryTest
-		VistaBase
-		VistaAspects
-		${VISTA_USE_PACKAGE_LIBRARIES}
-	)
-	
+		
 endif()
 
 
diff --git a/VistaCoreLibs/Tests/VistaBase64Test.cpp b/VistaCoreLibs/Tests/VistaBase64Test.cpp
index e75b5a7533f6eeb5d3b93465b87866a9c427f6a0..dd6ea83b2a3530afac5468496f13071563bdfc78 100644
--- a/VistaCoreLibs/Tests/VistaBase64Test.cpp
+++ b/VistaCoreLibs/Tests/VistaBase64Test.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <gtest/gtest.h>
 
diff --git a/VistaCoreLibs/Tests/VistaConversionTest.cpp b/VistaCoreLibs/Tests/VistaConversionTest.cpp
index f25ba18ee8b8e32f03ebef56b034757a402b73de..ce760394777f9c98fb7e8f0d06f9e749c2345acd 100644
--- a/VistaCoreLibs/Tests/VistaConversionTest.cpp
+++ b/VistaCoreLibs/Tests/VistaConversionTest.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
@@ -216,7 +216,6 @@ TEST( VistaConversionTest, GetBinaryPrefixForExponent )
 TEST( VistaConversionTest, GetBinaryPrefixForNumber )
 {
 	int nResultInt;
-	float nResultFloat;
 	double nResultDouble;
 
 	ASSERT_EQ( VistaConversion::GetBinaryPrefixForNumber( 1.54, nResultDouble, false ), "" );
diff --git a/VistaCoreLibs/Tests/VistaGenericFactoryTest.cpp b/VistaCoreLibs/Tests/VistaGenericFactoryTest.cpp
index 71e1aad2fefc929bb5a140c14c98a79118a01b6d..7342e427276d431040af6cb4dfc01c94ea9cecd8 100644
--- a/VistaCoreLibs/Tests/VistaGenericFactoryTest.cpp
+++ b/VistaCoreLibs/Tests/VistaGenericFactoryTest.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <gtest/gtest.h>
 #include <VistaAspects/VistaGenericFactory.h>
diff --git a/VistaCoreLibs/Tests/VistaHistoryProjectNodeTest.cpp b/VistaCoreLibs/Tests/VistaHistoryProjectNodeTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..3c3ba1443070ed2fd528c2f35e53dcf6978d7697
--- /dev/null
+++ b/VistaCoreLibs/Tests/VistaHistoryProjectNodeTest.cpp
@@ -0,0 +1,333 @@
+/*============================================================================*/
+/*                              ViSTA VR toolkit                              */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
+/*============================================================================*/
+/*                                  License                                   */
+/*                                                                            */
+/*  This program is free software: you can redistribute it and/or modify      */
+/*  it under the terms of the GNU Lesser General Public License as published  */
+/*  by the Free Software Foundation, either version 3 of the License, or      */
+/*  (at your option) any later version.                                       */
+/*                                                                            */
+/*  This program is distributed in the hope that it will be useful,           */
+/*  but WITHOUT ANY WARRANTY; without even the implied warranty of            */
+/*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             */
+/*  GNU Lesser General Public License for more details.                       */
+/*                                                                            */
+/*  You should have received a copy of the GNU Lesser General Public License  */
+/*  along with this program.  If not, see <http://www.gnu.org/licenses/>.     */
+/*============================================================================*/
+/*                                Contributors                                */
+/*                                                                            */
+/*============================================================================*/
+
+#include <gtest/gtest.h>
+
+#include <memory>
+
+#include "VistaTestDriver.h"
+
+#include <VistaDataFlowNet/VdfnHistoryProjectNode.h>
+#include <VistaDataFlowNet/VdfnHistoryPort.h>
+#include <VistaDeviceDriversBase/VistaSensorReadState.h>
+#include "VistaBase/VistaTimeUtils.h"
+#include "VistaBase/VistaTimer.h"
+#include "VistaDataFlowNet/VdfnActionObject.h"
+#include "VistaDataFlowNet/VdfnDriverSensorNode.h"
+
+class HistoryProjectNodeWrapper
+{
+public:
+	HistoryProjectNodeWrapper( VdfnHistoryProjectNode::eMode eUpdateMode = VdfnHistoryProjectNode::MD_LAZY,
+							   const std::list< std::string >& liMappings = { "VALUE" } )
+	: m_nLastPortUpdateMeasureCount( 0 )
+	, m_nLastEvaluationCount( 0 )
+	{
+		// configure port access
+		VdfnPortFactory* pFac = VdfnPortFactory::GetSingleton();
+		pFac->AddPortAccess( typeid( VdfnHistoryPortData* ).name(),
+							new VdfnPortFactory::CPortAccess(
+							new VdfnTypedPortCreate< VdfnHistoryPortData* >,
+							new TVdfnTranscodePortSet< VdfnHistoryPortData* >,
+							new VdfnTypedPortStringGet< VdfnHistoryPortData* > ) );
+		pFac->AddFunctorAccess( typeid( VdfnHistoryPortData* ).name(),
+							new VdfnPortFactory::CFunctorAccess(
+							new VdfnTypedPortTypeCompareCreate< VdfnHistoryPortData* >,
+							new TActionSet< VdfnHistoryPortData* >,
+							new VdfnTypedPortCreate< VdfnHistoryPortData* >,
+							NULL ) );
+		pFac->AddPortAccess( typeid(int).name(),
+							new VdfnPortFactory::CPortAccess(
+							new VdfnTypedPortCreate<int>,
+							new TVdfnTranscodePortSet<int>,
+							new VdfnTypedPortStringGet<int> ) );
+		pFac->AddFunctorAccess( typeid(int).name(),
+							new VdfnPortFactory::CFunctorAccess(
+							new VdfnTypedPortTypeCompareCreate<int>,
+							new TActionSet<int>,
+							new VdfnTypedPortCreate<int>,
+							NULL ) );
+
+		m_pReadState = std::unique_ptr< VistaSensorReadState >( new VistaSensorReadState( GetSensor(), false ) );
+
+		m_pSensorNode = std::unique_ptr< VdfnDriverSensorNode >( new VdfnDriverSensorNode( m_oDevice.GetSensor(), m_pReadState.get() ) );
+		m_pProjectNode = std::unique_ptr< VdfnHistoryProjectNode >( new VdfnHistoryProjectNode( liMappings, eUpdateMode ) );
+		m_pBackwardIndexPort = std::unique_ptr< TVdfnPort< unsigned int > >( new TVdfnPort< unsigned int >() );
+		
+		m_pSensorNode->PreparePorts();
+		m_pProjectNode->PreparePorts();
+
+		m_pHistoryPort = dynamic_cast< HistoryPort* >( m_pSensorNode->GetOutPort( "history" ) );
+		m_pProjectNode->SetInPort( "history", m_pHistoryPort );
+		m_pProjectNode->SetInPort( "backward_index", m_pBackwardIndexPort.get() );
+
+		m_pSensorNode->PrepareEvaluationRun();
+		m_pProjectNode->PrepareEvaluationRun();
+
+		m_pValuePort = dynamic_cast< TVdfnPort< int >* >( m_pProjectNode->GetOutPort( "VALUE" ) );
+	}
+
+	void UpdateReadState() { m_pReadState->SetToLatestSample(); }
+	void PushValueToDriver( const int nValue ) { m_oDevice.GetDriver()->PushValue( nValue ); }
+
+	void EvaluateNodes()
+	{
+		VistaType::systemtime nUpdateTimestamp = VistaTimeUtils::GetStandardTimer().GetSystemTime();
+
+		if( m_pSensorNode->NeedsEval() )
+		{
+			m_pSensorNode->EvalNode( nUpdateTimestamp );
+		}
+
+		m_nLastEvaluationCount = 0;
+		m_vecLastEvaluationValues.clear();
+		unsigned int nValuePortUpdateCount = ( m_pValuePort ? m_pValuePort->GetUpdateCounter() : 0 );
+		while( m_pProjectNode->NeedsEval() )
+		{
+			m_pProjectNode->EvalNode( nUpdateTimestamp );
+			++m_nLastEvaluationCount;
+			if( m_pValuePort && m_pValuePort->GetUpdateCounter() > nValuePortUpdateCount )
+			{
+				nValuePortUpdateCount = m_pValuePort->GetUpdateCounter();
+				m_vecLastEvaluationValues.push_back( m_pValuePort->GetValue() );
+			}
+		}
+	}
+
+	void SetProjectNodeBackwardIndex( const unsigned int nIndex )
+	{
+		 m_pBackwardIndexPort->SetValue( nIndex, VistaTimeUtils::GetStandardTimer().GetSystemTime() );
+	}
+
+	VdfnDriverSensorNode* GetSensorNode() { return m_pSensorNode.get(); }
+	VdfnHistoryProjectNode* GetProjectNode() { return m_pProjectNode.get(); }
+	HistoryPort* GetHistoryPort() { return m_pHistoryPort; }
+	TVdfnPort< int >* GetValuePort() { return m_pValuePort; }
+
+
+	VistaDeviceSensor* GetSensor() { return m_oDevice.GetSensor(); }
+	const VistaMeasureHistory& GetHistory() { return m_oDevice.GetHistory(); }
+	VistaSensorReadState* GetReadState() { return m_pReadState.get(); }
+
+	int GetLastEvaluationCount() { return m_nLastEvaluationCount; }
+	bool GetLastEvaluationResultEqualts( const std::vector< int >& vecValues )
+	{
+		if( vecValues.size() != m_vecLastEvaluationValues.size() )
+			return false;
+		return std::equal( vecValues.begin(), vecValues.end(), m_vecLastEvaluationValues.begin() );
+	}
+	bool GetLastEvaluationResultEqualts( const int nValue )
+	{
+		if( m_vecLastEvaluationValues.size() != 1 )
+			return false;
+		return ( m_vecLastEvaluationValues.front() == nValue );
+	}
+
+private:
+	VistaTestDriverWrapper m_oDevice;
+	std::unique_ptr< VdfnDriverSensorNode > m_pSensorNode;
+	std::unique_ptr< VdfnHistoryProjectNode > m_pProjectNode;
+	std::unique_ptr< VistaSensorReadState > m_pReadState;
+	HistoryPort* m_pHistoryPort;
+	std::unique_ptr< TVdfnPort< unsigned int > > m_pBackwardIndexPort;
+	TVdfnPort< int >* m_pValuePort;
+	VistaType::uint32 m_nLastPortUpdateMeasureCount;
+	int m_nLastEvaluationCount;
+	std::vector< int > m_vecLastEvaluationValues;
+};
+
+
+/////////////////////////////////////
+///////// ACTUAL TESTS //////////////
+/////////////////////////////////////
+
+
+TEST( VistaHistoryProjectNode, NoSensorNodeUpdateWithoutDriverData )
+{
+	HistoryProjectNodeWrapper oData;
+	oData.EvaluateNodes();
+	ASSERT_EQ( oData.GetHistoryPort()->GetUpdateCounter(), 0 );
+}
+TEST( VistaHistoryProjectNode, NoSensorNodeUpdateWithoutReadstateUpdate )
+{
+	HistoryProjectNodeWrapper oData;
+	oData.PushValueToDriver( 42 );
+	oData.EvaluateNodes();
+	ASSERT_EQ( oData.GetHistoryPort()->GetUpdateCounter(), 0 );
+}
+TEST( VistaHistoryProjectNode, SensorNodeUpdateAfterReadstateUpdate )
+{
+	HistoryProjectNodeWrapper oData;
+	oData.PushValueToDriver( 42 );
+	oData.UpdateReadState();
+	oData.EvaluateNodes();
+	ASSERT_EQ( oData.GetHistoryPort()->GetUpdateCounter(), 1 );
+	oData.PushValueToDriver( 12345 );
+	oData.PushValueToDriver( 666 );
+	oData.UpdateReadState();
+	oData.EvaluateNodes();
+	ASSERT_EQ( oData.GetHistoryPort()->GetUpdateCounter(), 2 );
+}
+
+TEST( VistaHistoryProjectNode, NoProjectNodeEvalsWithoutSensorMesures )
+{
+	HistoryProjectNodeWrapper oData;
+	oData.EvaluateNodes();
+	ASSERT_EQ( oData.GetLastEvaluationCount(), 0 );
+}
+TEST( VistaHistoryProjectNode, NoProjectNodeEvalsWithoutReadstateUpdate )
+{
+	HistoryProjectNodeWrapper oData;
+	oData.PushValueToDriver( 42 );
+	oData.EvaluateNodes();
+	ASSERT_EQ( oData.GetLastEvaluationCount(), 0 );
+}
+TEST( VistaHistoryProjectNode, ProjectNodeEvalAfterReadstateUpdate )
+{
+	HistoryProjectNodeWrapper oData;
+	oData.PushValueToDriver( 42 );
+	oData.UpdateReadState();
+	oData.EvaluateNodes();
+	ASSERT_EQ( oData.GetLastEvaluationCount(), 1 );
+	ASSERT_TRUE( oData.GetLastEvaluationResultEqualts( 42 ) );
+}
+
+TEST( VistaHistoryProjectNode, ProjectNodeLazyYieldsLatestReadstateValue )
+{
+	HistoryProjectNodeWrapper oData( VdfnHistoryProjectNode::MD_LAZY );
+	oData.PushValueToDriver( 42 );
+	oData.PushValueToDriver( 12345 );
+	oData.UpdateReadState();
+	oData.PushValueToDriver( 666 );
+	oData.EvaluateNodes();
+	ASSERT_EQ( oData.GetLastEvaluationCount(), 1 );
+	ASSERT_TRUE( oData.GetLastEvaluationResultEqualts( 12345 ) );
+}
+
+TEST( VistaHistoryProjectNode, ProjectNodeIndexedYieldsRelativeToLatestReadstateValue )
+{
+	HistoryProjectNodeWrapper oData( VdfnHistoryProjectNode::MD_INDEXED );
+	oData.SetProjectNodeBackwardIndex( 1 );
+	oData.PushValueToDriver( 42 );
+	oData.PushValueToDriver( 12345 );
+	oData.UpdateReadState();
+	oData.PushValueToDriver( 666 );
+	oData.EvaluateNodes();
+	ASSERT_EQ( oData.GetLastEvaluationCount(), 1 );
+	ASSERT_TRUE( oData.GetLastEvaluationResultEqualts( 42 ) );
+}
+
+TEST( VistaHistoryProjectNode, ProjectNodeIndexedYieldsNewResultAfterIndexChange )
+{
+	HistoryProjectNodeWrapper oData( VdfnHistoryProjectNode::MD_INDEXED );
+	oData.SetProjectNodeBackwardIndex( 0 );
+	oData.PushValueToDriver( 42 );
+	oData.PushValueToDriver( 12345 );
+	oData.PushValueToDriver( 666 );
+	oData.UpdateReadState();
+	oData.EvaluateNodes();
+	ASSERT_EQ( oData.GetLastEvaluationCount(), 1 );
+	ASSERT_TRUE( oData.GetLastEvaluationResultEqualts( 666 ) );
+
+	oData.SetProjectNodeBackwardIndex( 1 );
+	oData.EvaluateNodes();
+	ASSERT_EQ( oData.GetLastEvaluationCount(), 1 );
+	ASSERT_TRUE( oData.GetLastEvaluationResultEqualts( 12345 ) );
+
+	oData.SetProjectNodeBackwardIndex( 2 );
+	oData.EvaluateNodes();
+	ASSERT_EQ( oData.GetLastEvaluationCount(), 1 );
+	ASSERT_TRUE( oData.GetLastEvaluationResultEqualts( 42 ) );
+}
+
+TEST( VistaHistoryProjectNode, ProjectNodeIndexedYieldsUpdateButNoResultWhenIndexTooLarge )
+{
+	HistoryProjectNodeWrapper oData( VdfnHistoryProjectNode::MD_INDEXED );
+	oData.SetProjectNodeBackwardIndex( 3 );
+	oData.PushValueToDriver( 42 );
+	oData.PushValueToDriver( 12345 );
+	oData.PushValueToDriver( 666 );
+	oData.UpdateReadState();
+	oData.EvaluateNodes();
+	ASSERT_EQ( oData.GetLastEvaluationCount(), 1 );
+	ASSERT_TRUE( oData.GetLastEvaluationResultEqualts( std::vector< int >() ) );
+}
+
+TEST( VistaHistoryProjectNode, ProjectNodeHotYieldsLatestDriverValue )
+{
+	HistoryProjectNodeWrapper oData( VdfnHistoryProjectNode::MD_HOT );
+	oData.PushValueToDriver( 42 );
+	oData.PushValueToDriver( 12345 );
+	oData.UpdateReadState();
+	oData.PushValueToDriver( 666 );
+	oData.EvaluateNodes();
+	ASSERT_EQ( oData.GetLastEvaluationCount(), 1 );
+	ASSERT_TRUE( oData.GetLastEvaluationResultEqualts( 666 ) );
+}
+
+TEST( VistaHistoryProjectNode, ProjectNodeIterateYieldsNothingWithoutDriverUpdate )
+{
+	HistoryProjectNodeWrapper oData( VdfnHistoryProjectNode::MD_ITERATE );
+	oData.EvaluateNodes();
+	ASSERT_EQ( oData.GetLastEvaluationCount(), 0 );
+}
+
+TEST( VistaHistoryProjectNode, ProjectNodeIterateYieldsNothingWithoutReadstateUpdate )
+{
+	HistoryProjectNodeWrapper oData( VdfnHistoryProjectNode::MD_ITERATE );
+	oData.PushValueToDriver( 42 );
+	oData.EvaluateNodes();
+	ASSERT_EQ( oData.GetLastEvaluationCount(), 0 );
+}
+
+TEST( VistaHistoryProjectNode, ProjectNodeIterateYieldsAllReadstateValues )
+{
+	HistoryProjectNodeWrapper oData( VdfnHistoryProjectNode::MD_ITERATE );
+	oData.PushValueToDriver( 42 );
+	oData.PushValueToDriver( 12345 );
+	oData.UpdateReadState();
+	oData.PushValueToDriver( 666 );
+	oData.EvaluateNodes();
+	ASSERT_EQ( oData.GetLastEvaluationCount(), 2 );
+	ASSERT_TRUE( oData.GetLastEvaluationResultEqualts( std::vector< int >{ 42, 12345 } ) );
+
+	oData.PushValueToDriver( 31415 );
+	oData.PushValueToDriver( 299792458 );
+	oData.PushValueToDriver( -1 );
+	oData.UpdateReadState();
+	oData.PushValueToDriver( 13 );
+	oData.EvaluateNodes();
+	ASSERT_EQ( oData.GetLastEvaluationCount(), 4 );
+	ASSERT_TRUE( oData.GetLastEvaluationResultEqualts( std::vector< int >{ 666, 31415, 299792458, -1 } ) );
+}
+
+
+
+
+int main( int argc, char** argv )
+{
+	::testing::InitGoogleTest( &argc, argv );
+	return RUN_ALL_TESTS();
+} 
+
+
diff --git a/VistaCoreLibs/Tests/VistaMathBasicsTest.cpp b/VistaCoreLibs/Tests/VistaMathBasicsTest.cpp
index 20679156523dd6aaca8fb72a207ce07ec49c65a0..33544faed3050be25acd4455ea744939422bb781 100644
--- a/VistaCoreLibs/Tests/VistaMathBasicsTest.cpp
+++ b/VistaCoreLibs/Tests/VistaMathBasicsTest.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaSerializablesTest.cpp 38623 2013-10-10 16:36:10Z dr165799 $
+
 
 
 
diff --git a/VistaCoreLibs/Tests/VistaReflectionableTest.cpp b/VistaCoreLibs/Tests/VistaReflectionableTest.cpp
index 3dc05514dd8d42277c2d39e1cff697ae180c0b80..794d55eb83d6a9ed9d84f02696e48239cdfde134 100644
--- a/VistaCoreLibs/Tests/VistaReflectionableTest.cpp
+++ b/VistaCoreLibs/Tests/VistaReflectionableTest.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 
diff --git a/VistaCoreLibs/Tests/VistaSensorMeasureTest.cpp b/VistaCoreLibs/Tests/VistaSensorMeasureTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..bf5c2d7f35b76ce479eff3d73bf1fc881cde4028
--- /dev/null
+++ b/VistaCoreLibs/Tests/VistaSensorMeasureTest.cpp
@@ -0,0 +1,249 @@
+/*============================================================================*/
+/*                              ViSTA VR toolkit                              */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
+/*============================================================================*/
+/*                                  License                                   */
+/*                                                                            */
+/*  This program is free software: you can redistribute it and/or modify      */
+/*  it under the terms of the GNU Lesser General Public License as published  */
+/*  by the Free Software Foundation, either version 3 of the License, or      */
+/*  (at your option) any later version.                                       */
+/*                                                                            */
+/*  This program is distributed in the hope that it will be useful,           */
+/*  but WITHOUT ANY WARRANTY; without even the implied warranty of            */
+/*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             */
+/*  GNU Lesser General Public License for more details.                       */
+/*                                                                            */
+/*  You should have received a copy of the GNU Lesser General Public License  */
+/*  along with this program.  If not, see <http://www.gnu.org/licenses/>.     */
+/*============================================================================*/
+/*                                Contributors                                */
+/*                                                                            */
+/*============================================================================*/
+
+
+
+
+#include <gtest/gtest.h>
+
+#include "VistaTestDriver.h"
+
+#include "VistaDeviceDriversBase/VistaDeviceDriver.h"
+#include "VistaBase/VistaTimeUtils.h"
+#include "VistaBase/VistaTimer.h"
+#include "VistaDeviceDriversBase/DriverAspects/VistaDriverMeasureHistoryAspect.h"
+#include "VistaDeviceDriversBase/VistaSensorReadState.h"
+
+#include <memory>
+
+
+/////////////////////////////////////
+///////// ACTUAL TESTS //////////////
+/////////////////////////////////////
+
+
+TEST( VistaSensorMeatureTest, EmptySensorIsEmpty )
+{
+	VistaTestDriverWrapper oDevice;
+	
+	ASSERT_EQ( oDevice.GetSensor()->GetMeasureCount(), 0 );	
+}
+
+
+TEST( VistaSensorMeatureTest, SensorMeasureCountIsIncreasing )
+{
+	VistaTestDriverWrapper oDevice;
+	
+	oDevice.GetDriver()->PushValue( 42 );
+	ASSERT_EQ( oDevice.GetSensor()->GetMeasureCount(), 1 );	
+	oDevice.GetDriver()->PushValue( 12345 );
+	ASSERT_EQ( oDevice.GetSensor()->GetMeasureCount(), 2 );
+	oDevice.GetDriver()->PushValue( 666 );
+	ASSERT_EQ( oDevice.GetSensor()->GetMeasureCount(), 3 );	
+}
+
+TEST( VistaSensorMeatureTest, SensorValidAccess )
+{
+	VistaTestDriverWrapper oDevice;
+	
+	oDevice.GetDriver()->PushValue( 42 );
+	ASSERT_EQ( oDevice.GetSensor()->GetMostCurrentValue< int >( "VALUE" ), 42 );
+
+	oDevice.GetDriver()->PushValue( 12345 );
+	ASSERT_EQ( oDevice.GetSensor()->GetMostCurrentValue< int >( "VALUE" ), 12345 );
+}
+TEST( VistaSensorMeatureTest, SensorInvalidAccessWrongGetter )
+{
+	VistaTestDriverWrapper oDevice;
+	
+	oDevice.GetDriver()->PushValue( 42 );
+	ASSERT_THROW( oDevice.GetSensor()->GetMostCurrentValue< int >( "NON_EXISTANT_VALUE" ), VistaExceptionBase );
+}
+
+TEST( VistaSensorMeatureTest, SensorInvalidAccessWrongType )
+{
+	VistaTestDriverWrapper oDevice;
+	
+	oDevice.GetDriver()->PushValue( 42 );
+	ASSERT_THROW( oDevice.GetSensor()->GetMostCurrentValue< int >( "NON_EXISTANT_VALUE" ), VistaExceptionBase );
+}
+
+
+
+TEST( VistaSensorMeatureTest, EmptyHistoryIsEmpty )
+{
+	VistaTestDriverWrapper oDevice;
+	
+	ASSERT_EQ( oDevice.GetHistory().GetMeasureCount(), 0 );
+}
+TEST( VistaSensorMeatureTest, HistoryAccessWhenEmptyReturnsNull )
+{
+	VistaTestDriverWrapper oDevice;
+	
+	ASSERT_FALSE( oDevice.GetHistory().GetMostCurrent()->GetIsValid() );	
+}
+TEST( VistaSensorMeatureTest, HistoryAccessValid )
+{
+	VistaTestDriverWrapper oDevice;
+	
+	oDevice.GetDriver()->PushValue( 42 );
+	const VistaSensorMeasure* pMeasure = oDevice.GetHistory().GetMostCurrent();
+	ASSERT_TRUE( pMeasure->GetIsValid() );
+	ASSERT_EQ( pMeasure->getRead< VistaTestDriverMeasure >()->m_nValue, 42 );
+
+	oDevice.GetDriver()->PushValue( 12345 );
+	pMeasure = oDevice.GetHistory().GetMostCurrent();
+	ASSERT_TRUE( pMeasure->GetIsValid() );
+	ASSERT_EQ( pMeasure->getRead< VistaTestDriverMeasure >()->m_nValue, 12345 );
+
+	oDevice.GetDriver()->PushValue( 666 );
+	pMeasure = oDevice.GetHistory().GetMostCurrent();
+	ASSERT_TRUE( pMeasure->GetIsValid() );
+	ASSERT_EQ( pMeasure->getRead< VistaTestDriverMeasure >()->m_nValue, 666 );
+}
+TEST( VistaSensorMeatureTest, HistoryAccessPastValid )
+{
+	VistaTestDriverWrapper oDevice;
+	
+	oDevice.GetDriver()->PushValue( 42 );
+	oDevice.GetDriver()->PushValue( 12345 );
+	oDevice.GetDriver()->PushValue( 666 );
+
+	const VistaSensorMeasure* pMeasure = oDevice.GetHistory().GetCurrentPast( 0 );
+	ASSERT_TRUE( pMeasure->GetIsValid() );
+	ASSERT_EQ( pMeasure->getRead< VistaTestDriverMeasure >()->m_nValue, 666 );
+	
+	pMeasure = oDevice.GetHistory().GetCurrentPast( 1 );
+	ASSERT_TRUE( pMeasure->GetIsValid() );
+	ASSERT_EQ( pMeasure->getRead< VistaTestDriverMeasure >()->m_nValue, 12345 );
+
+	pMeasure = oDevice.GetHistory().GetCurrentPast( 2 );
+	ASSERT_TRUE( pMeasure->GetIsValid() );
+	ASSERT_EQ( pMeasure->getRead< VistaTestDriverMeasure >()->m_nValue, 42 );
+}
+TEST( VistaSensorMeatureTest, HistoryAccessPastInvalid )
+{
+	VistaTestDriverWrapper oDevice;
+	
+	oDevice.GetDriver()->PushValue( 42 );
+	oDevice.GetDriver()->PushValue( 12345 );
+	oDevice.GetDriver()->PushValue( 666 );
+
+	const VistaSensorMeasure* pMeasure = oDevice.GetHistory().GetCurrentPast( 3 );
+	ASSERT_FALSE( pMeasure->GetIsValid() );
+}
+
+
+TEST( VistaSensorMeatureTest, ReadStateValid )
+{
+	VistaTestDriverWrapper oDevice;
+	VistaSensorReadState oReadState( oDevice.GetSensor(), false );
+	
+	ASSERT_TRUE( oReadState.GetIsValid() );
+}
+TEST( VistaSensorMeatureTest, ReadStateInvalid )
+{
+	VistaSensorReadState oReadState( NULL, false );
+	
+	ASSERT_FALSE( oReadState.GetIsValid() );
+}
+TEST( VistaSensorMeatureTest, ReadStateInitiallyEmpty )
+{
+	VistaTestDriverWrapper oDevice;
+	VistaSensorReadState oReadState( oDevice.GetSensor(), false );
+	
+	ASSERT_EQ( oReadState.GetMeasureCount(), 0 );
+}
+TEST( VistaSensorMeatureTest, ReadStateEmptyWithoutSwap )
+{
+	VistaTestDriverWrapper oDevice;
+	VistaSensorReadState oReadState( oDevice.GetSensor(), false );
+
+	oDevice.GetDriver()->PushValue( 42 );
+	ASSERT_EQ( oReadState.GetMeasureCount(), 0 );
+	oDevice.GetDriver()->PushValue(12345 );
+	ASSERT_EQ( oReadState.GetMeasureCount(), 0 );
+}
+TEST( VistaSensorMeatureTest, ReadStateEmptyAfterEmptySwap )
+{
+	VistaTestDriverWrapper oDevice;
+	VistaSensorReadState oReadState( oDevice.GetSensor(), false );
+	
+	oReadState.SetToLatestSample();
+	ASSERT_EQ( oReadState.GetMeasureCount(), 0 );
+}
+TEST( VistaSensorMeatureTest, ReadStateEntriesAfterFillAndSwap )
+{
+	VistaTestDriverWrapper oDevice;
+	VistaSensorReadState oReadState( oDevice.GetSensor(), false );
+	
+	oDevice.GetDriver()->PushValue( 42 );
+	oReadState.SetToLatestSample();
+	ASSERT_EQ( oReadState.GetMeasureCount(), 1 );
+	ASSERT_EQ( oReadState.GetCurrentMeasure()->getRead< VistaTestDriverMeasure >()->m_nValue, 42 );
+
+	oDevice.GetDriver()->PushValue( 12345 );
+	oReadState.SetToLatestSample();
+	ASSERT_EQ( oReadState.GetMeasureCount(), 2 );
+	ASSERT_EQ( oReadState.GetCurrentMeasure()->getRead< VistaTestDriverMeasure >()->m_nValue, 12345 );
+
+	oDevice.GetDriver()->PushValue( 666 );
+	oReadState.SetToLatestSample();
+	ASSERT_EQ( oReadState.GetMeasureCount(), 3 );
+	ASSERT_EQ( oReadState.GetCurrentMeasure()->getRead< VistaTestDriverMeasure >()->m_nValue, 666 );
+}
+TEST( VistaSensorMeatureTest, ReadStateDriverUpdateAndSwap )
+{
+	VistaTestDriverWrapper oDevice;
+	VistaSensorReadState oReadState( oDevice.GetSensor(), false );
+	
+	oDevice.GetDriver()->PushValue( 42 );
+	oDevice.GetDriver()->PushValue( 12345 );
+	oDevice.GetDriver()->PushValue( 666 );
+	oReadState.SetToLatestSample();
+	oDevice.GetDriver()->PushValue( 31415 );
+	ASSERT_EQ( oReadState.GetMeasureCount(), 3 );
+	ASSERT_EQ( oReadState.GetCurrentMeasure()->getRead< VistaTestDriverMeasure >()->m_nValue, 666 );	
+}
+TEST( VistaSensorMeatureTest, ReadStateHistoryAccess )
+{
+	VistaTestDriverWrapper oDevice;
+	VistaSensorReadState oReadState( oDevice.GetSensor(), false );
+	
+	oDevice.GetDriver()->PushValue( 42 );
+	oDevice.GetDriver()->PushValue( 12345 );
+	oDevice.GetDriver()->PushValue( 666 );
+	oReadState.SetToLatestSample();
+	oDevice.GetDriver()->PushValue( 31415 );
+	ASSERT_EQ( oReadState.GetPastMeasure( 0 )->getRead< VistaTestDriverMeasure >()->m_nValue, 666 );
+	ASSERT_EQ( oReadState.GetPastMeasure( 1 )->getRead< VistaTestDriverMeasure >()->m_nValue, 12345 );
+	ASSERT_EQ( oReadState.GetPastMeasure( 2 )->getRead< VistaTestDriverMeasure >()->m_nValue, 42 );
+}
+
+int main( int argc, char** argv )
+{
+	::testing::InitGoogleTest( &argc, argv );
+	return RUN_ALL_TESTS();
+} 
+
+
diff --git a/VistaCoreLibs/Tests/VistaSerializablesTest.cpp b/VistaCoreLibs/Tests/VistaSerializablesTest.cpp
index ff726e3692a79f00161e69632d721b370aea41bc..5a54404ff8ca2c96f23f0d60d721117eefeedba0 100644
--- a/VistaCoreLibs/Tests/VistaSerializablesTest.cpp
+++ b/VistaCoreLibs/Tests/VistaSerializablesTest.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 
diff --git a/VistaCoreLibs/Tests/VistaTestDriver.cpp b/VistaCoreLibs/Tests/VistaTestDriver.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..0d730154a4af17adb8f08a6874c4b4dd7409c687
--- /dev/null
+++ b/VistaCoreLibs/Tests/VistaTestDriver.cpp
@@ -0,0 +1,162 @@
+/*============================================================================*/
+/*                              ViSTA VR toolkit                              */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
+/*============================================================================*/
+/*                                  License                                   */
+/*                                                                            */
+/*  This program is free software: you can redistribute it and/or modify      */
+/*  it under the terms of the GNU Lesser General Public License as published  */
+/*  by the Free Software Foundation, either version 3 of the License, or      */
+/*  (at your option) any later version.                                       */
+/*                                                                            */
+/*  This program is distributed in the hope that it will be useful,           */
+/*  but WITHOUT ANY WARRANTY; without even the implied warranty of            */
+/*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             */
+/*  GNU Lesser General Public License for more details.                       */
+/*                                                                            */
+/*  You should have received a copy of the GNU Lesser General Public License  */
+/*  along with this program.  If not, see <http://www.gnu.org/licenses/>.     */
+/*============================================================================*/
+/*                                Contributors                                */
+/*                                                                            */
+/*============================================================================*/
+
+#include "VistaTestDriver.h"
+#include "VistaBase/VistaTimeUtils.h"
+#include "VistaBase/VistaTimer.h"
+
+namespace
+{
+	class VistaTestDriverMeasureTranscode : public IVistaMeasureTranscode
+	{
+	public:
+		VistaTestDriverMeasureTranscode() {}
+		virtual ~VistaTestDriverMeasureTranscode() {}
+		static std::string GetTypeString() { return "VistaTestDriverMeasureTranscode"; }
+	
+		class Get : public IVistaMeasureTranscode::IntGet
+		{
+		public:
+			Get() : IVistaMeasureTranscode::IntGet( "VALUE", VistaTestDriverMeasureTranscode::GetTypeString(), "value" )	{}
+
+			virtual int GetValue( const VistaSensorMeasure* pMeasure ) const
+			{
+				const VistaTestDriverMeasure* pMeasureData = pMeasure->getRead< VistaTestDriverMeasure >();
+				return pMeasureData->m_nValue;
+			}
+
+			virtual bool GetValue( const VistaSensorMeasure* pMeasure, int& nValue ) const
+			{
+				const VistaTestDriverMeasure* pMeasureData = pMeasure->getRead< VistaTestDriverMeasure >();
+				nValue = pMeasureData->m_nValue;
+				return true;
+			}
+		};
+	
+		REFL_INLINEIMP( VistaTestDriverMeasureTranscode, IVistaMeasureTranscode );
+	};
+	static IVistaPropertyGetFunctor* s_pTranscodeGetter = new VistaTestDriverMeasureTranscode::Get();
+
+	class TestDriverTranscoderFactory : public IVistaMeasureTranscoderFactory
+	{
+		virtual IVistaMeasureTranscode* CreateTranscoder() override
+		{
+			return new VistaTestDriverMeasureTranscode();
+		}
+
+		virtual void DestroyTranscoder( IVistaMeasureTranscode* pTranscode ) override
+		{
+			delete pTranscode;
+		}
+		virtual std::string GetTranscoderName() const override { return "TestDriverTranscoderFactory"; }
+	};
+}
+class VistaTestDriver::CreationMethod : public IVistaDriverCreationMethod
+{
+public:
+	CreationMethod( IVistaTranscoderFactoryFactory* pMetaFactory )
+	: IVistaDriverCreationMethod( pMetaFactory )
+	{
+		RegisterSensorType( "", sizeof( VistaTestDriverMeasure), 1000, pMetaFactory->CreateFactoryForType( "")  );
+	}
+
+	virtual IVistaDeviceDriver* CreateDriver()
+	{
+		return new VistaTestDriver( this );
+	}
+};
+
+VistaTestDriver::VistaTestDriver( IVistaDriverCreationMethod* pCreationMethod )
+: IVistaDeviceDriver( pCreationMethod )
+, m_nReadBuffer( 0 )
+{
+	SetUpdateType( IVistaDeviceDriver::UPDATE_CUSTOM_THREADED );
+	VistaDeviceSensor* pSensor = new VistaDeviceSensor();
+	pSensor->SetMeasureTranscode( pCreationMethod->GetTranscoderFactoryForSensor( "" )->CreateTranscoder() );
+	pSensor->SetTypeHint( "" );
+	AddDeviceSensor( pSensor );
+}
+
+bool VistaTestDriver::DoSensorUpdate( VistaType::microtime dTs )
+{
+	VistaDeviceSensor* pSensor = GetSensorByIndex( 0 );
+
+	assert( pSensor != NULL );
+
+	MeasureStart( 0, dTs );
+	VistaSensorMeasure* pMeasure = m_pHistoryAspect->GetCurrentSlot( pSensor );
+	VistaTestDriverMeasure* pMeasureData = pMeasure->getWrite< VistaTestDriverMeasure >();
+
+	pMeasureData->m_nValue = m_nReadBuffer;
+
+	MeasureStop( 0 );
+	return true;
+}
+
+void VistaTestDriver::PushValue( int nValue )
+{
+	m_nReadBuffer = nValue;
+	DoSensorUpdate( VistaTimeUtils::GetStandardTimer().GetSystemTime() );
+}
+
+bool VistaTestDriver::DoConnect()
+{
+	return true;
+}
+
+bool VistaTestDriver::DoDisconnect()
+{
+	return true;
+}
+
+VistaTestDriverWrapper::VistaTestDriverWrapper()
+: m_pMetaFactory( new TSimpleTranscoderFactoryFactory< TestDriverTranscoderFactory >() )
+{	
+	m_pCreationMethod = std::unique_ptr< VistaTestDriver::CreationMethod >( new VistaTestDriver::CreationMethod( m_pMetaFactory.get() ) );
+	m_pDriver = std::unique_ptr< VistaTestDriver >( new VistaTestDriver( m_pCreationMethod.get() ) );
+	m_pSensor = m_pDriver->GetSensorByIndex( 0 );
+	m_pDriver->SetupSensorHistory( m_pSensor, 100, 1.0 / 60.0 );
+}
+VistaTestDriverWrapper::~VistaTestDriverWrapper()
+{
+}
+
+VistaTestDriver* VistaTestDriverWrapper::GetDriver()
+{
+	return m_pDriver.get();
+}
+
+VistaDeviceSensor* VistaTestDriverWrapper::GetSensor()
+{
+	return m_pSensor;
+}
+
+const VistaMeasureHistory& VistaTestDriverWrapper::GetHistory()
+{
+	return m_pSensor->GetMeasures();
+}
+
+IVistaMeasureTranscode::IntGet* VistaTestDriverWrapper::GetTranscodeGet()
+{
+	return dynamic_cast<IVistaMeasureTranscode::IntGet*>( m_pSensor->GetMeasureTranscode()->GetMeasureProperty( "VALUE" ) );
+}
diff --git a/VistaDemo/Template/MyDemoAppl.h b/VistaCoreLibs/Tests/VistaTestDriver.h
similarity index 61%
rename from VistaDemo/Template/MyDemoAppl.h
rename to VistaCoreLibs/Tests/VistaTestDriver.h
index 98e525ef8e42aaf081c8b26a63f2566752e79566..04f4de36ceaa92f7bdaf287046d15109008f94e0 100644
--- a/VistaDemo/Template/MyDemoAppl.h
+++ b/VistaCoreLibs/Tests/VistaTestDriver.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,48 +20,72 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
 
-#ifndef _MYDEMOAPPL_H
-#define _MYDEMOAPPL_H
+#ifndef _VISTATESTDRIVER
+#define _VISTATESTDRIVER
 
 /*============================================================================*/
 /* INCLUDES                                                                   */
 /*============================================================================*/
 
-#include <VistaKernel/VistaSystem.h>
+#include <gtest/gtest.h>
 
-/*============================================================================*/
-/* MACROS AND DEFINES                                                         */
-/*============================================================================*/
+#include <memory>
+
+#include <VistaAspects/VistaReflectionable.h>
+
+#include <VistaDeviceDriversBase/VistaDeviceDriver.h>
+#include <VistaDeviceDriversBase/VistaDeviceSensor.h>
+#include <VistaDeviceDriversBase/DriverAspects/VistaDriverMeasureHistoryAspect.h>
 
-/*============================================================================*/
-/* FORWARD DECLARATIONS                                                       */
-/*============================================================================*/
 
 /*============================================================================*/
-/* CLASS DEFINITIONS                                                          */
+/* HELPERS                                                                    */
 /*============================================================================*/
 
-class CMyDemoAppl
+struct VistaTestDriverMeasure
+{
+	int m_nValue;
+};
+
+class VistaTestDriver : public IVistaDeviceDriver
 {
 public:
-	CMyDemoAppl(int argc = 0, char  *argv[] = NULL);
-	virtual ~CMyDemoAppl();
+	VistaTestDriver( IVistaDriverCreationMethod* pCreationMethod );
+	
+	virtual bool DoSensorUpdate( VistaType::microtime dTs ) override;
+
+	void PushValue( int nValue );
+
+	virtual bool DoConnect() override;
 
-	void   Run  ();
+	virtual bool DoDisconnect() override;
 
+	class CreationMethod;
 private:
-	VistaSystem	mVistaSystem;
+	int m_nReadBuffer;
 };
 
-/*============================================================================*/
-/* LOCAL VARS AND FUNCS                                                       */
-/*============================================================================*/
 
-/*============================================================================*/
-/* END OF FILE                                                                */
-/*============================================================================*/
-#endif // _MYDEMOAPPL_H
+class VistaTestDriverWrapper
+{
+public:
+	VistaTestDriverWrapper();
+	~VistaTestDriverWrapper();
+
+	VistaTestDriver* GetDriver();
+	VistaDeviceSensor* GetSensor();
+	const VistaMeasureHistory& GetHistory();
+	IVistaMeasureTranscode::IntGet* GetTranscodeGet();
+	
+private:
+	
+	std::unique_ptr< IVistaTranscoderFactoryFactory > m_pMetaFactory;
+	std::unique_ptr< VistaTestDriver::CreationMethod > m_pCreationMethod;
+	std::unique_ptr< VistaTestDriver > m_pDriver;
+	
+	VistaDeviceSensor* m_pSensor;
+};
+
+#endif //_VISTATESTDRIVER
+
diff --git a/VistaCoreLibs/Tests/VistaTestRotations.h b/VistaCoreLibs/Tests/VistaTestRotations.h
index 9c3173f05a6261f75fb928e5568253897c4cfba5..9f342e5ffdd0ba7efb3d30946c93125277ec1145 100644
--- a/VistaCoreLibs/Tests/VistaTestRotations.h
+++ b/VistaCoreLibs/Tests/VistaTestRotations.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaSerializablesTest.cpp 38623 2013-10-10 16:36:10Z dr165799 $
+
 
 #ifndef _VISTATESTROTATIONS_H
 #define _VISTATESTROTATIONS_H
diff --git a/VistaCoreLibs/Tests/VistaTestingUtilsTest.cpp b/VistaCoreLibs/Tests/VistaTestingUtilsTest.cpp
index 25e198174c425ad12caad1f85869e5360e765e1d..a83dfec31fc46c10f391a4e30994bb81a79f99e0 100644
--- a/VistaCoreLibs/Tests/VistaTestingUtilsTest.cpp
+++ b/VistaCoreLibs/Tests/VistaTestingUtilsTest.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaSerializablesTest.cpp 39440 2013-11-21 18:54:39Z dr165799 $
+
 
 
 
diff --git a/VistaCoreLibs/Tests/VistaVector3DTest.cpp b/VistaCoreLibs/Tests/VistaVector3DTest.cpp
index 707c74dd80c98bc68e6935eca19431d493758cd4..82d7bfbde84da0d40d780051aece554594b5c131 100644
--- a/VistaCoreLibs/Tests/VistaVector3DTest.cpp
+++ b/VistaCoreLibs/Tests/VistaVector3DTest.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaSerializablesTest.cpp 38623 2013-10-10 16:36:10Z dr165799 $
+
 
 
 
diff --git a/VistaCoreLibs/VistaAspects/CMakeLists.txt b/VistaCoreLibs/VistaAspects/CMakeLists.txt
index 1c051ac939644076b19811075dc882d4c6539a9a..0c31891830cf8f933dc5af4783491433388a68aa 100644
--- a/VistaCoreLibs/VistaAspects/CMakeLists.txt
+++ b/VistaCoreLibs/VistaAspects/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id$
+
 
 vista_adopt_version( VistaAspects VistaCoreLibs )
 
diff --git a/VistaCoreLibs/VistaAspects/VistaAspectsConfig.h b/VistaCoreLibs/VistaAspects/VistaAspectsConfig.h
index d03e2223239173549ff63e01ea419e615efa8c06..78aae041de4079a0eb4f40da769a4e2f7c9076aa 100644
--- a/VistaCoreLibs/VistaAspects/VistaAspectsConfig.h
+++ b/VistaCoreLibs/VistaAspects/VistaAspectsConfig.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAASPECTSCONFIG_H
 #define _VISTAASPECTSCONFIG_H
diff --git a/VistaCoreLibs/VistaAspects/VistaAspectsMain.cpp b/VistaCoreLibs/VistaAspects/VistaAspectsMain.cpp
index 6abcba4420176f7255b2ca87847e1294f9eeac3e..9e0000192dd2225e415812a42fa92bf650a91629 100644
--- a/VistaCoreLibs/VistaAspects/VistaAspectsMain.cpp
+++ b/VistaCoreLibs/VistaAspects/VistaAspectsMain.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaAspects/VistaAspectsUtils.cpp b/VistaCoreLibs/VistaAspects/VistaAspectsUtils.cpp
index 8efc68725529b1efb93f8ff725fbc2fbd29cdb14..a90d59b1dd576f9b5a6e13d8d7e951d9d61b3139 100644
--- a/VistaCoreLibs/VistaAspects/VistaAspectsUtils.cpp
+++ b/VistaCoreLibs/VistaAspects/VistaAspectsUtils.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaAspectsUtils.h"
 
@@ -612,7 +612,6 @@ bool VistaAspectsConversionStuff::ConvertStringTo4Double(const std::string &sStr
 
 // ############################################
 
-
 bool VistaAspectsComparisonStuff::StringEquals(string sFirst, string sSecond, bool bCaseSensitive)
 {
 	if(bCaseSensitive)
diff --git a/VistaCoreLibs/VistaAspects/VistaAspectsUtils.h b/VistaCoreLibs/VistaAspects/VistaAspectsUtils.h
index 561f7bb98bba5249a055757df748e84378228771..167c003a2dc4c8ff1c10e4f6c5d62910a8529bfd 100644
--- a/VistaCoreLibs/VistaAspects/VistaAspectsUtils.h
+++ b/VistaCoreLibs/VistaAspects/VistaAspectsUtils.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAASPECTSUTILS_H
 #define _VISTAASPECTSUTILS_H
diff --git a/VistaCoreLibs/VistaAspects/VistaConversion.cpp b/VistaCoreLibs/VistaAspects/VistaConversion.cpp
index ba16f15f0b111c0874329352b3e7c05b568d0c11..e9a0a22aa4da2c88ed346fe51bbaede01830cab8 100644
--- a/VistaCoreLibs/VistaAspects/VistaConversion.cpp
+++ b/VistaCoreLibs/VistaAspects/VistaConversion.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaConversion.h"
 
diff --git a/VistaCoreLibs/VistaAspects/VistaConversion.h b/VistaCoreLibs/VistaAspects/VistaConversion.h
index 5081c166e8b2c1eefc0fd73cfd72f478b0d73106..3c83310ea319a00902e94bb1710941eb98480a50 100644
--- a/VistaCoreLibs/VistaAspects/VistaConversion.h
+++ b/VistaCoreLibs/VistaAspects/VistaConversion.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTACONVERSIONUTILS_H
 #define _VISTACONVERSIONUTILS_H
diff --git a/VistaCoreLibs/VistaAspects/VistaDeSerializer.cpp b/VistaCoreLibs/VistaAspects/VistaDeSerializer.cpp
index 1f770c822c1dcd1ce46cda42022cb5170deb592b..1305d962bcaa84e7c66fd7d9a1d7f2669639b7b5 100644
--- a/VistaCoreLibs/VistaAspects/VistaDeSerializer.cpp
+++ b/VistaCoreLibs/VistaAspects/VistaDeSerializer.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 #include <string>
 using std::string;
 
diff --git a/VistaCoreLibs/VistaAspects/VistaDeSerializer.h b/VistaCoreLibs/VistaAspects/VistaDeSerializer.h
index f6187481f956476aed5749f2de8f5cef838a4e48..717aa6da30ca70fa847674f0dabd93116597fdd1 100644
--- a/VistaCoreLibs/VistaAspects/VistaDeSerializer.h
+++ b/VistaCoreLibs/VistaAspects/VistaDeSerializer.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADESERIALIZER_H
 #define _VISTADESERIALIZER_H
diff --git a/VistaCoreLibs/VistaAspects/VistaExplicitCallbackInterface.cpp b/VistaCoreLibs/VistaAspects/VistaExplicitCallbackInterface.cpp
index f5e30e25cee8cd5f7c54b2b02d3985bd8aa27f80..92d32680ea134cc1a9593370b510250c7b872f03 100644
--- a/VistaCoreLibs/VistaAspects/VistaExplicitCallbackInterface.cpp
+++ b/VistaCoreLibs/VistaAspects/VistaExplicitCallbackInterface.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaExplicitCallbackInterface.h"
 
diff --git a/VistaCoreLibs/VistaAspects/VistaExplicitCallbackInterface.h b/VistaCoreLibs/VistaAspects/VistaExplicitCallbackInterface.h
index b7feb4b479aa21a66f34b8c4478021c662ed0f28..069161f8cc6fa1cf9e30946f787f2b8be8f0d3b1 100644
--- a/VistaCoreLibs/VistaAspects/VistaExplicitCallbackInterface.h
+++ b/VistaCoreLibs/VistaAspects/VistaExplicitCallbackInterface.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAEXPLICITCALLBACKINTERFACE_H
 #define _VISTAEXPLICITCALLBACKINTERFACE_H
diff --git a/VistaCoreLibs/VistaAspects/VistaGenericFactory.h b/VistaCoreLibs/VistaAspects/VistaGenericFactory.h
index 6722169de00e7e4be89d2c9b64161d48d57ecade..db2e45dc7c4fcd021648555117a1dc88449799da 100644
--- a/VistaCoreLibs/VistaAspects/VistaGenericFactory.h
+++ b/VistaCoreLibs/VistaAspects/VistaGenericFactory.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 #ifndef VISTAGENERICFACTORY_H
 #define VISTAGENERICFACTORY_H
 
diff --git a/VistaCoreLibs/VistaAspects/VistaLocatable.cpp b/VistaCoreLibs/VistaAspects/VistaLocatable.cpp
index 0efe1960892f1e9018d2d75f9e4c84781419c642..054ea5b3b2b98e59d4bb3e63c0c897238e9beb2f 100644
--- a/VistaCoreLibs/VistaAspects/VistaLocatable.cpp
+++ b/VistaCoreLibs/VistaAspects/VistaLocatable.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaLocatable.h"
 
diff --git a/VistaCoreLibs/VistaAspects/VistaLocatable.h b/VistaCoreLibs/VistaAspects/VistaLocatable.h
index ecbeb793d56a09013f493e7db9e166daa61b7803..cb54da03a90015a98422a7fe2b42ba0d93fbd3bd 100644
--- a/VistaCoreLibs/VistaAspects/VistaLocatable.h
+++ b/VistaCoreLibs/VistaAspects/VistaLocatable.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTALOCATABLE_H
 #define _VISTALOCATABLE_H
diff --git a/VistaCoreLibs/VistaAspects/VistaMarshalledObjectFactory.cpp b/VistaCoreLibs/VistaAspects/VistaMarshalledObjectFactory.cpp
index 8672f19cf340dbe9b7915f8bb45d81fde3afba9b..ae84c10b5606e62042f67621c46d346c0bdb0f42 100644
--- a/VistaCoreLibs/VistaAspects/VistaMarshalledObjectFactory.cpp
+++ b/VistaCoreLibs/VistaAspects/VistaMarshalledObjectFactory.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaMarshalledObjectFactory.h"
 
diff --git a/VistaCoreLibs/VistaAspects/VistaMarshalledObjectFactory.h b/VistaCoreLibs/VistaAspects/VistaMarshalledObjectFactory.h
index 723bd9c28b3924fc9773ad90120fe86a8ea9aef3..82bd78978a8761700b07ec783adac61cbd31f67c 100644
--- a/VistaCoreLibs/VistaAspects/VistaMarshalledObjectFactory.h
+++ b/VistaCoreLibs/VistaAspects/VistaMarshalledObjectFactory.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAMARSHALLEDOBJECTFACTORY_H
 #define _VISTAMARSHALLEDOBJECTFACTORY_H
diff --git a/VistaCoreLibs/VistaAspects/VistaNameable.cpp b/VistaCoreLibs/VistaAspects/VistaNameable.cpp
index 79b357623175670f1315f86f9a4e1b4514e6fc3e..176dba6af3e138961198f6454288a8f791c5cee0 100644
--- a/VistaCoreLibs/VistaAspects/VistaNameable.cpp
+++ b/VistaCoreLibs/VistaAspects/VistaNameable.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaNameable.h"
 
diff --git a/VistaCoreLibs/VistaAspects/VistaNameable.h b/VistaCoreLibs/VistaAspects/VistaNameable.h
index f33e0b5a84a4f20bfb2f485f8bb087cb538c7fcd..358aa2420b03886113a6d61dffce6d8ec98555cf 100644
--- a/VistaCoreLibs/VistaAspects/VistaNameable.h
+++ b/VistaCoreLibs/VistaAspects/VistaNameable.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTANAMEABLE_H
 #define _VISTANAMEABLE_H
diff --git a/VistaCoreLibs/VistaAspects/VistaObjectRegistry.cpp b/VistaCoreLibs/VistaAspects/VistaObjectRegistry.cpp
index 6bcbde965cbc5b9f5b020a59367353a69f68eeee..cd0907daff2e2a573a29caadaf76b3fd92d36a71 100644
--- a/VistaCoreLibs/VistaAspects/VistaObjectRegistry.cpp
+++ b/VistaCoreLibs/VistaAspects/VistaObjectRegistry.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaObjectRegistry.h"
 #include "VistaNameable.h"
diff --git a/VistaCoreLibs/VistaAspects/VistaObjectRegistry.h b/VistaCoreLibs/VistaAspects/VistaObjectRegistry.h
index 8431e9749489319d716a4d74823d41983e61f34f..c334830d182e9d31db349fbf6ec974bca67ed5e1 100644
--- a/VistaCoreLibs/VistaAspects/VistaObjectRegistry.h
+++ b/VistaCoreLibs/VistaAspects/VistaObjectRegistry.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOBJECTREGISTRY_H
 #define _VISTAOBJECTREGISTRY_H
diff --git a/VistaCoreLibs/VistaAspects/VistaObserveable.cpp b/VistaCoreLibs/VistaAspects/VistaObserveable.cpp
index 98eb417a55298a8922b55096523ca626ffe99571..63d8151bf0eaddd8bf43b43da0cab66e5549eba5 100644
--- a/VistaCoreLibs/VistaAspects/VistaObserveable.cpp
+++ b/VistaCoreLibs/VistaAspects/VistaObserveable.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaObserveable.h"
 #include "VistaObserver.h"
diff --git a/VistaCoreLibs/VistaAspects/VistaObserveable.h b/VistaCoreLibs/VistaAspects/VistaObserveable.h
index c43ecfa011fe0cad11025f9ee3bc2e7c362c4f39..8f816f7ca0471d4a6911d419658f67419238cd42 100644
--- a/VistaCoreLibs/VistaAspects/VistaObserveable.h
+++ b/VistaCoreLibs/VistaAspects/VistaObserveable.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOBSERVEABLE_H
 #define _VISTAOBSERVEABLE_H
diff --git a/VistaCoreLibs/VistaAspects/VistaObserver.cpp b/VistaCoreLibs/VistaAspects/VistaObserver.cpp
index 449755bfce423f6cb058fd5c78cdac112ae38045..112ca3e97eec81b4bf3a401e4389324254b743fe 100644
--- a/VistaCoreLibs/VistaAspects/VistaObserver.cpp
+++ b/VistaCoreLibs/VistaAspects/VistaObserver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaObserver.h"
 #include <algorithm>
diff --git a/VistaCoreLibs/VistaAspects/VistaObserver.h b/VistaCoreLibs/VistaAspects/VistaObserver.h
index c8a011241c1c3ba7264f68601c9f48df7c808373..cb1e14058312fb0c4d1b8eace2e957e3eab8bf5f 100644
--- a/VistaCoreLibs/VistaAspects/VistaObserver.h
+++ b/VistaCoreLibs/VistaAspects/VistaObserver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOBSERVER_H
 #define _VISTAOBSERVER_H
diff --git a/VistaCoreLibs/VistaAspects/VistaProperty.cpp b/VistaCoreLibs/VistaAspects/VistaProperty.cpp
index 04bc4c0190df311a77451073383f02300e9f1988..7f8862d1b204e6d9540be65cc718659f3d7ab8e2 100644
--- a/VistaCoreLibs/VistaAspects/VistaProperty.cpp
+++ b/VistaCoreLibs/VistaAspects/VistaProperty.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaProperty.h"
 
diff --git a/VistaCoreLibs/VistaAspects/VistaProperty.h b/VistaCoreLibs/VistaAspects/VistaProperty.h
index 7109c95ff59bf08247f9ffe845a9a9867fb50207..0f07831dbd0794dba64fcbfa55149b05723f3876 100644
--- a/VistaCoreLibs/VistaAspects/VistaProperty.h
+++ b/VistaCoreLibs/VistaAspects/VistaProperty.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAPROPERTY_H
 #define _VISTAPROPERTY_H
diff --git a/VistaCoreLibs/VistaAspects/VistaPropertyAwareable.cpp b/VistaCoreLibs/VistaAspects/VistaPropertyAwareable.cpp
index 41e11d9e74a7848775022c90d32e8a776778ee19..98583964472faf4b509ece3465b4ecfd453054a1 100644
--- a/VistaCoreLibs/VistaAspects/VistaPropertyAwareable.cpp
+++ b/VistaCoreLibs/VistaAspects/VistaPropertyAwareable.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaPropertyAwareable.h"
 
diff --git a/VistaCoreLibs/VistaAspects/VistaPropertyAwareable.h b/VistaCoreLibs/VistaAspects/VistaPropertyAwareable.h
index 8aa24363e599ba65e7f97a68918006e2529cf3dd..6727dd6638720be63f40b582372f65ab8f3059de 100644
--- a/VistaCoreLibs/VistaAspects/VistaPropertyAwareable.h
+++ b/VistaCoreLibs/VistaAspects/VistaPropertyAwareable.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAPROPERTYAWAREABLE_H
 #define _VISTAPROPERTYAWAREABLE_H
diff --git a/VistaCoreLibs/VistaAspects/VistaPropertyFunctor.cpp b/VistaCoreLibs/VistaAspects/VistaPropertyFunctor.cpp
index a2c45d0e3f45632b402487fcd41c02788cc80d71..34dccc3991b1b05935ffe5855a3fb83727f6b697 100644
--- a/VistaCoreLibs/VistaAspects/VistaPropertyFunctor.cpp
+++ b/VistaCoreLibs/VistaAspects/VistaPropertyFunctor.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <string>
 
diff --git a/VistaCoreLibs/VistaAspects/VistaPropertyFunctor.h b/VistaCoreLibs/VistaAspects/VistaPropertyFunctor.h
index e71b3739dc8df1494bccd4656dbb6e3d28d01643..19c0b64c29f2cad7fab7320ae01175b7d5e62e35 100644
--- a/VistaCoreLibs/VistaAspects/VistaPropertyFunctor.h
+++ b/VistaCoreLibs/VistaAspects/VistaPropertyFunctor.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAPROPERTYFUNCTOR_H
 #define _VISTAPROPERTYFUNCTOR_H
diff --git a/VistaCoreLibs/VistaAspects/VistaPropertyFunctorRegistry.cpp b/VistaCoreLibs/VistaAspects/VistaPropertyFunctorRegistry.cpp
index 017d420d5c45adccd08501ed0007fcc77c38336d..112e9dac988ed8ea5510cb2cdafa6012b0516629 100644
--- a/VistaCoreLibs/VistaAspects/VistaPropertyFunctorRegistry.cpp
+++ b/VistaCoreLibs/VistaAspects/VistaPropertyFunctorRegistry.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaPropertyFunctorRegistry.h"
 #include "VistaPropertyFunctor.h"
diff --git a/VistaCoreLibs/VistaAspects/VistaPropertyFunctorRegistry.h b/VistaCoreLibs/VistaAspects/VistaPropertyFunctorRegistry.h
index 745f81bc35a4deb719ec8b0dc9a952132e4f755e..9c192e7032cc13ea5f25ddb67385ec4bc13814a1 100644
--- a/VistaCoreLibs/VistaAspects/VistaPropertyFunctorRegistry.h
+++ b/VistaCoreLibs/VistaAspects/VistaPropertyFunctorRegistry.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAPROPERTYFUNCTORREGISTRY_H
 #define _VISTAPROPERTYFUNCTORREGISTRY_H
diff --git a/VistaCoreLibs/VistaAspects/VistaPropertyList.cpp b/VistaCoreLibs/VistaAspects/VistaPropertyList.cpp
index 19d9a8c72d5c92dee178716bb26c2dcfc62b82ca..f6fcc708b16e1340c06562a13b73f9c233bfbb8c 100644
--- a/VistaCoreLibs/VistaAspects/VistaPropertyList.cpp
+++ b/VistaCoreLibs/VistaAspects/VistaPropertyList.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaPropertyList.h"
 
diff --git a/VistaCoreLibs/VistaAspects/VistaPropertyList.h b/VistaCoreLibs/VistaAspects/VistaPropertyList.h
index a4b195b0ce0cc405770e2aa6bcb6c39187fa81a6..8e0876318a7fafc00851c9b99b6c0d54d87565b2 100644
--- a/VistaCoreLibs/VistaAspects/VistaPropertyList.h
+++ b/VistaCoreLibs/VistaAspects/VistaPropertyList.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 #ifndef _VISTAPROPERTYLIST_H
diff --git a/VistaCoreLibs/VistaAspects/VistaReferenceCountable.cpp b/VistaCoreLibs/VistaAspects/VistaReferenceCountable.cpp
index 1d834a9957f488bf3f2f21bb01daa8d63d0aea85..6f49beeeafe490671d897ca71950959113f1e9ca 100644
--- a/VistaCoreLibs/VistaAspects/VistaReferenceCountable.cpp
+++ b/VistaCoreLibs/VistaAspects/VistaReferenceCountable.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaReferenceCountable.h"
 
diff --git a/VistaCoreLibs/VistaAspects/VistaReferenceCountable.h b/VistaCoreLibs/VistaAspects/VistaReferenceCountable.h
index 1323d7b63a05e00f68a68828653073df530f64cd..3607126e639fb11373fed9eaaa4f6d0d1165be69 100644
--- a/VistaCoreLibs/VistaAspects/VistaReferenceCountable.h
+++ b/VistaCoreLibs/VistaAspects/VistaReferenceCountable.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAREFERENCECOUNTABLE_H
 #define _VISTAREFERENCECOUNTABLE_H
diff --git a/VistaCoreLibs/VistaAspects/VistaReflectionable.cpp b/VistaCoreLibs/VistaAspects/VistaReflectionable.cpp
index 79d5940e805d705cd847a7c48d5c2e8799ae9290..0769d15bc0f9bacb6b77736e92b895370acdfcb9 100644
--- a/VistaCoreLibs/VistaAspects/VistaReflectionable.cpp
+++ b/VistaCoreLibs/VistaAspects/VistaReflectionable.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaReflectionable.h"
 #include "VistaPropertyFunctorRegistry.h"
diff --git a/VistaCoreLibs/VistaAspects/VistaReflectionable.h b/VistaCoreLibs/VistaAspects/VistaReflectionable.h
index bb90342820e8875b27a8155b14b4328fd09593ea..b5343d857ed3d483689cf711e751f8f9d0fb09c6 100644
--- a/VistaCoreLibs/VistaAspects/VistaReflectionable.h
+++ b/VistaCoreLibs/VistaAspects/VistaReflectionable.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAREFLECTIONABLE_H
 #define _VISTAREFLECTIONABLE_H
diff --git a/VistaCoreLibs/VistaAspects/VistaSerializable.cpp b/VistaCoreLibs/VistaAspects/VistaSerializable.cpp
index b69577d561ec1ab3263591ece6271156d3758b62..d05d67db31da4a140168ed13cff8de2f51d43f64 100644
--- a/VistaCoreLibs/VistaAspects/VistaSerializable.cpp
+++ b/VistaCoreLibs/VistaAspects/VistaSerializable.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaSerializable.h"
 
diff --git a/VistaCoreLibs/VistaAspects/VistaSerializable.h b/VistaCoreLibs/VistaAspects/VistaSerializable.h
index e7a3f376c6e6982760245f169e7f6b430306d0fb..6cf2612f36bce1920e9a76b955bc2876c74cb539 100644
--- a/VistaCoreLibs/VistaAspects/VistaSerializable.h
+++ b/VistaCoreLibs/VistaAspects/VistaSerializable.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASERIALIZABLE_H
 #define _VISTASERIALIZABLE_H
diff --git a/VistaCoreLibs/VistaAspects/VistaSerializer.cpp b/VistaCoreLibs/VistaAspects/VistaSerializer.cpp
index 48c66c69cdd1372088dca21641f3e9f8af7e2cfc..7bcf2cfe972c7ad3770525503c1356841c1dc7ed 100644
--- a/VistaCoreLibs/VistaAspects/VistaSerializer.cpp
+++ b/VistaCoreLibs/VistaAspects/VistaSerializer.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaSerializer.h"
 
diff --git a/VistaCoreLibs/VistaAspects/VistaSerializer.h b/VistaCoreLibs/VistaAspects/VistaSerializer.h
index 86deff5f5e1c73ec0f785a05f3456ad3d056048a..f4643be026f50a62f0a61a9ab0ce2bc4c171a2d0 100644
--- a/VistaCoreLibs/VistaAspects/VistaSerializer.h
+++ b/VistaCoreLibs/VistaAspects/VistaSerializer.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASERIALIZER_H
 #define _VISTASERIALIZER_H
diff --git a/VistaCoreLibs/VistaAspects/VistaSimpleCallback.cpp b/VistaCoreLibs/VistaAspects/VistaSimpleCallback.cpp
index 4a5a137b346c4ef3818cace4d541fd7b91e5bcce..6a8cd2e5bf9e56cfc0d1d5ebb55b3b01ea48c886 100644
--- a/VistaCoreLibs/VistaAspects/VistaSimpleCallback.cpp
+++ b/VistaCoreLibs/VistaAspects/VistaSimpleCallback.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaSimpleCallback.h"
 
diff --git a/VistaCoreLibs/VistaAspects/VistaSimpleCallback.h b/VistaCoreLibs/VistaAspects/VistaSimpleCallback.h
index 3b79275c27b71ac2a42cdc2aa7c302399c1c6bbc..6bd5f9282085c2912787868d88aff7112d2b9adb 100644
--- a/VistaCoreLibs/VistaAspects/VistaSimpleCallback.h
+++ b/VistaCoreLibs/VistaAspects/VistaSimpleCallback.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASIMPLECALLBACK_H
 #define _VISTASIMPLECALLBACK_H
diff --git a/VistaCoreLibs/VistaAspects/VistaTransformable.cpp b/VistaCoreLibs/VistaAspects/VistaTransformable.cpp
index 14ab0fbb260336792cbc778c35288b202ac647bb..4030c69c903cfe23d884ce96f223eb3f23dd9cb6 100644
--- a/VistaCoreLibs/VistaAspects/VistaTransformable.cpp
+++ b/VistaCoreLibs/VistaAspects/VistaTransformable.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaTransformable.h"
 
diff --git a/VistaCoreLibs/VistaAspects/VistaTransformable.h b/VistaCoreLibs/VistaAspects/VistaTransformable.h
index 82f649b6ebd99ea7ff460bfbb1229889b5aa62f4..0df9a19c8e8aeff07d7e85e4ea22311c04f65fcc 100644
--- a/VistaCoreLibs/VistaAspects/VistaTransformable.h
+++ b/VistaCoreLibs/VistaAspects/VistaTransformable.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATRANSFORMABLE_H
 #define _VISTATRANSFORMABLE_H
diff --git a/VistaCoreLibs/VistaAspects/VistaUncopyable.h b/VistaCoreLibs/VistaAspects/VistaUncopyable.h
index 8ed990c009e82d4352b4543af725914529c032ad..d2e62e9713138334b3e01508756a33903bd4052b 100644
--- a/VistaCoreLibs/VistaAspects/VistaUncopyable.h
+++ b/VistaCoreLibs/VistaAspects/VistaUncopyable.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaSerializable.h 34351 2013-03-26 11:50:28Z dr165799 $
+
 
 #ifndef _VISTAUNCOPYABLE_H
 #define _VISTAUNCOPYABLE_H
diff --git a/VistaCoreLibs/VistaAspects/_SourceFiles.cmake b/VistaCoreLibs/VistaAspects/_SourceFiles.cmake
index 105eed6d390d6ffcc6792c2cbc96e59aa4daa6dc..f8f6aae94e696f326103282a4705cea5879a2c70 100644
--- a/VistaCoreLibs/VistaAspects/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaAspects/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaCoreLibs/VistaBase/CMakeLists.txt b/VistaCoreLibs/VistaBase/CMakeLists.txt
index 9f6c7963ff07f10dbd53ec78d97ec83953a7be86..30bb143d5e1f597717c50a70e33bf2d06ccdcbfb 100644
--- a/VistaCoreLibs/VistaBase/CMakeLists.txt
+++ b/VistaCoreLibs/VistaBase/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id$
+
 
 vista_adopt_version( VistaBase VistaCoreLibs )
 
@@ -24,7 +24,3 @@ if( VISTACORELIBS_CREATE_CONFIG_PER_LIBRARY )
 	vista_create_cmake_configs( VistaBase )
 endif( VISTACORELIBS_CREATE_CONFIG_PER_LIBRARY )
 vista_create_default_info_file( VistaBase )
-
-if( UNIX )
-	SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" )
-endif( UNIX )
\ No newline at end of file
diff --git a/VistaCoreLibs/VistaBase/Half/VistaHalf.cpp b/VistaCoreLibs/VistaBase/Half/VistaHalf.cpp
index d42136e3ebaa8c14619c80399a28805e3df9bbb9..9811df923a7a348586d572c258ed6ee6bd392c78 100644
--- a/VistaCoreLibs/VistaBase/Half/VistaHalf.cpp
+++ b/VistaCoreLibs/VistaBase/Half/VistaHalf.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/* $Id::                                                                     $*/
+
 
 ///////////////////////////////////////////////////////////////////////////
 //
diff --git a/VistaCoreLibs/VistaBase/Half/VistaHalf.h b/VistaCoreLibs/VistaBase/Half/VistaHalf.h
index ceaa7b113be155d0d108c750226b7ec871b508fc..580ae22eedc6c038d459b7620dda51e723bcd3b7 100644
--- a/VistaCoreLibs/VistaBase/Half/VistaHalf.h
+++ b/VistaCoreLibs/VistaBase/Half/VistaHalf.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAHALF_H_
 #define _VISTAHALF_H_
diff --git a/VistaCoreLibs/VistaBase/Half/VistaHalfFunction.h b/VistaCoreLibs/VistaBase/Half/VistaHalfFunction.h
index 9ca95db8e6850db790c0e908b11c0c260a388feb..ba944ce233ffc5cb5fd056358bc66cc82e8d09e2 100644
--- a/VistaCoreLibs/VistaBase/Half/VistaHalfFunction.h
+++ b/VistaCoreLibs/VistaBase/Half/VistaHalfFunction.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 ///////////////////////////////////////////////////////////////////////////
 //
diff --git a/VistaCoreLibs/VistaBase/Half/VistaHalfLimits.h b/VistaCoreLibs/VistaBase/Half/VistaHalfLimits.h
index f8d88d38e944bee770a75ccab279c8842febb6af..89ac2e4343e03a051b1d0b9a6d38b3b7741b58b5 100644
--- a/VistaCoreLibs/VistaBase/Half/VistaHalfLimits.h
+++ b/VistaCoreLibs/VistaBase/Half/VistaHalfLimits.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 ///////////////////////////////////////////////////////////////////////////
 //
diff --git a/VistaCoreLibs/VistaBase/Half/_SourceFiles.cmake b/VistaCoreLibs/VistaBase/Half/_SourceFiles.cmake
index a2135690dd1cee5102f9984abc776377cc7ac7f2..cf9584a08644dc9d6f5c20bd3012a7727759aa1b 100644
--- a/VistaCoreLibs/VistaBase/Half/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaBase/Half/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "./Half" )
 set( RelativeSourceGroup "Source Files\\Half" )
diff --git a/VistaCoreLibs/VistaBase/VistaAtomicCounter.cpp b/VistaCoreLibs/VistaBase/VistaAtomicCounter.cpp
index dbabd7c259710cf02564d22728950b86a57c62a4..6357af0dba22a0faf16d2f757cccbf3674a90f2b 100644
--- a/VistaCoreLibs/VistaBase/VistaAtomicCounter.cpp
+++ b/VistaCoreLibs/VistaBase/VistaAtomicCounter.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <cerrno>
 
diff --git a/VistaCoreLibs/VistaBase/VistaAtomicCounter.h b/VistaCoreLibs/VistaBase/VistaAtomicCounter.h
index 1174d596f41d395b55b69a161a2ced319aa30e0d..3e45d3d6c0b459a2b1942cac0f8800403f458345 100644
--- a/VistaCoreLibs/VistaBase/VistaAtomicCounter.h
+++ b/VistaCoreLibs/VistaBase/VistaAtomicCounter.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAATOMICCOUNTER_H_
 #define _VISTAATOMICCOUNTER_H_
diff --git a/VistaCoreLibs/VistaBase/VistaAutoBuffer.cpp b/VistaCoreLibs/VistaBase/VistaAutoBuffer.cpp
index 76a1c9d3830cbd58badd08c185f31a8c088344c5..e9e36b9d474710df233ba96569dd5fbff2d827e2 100644
--- a/VistaCoreLibs/VistaBase/VistaAutoBuffer.cpp
+++ b/VistaCoreLibs/VistaBase/VistaAutoBuffer.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 #include "VistaAutoBuffer.h"
diff --git a/VistaCoreLibs/VistaBase/VistaAutoBuffer.h b/VistaCoreLibs/VistaBase/VistaAutoBuffer.h
index 9b9909ddf228aef1af6515b54eee11eeeb4a44d9..c3821d967cb4e6c2afec203865c28b66f7c49126 100644
--- a/VistaCoreLibs/VistaBase/VistaAutoBuffer.h
+++ b/VistaCoreLibs/VistaBase/VistaAutoBuffer.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAAUTOBUFFER_H_
 #define _VISTAAUTOBUFFER_H_
diff --git a/VistaCoreLibs/VistaBase/VistaAutoBufferPool.cpp b/VistaCoreLibs/VistaBase/VistaAutoBufferPool.cpp
index 3e2f8cdf1b06460ce50dbe361f74660fc16825d1..25104383f8c3f431e8741c8477e4d13422a74beb 100644
--- a/VistaCoreLibs/VistaBase/VistaAutoBufferPool.cpp
+++ b/VistaCoreLibs/VistaBase/VistaAutoBufferPool.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaAutoBufferPool.h"
 
diff --git a/VistaCoreLibs/VistaBase/VistaAutoBufferPool.h b/VistaCoreLibs/VistaBase/VistaAutoBufferPool.h
index 0c180b4154f85c2e53c6ffd242db6e2fce352ae7..ef3c7c36f1488a9d82cea62bb6011978b430b268 100644
--- a/VistaCoreLibs/VistaBase/VistaAutoBufferPool.h
+++ b/VistaCoreLibs/VistaBase/VistaAutoBufferPool.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 #ifndef _VISTAAUTOBUFFERPOOL_H_
 #define _VISTAAUTOBUFFERPOOL_H_
 
diff --git a/VistaCoreLibs/VistaBase/VistaBaseConfig.h b/VistaCoreLibs/VistaBase/VistaBaseConfig.h
index 3099e7b8521d1b161192e2e50ada7ff93f34565d..436e9911b2fa1d77ad2acf43f8197b93e4c383cd 100644
--- a/VistaCoreLibs/VistaBase/VistaBaseConfig.h
+++ b/VistaCoreLibs/VistaBase/VistaBaseConfig.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTABASECONFIG_H
 #define _VISTABASECONFIG_H
diff --git a/VistaCoreLibs/VistaBase/VistaBaseMain.cpp b/VistaCoreLibs/VistaBase/VistaBaseMain.cpp
index 7fd290afd5185e5d666176bfc9e7edd1e9318176..a45096a2c3e809f4cfee2588e94b7780a4d57545 100644
--- a/VistaCoreLibs/VistaBase/VistaBaseMain.cpp
+++ b/VistaCoreLibs/VistaBase/VistaBaseMain.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <iostream>
 
diff --git a/VistaCoreLibs/VistaBase/VistaBaseTypes.h b/VistaCoreLibs/VistaBase/VistaBaseTypes.h
index 3ae210508f8d9637dc2824ce2289b049539d6d0f..910a46e2c938873e59cbae8cd1b1c9f8e568c4f8 100644
--- a/VistaCoreLibs/VistaBase/VistaBaseTypes.h
+++ b/VistaCoreLibs/VistaBase/VistaBaseTypes.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTABASETYPES_H
 #define _VISTABASETYPES_H
diff --git a/VistaCoreLibs/VistaBase/VistaColor.h b/VistaCoreLibs/VistaBase/VistaColor.h
index 1a352ceae98a4a49dd61596dc193419de5163cb9..1ea2f1cb81ee9c4d12cd005c1ca889d9212e31b4 100644
--- a/VistaCoreLibs/VistaBase/VistaColor.h
+++ b/VistaCoreLibs/VistaBase/VistaColor.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTACOLOR_H
 #define _VISTACOLOR_H
diff --git a/VistaCoreLibs/VistaBase/VistaDefaultTimerImp.cpp b/VistaCoreLibs/VistaBase/VistaDefaultTimerImp.cpp
index b50292f09e01534337ffdd1619d1840597b67f33..d610de10ef0eaed6f5cef62f9409fd60105eae4a 100644
--- a/VistaCoreLibs/VistaBase/VistaDefaultTimerImp.cpp
+++ b/VistaCoreLibs/VistaBase/VistaDefaultTimerImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <iostream>
 
diff --git a/VistaCoreLibs/VistaBase/VistaDefaultTimerImp.h b/VistaCoreLibs/VistaBase/VistaDefaultTimerImp.h
index b51d6a9a5cbb9aafd58915d4d4e6addd10b081af..bbd8c5e412d76ee93c2a1fe4c283bdf35c22e6ee 100644
--- a/VistaCoreLibs/VistaBase/VistaDefaultTimerImp.h
+++ b/VistaCoreLibs/VistaBase/VistaDefaultTimerImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 #ifndef _VISTADEFAULTTIMERIMP_H
diff --git a/VistaCoreLibs/VistaBase/VistaExceptionBase.cpp b/VistaCoreLibs/VistaBase/VistaExceptionBase.cpp
index e22485e18d6aa86059c98ccbe0d525ea098d5009..7ae91bac0b2348c8c3fa27f7a1e0646de4b79c3e 100644
--- a/VistaCoreLibs/VistaBase/VistaExceptionBase.cpp
+++ b/VistaCoreLibs/VistaBase/VistaExceptionBase.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaExceptionBase.h"
 
diff --git a/VistaCoreLibs/VistaBase/VistaExceptionBase.h b/VistaCoreLibs/VistaBase/VistaExceptionBase.h
index 24741dfbf33e655cc714bbaf35f4aed4a667dd90..050e80ea4f4ece9885cb25e71d735bac0cdc8ddb 100644
--- a/VistaCoreLibs/VistaBase/VistaExceptionBase.h
+++ b/VistaCoreLibs/VistaBase/VistaExceptionBase.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAEXCEPTIONSBASE_H
 #define _VISTAEXCEPTIONSBASE_H
diff --git a/VistaCoreLibs/VistaBase/VistaMathBasics.h b/VistaCoreLibs/VistaBase/VistaMathBasics.h
index ef42b4f39d71047deb0a0cad48929b27820a6de1..e41a9100b5c4ce9fe45019d4fcf88c468f1ffa72 100644
--- a/VistaCoreLibs/VistaBase/VistaMathBasics.h
+++ b/VistaCoreLibs/VistaBase/VistaMathBasics.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAMATHBASICS_H
 #define _VISTAMATHBASICS_H
diff --git a/VistaCoreLibs/VistaBase/VistaQuaternion.cpp b/VistaCoreLibs/VistaBase/VistaQuaternion.cpp
index a54b65bc9861c0dea6309f751a9bb2b4efddc16a..8f19f2af10c7f5a1d2f439df08a52153d1ae2dab 100644
--- a/VistaCoreLibs/VistaBase/VistaQuaternion.cpp
+++ b/VistaCoreLibs/VistaBase/VistaQuaternion.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaQuaternion.h" 
 
diff --git a/VistaCoreLibs/VistaBase/VistaQuaternion.h b/VistaCoreLibs/VistaBase/VistaQuaternion.h
index dd2f20afb3fdfdbcd59157f385958a9695152940..a80450b95c23e7706000f49c20b9942cd41cbe5d 100644
--- a/VistaCoreLibs/VistaBase/VistaQuaternion.h
+++ b/VistaCoreLibs/VistaBase/VistaQuaternion.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAQUATERNION_H
 #define _VISTAQUATERNION_H
diff --git a/VistaCoreLibs/VistaBase/VistaReferenceFrame.cpp b/VistaCoreLibs/VistaBase/VistaReferenceFrame.cpp
index 350268048fc1c246747ddf8aae0183225c7ce861..6e6d54c7a1ca8ce27d23f10cff79ce654119078a 100644
--- a/VistaCoreLibs/VistaBase/VistaReferenceFrame.cpp
+++ b/VistaCoreLibs/VistaBase/VistaReferenceFrame.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaReferenceFrame.h" 
 
diff --git a/VistaCoreLibs/VistaBase/VistaReferenceFrame.h b/VistaCoreLibs/VistaBase/VistaReferenceFrame.h
index 1c916c2b8a1856e98ab16d1930ca2399d88f2b37..2ebdaab36108c5d32ad667aa5526b7b2322fc850 100644
--- a/VistaCoreLibs/VistaBase/VistaReferenceFrame.h
+++ b/VistaCoreLibs/VistaBase/VistaReferenceFrame.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAREFERENCEFRAME_H
 #define _VISTAREFERENCEFRAME_H
diff --git a/VistaCoreLibs/VistaBase/VistaSerializingToolset.cpp b/VistaCoreLibs/VistaBase/VistaSerializingToolset.cpp
index b07aa925ea12ad16019bb64a0c4eb3b988bc012e..28db21df9708dcc41d97b18a3dcb90e45e360e92 100644
--- a/VistaCoreLibs/VistaBase/VistaSerializingToolset.cpp
+++ b/VistaCoreLibs/VistaBase/VistaSerializingToolset.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaSerializingToolset.cpp 39160 2013-11-07 20:40:11Z ingoassenmacher $
+
 
 #include "VistaSerializingToolset.h"
 #include <VistaBase/VistaBaseTypes.h>
diff --git a/VistaCoreLibs/VistaBase/VistaSerializingToolset.h b/VistaCoreLibs/VistaBase/VistaSerializingToolset.h
index a956471a17bd00231c495e8e9fb78b9cde6dfa27..af1394fb715407561c0245eb7b89af7f4d15dc0a 100644
--- a/VistaCoreLibs/VistaBase/VistaSerializingToolset.h
+++ b/VistaCoreLibs/VistaBase/VistaSerializingToolset.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaSerializingToolset.h 22867 2011-08-07 15:29:00Z dr165799 $
+
 
 #ifndef _VISTASERIALIZINGTOOLSET_H
 #define _VISTASERIALIZINGTOOLSET_H
diff --git a/VistaCoreLibs/VistaBase/VistaStreamManager.cpp b/VistaCoreLibs/VistaBase/VistaStreamManager.cpp
index 59f91baf685e9fca3d02ba785e7bb847d1857da5..fdfa95ad836cb8369b50d82eda155ac132f62985 100644
--- a/VistaCoreLibs/VistaBase/VistaStreamManager.cpp
+++ b/VistaCoreLibs/VistaBase/VistaStreamManager.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaStreamManager.h"
 
diff --git a/VistaCoreLibs/VistaBase/VistaStreamManager.h b/VistaCoreLibs/VistaBase/VistaStreamManager.h
index 637a04b6994463ba68b1bd8de8aead5d7b8f3fa6..48cd761c06c999d6edd6fb4a412fd64b6a34dbc0 100644
--- a/VistaCoreLibs/VistaBase/VistaStreamManager.h
+++ b/VistaCoreLibs/VistaBase/VistaStreamManager.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASTREAMMANAGER_H
 #define _VISTASTREAMMANAGER_H
@@ -32,6 +32,8 @@
 #include "VistaBaseConfig.h"
 #include "VistaBaseTypes.h"
 
+#include <VistaAspects/VistaUncopyable.h>
+
 #include <string>
 #include <map>
 #include <vector>
@@ -52,6 +54,7 @@ class VistaTimer;
 
 class VISTABASEAPI VistaStreamManager
 {
+	VISTA_UNCOPYABLE( VistaStreamManager );
 public:	
 	VistaStreamManager();
 	virtual ~VistaStreamManager();
diff --git a/VistaCoreLibs/VistaBase/VistaStreamUtils.cpp b/VistaCoreLibs/VistaBase/VistaStreamUtils.cpp
index 8a4139dc31ef6281ad2df3208644fbfa5be259bf..973958654507bb92d23f6be5bd8040bc08bc9f2c 100644
--- a/VistaCoreLibs/VistaBase/VistaStreamUtils.cpp
+++ b/VistaCoreLibs/VistaBase/VistaStreamUtils.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaStreamUtils.h"
 
diff --git a/VistaCoreLibs/VistaBase/VistaStreamUtils.h b/VistaCoreLibs/VistaBase/VistaStreamUtils.h
index 2a9212dee76ed29e073ac141d052e3264743c92b..ac530d2c2177b3c153b132ba78d32a6d0b9a2c7a 100644
--- a/VistaCoreLibs/VistaBase/VistaStreamUtils.h
+++ b/VistaCoreLibs/VistaBase/VistaStreamUtils.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASTREAMUTILS_H
 #define _VISTASTREAMUTILS_H
diff --git a/VistaCoreLibs/VistaBase/VistaTimeUtils.cpp b/VistaCoreLibs/VistaBase/VistaTimeUtils.cpp
index 0c0eb5108cc8921c5fef60bbd015577fb7868f57..1e4e038b62006b8aac8c61ebdf8e4876ac947b02 100644
--- a/VistaCoreLibs/VistaBase/VistaTimeUtils.cpp
+++ b/VistaCoreLibs/VistaBase/VistaTimeUtils.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <cerrno>
 
diff --git a/VistaCoreLibs/VistaBase/VistaTimeUtils.h b/VistaCoreLibs/VistaBase/VistaTimeUtils.h
index f850fc4e39d1f32988aae52478b60b90af15bcb1..0d3d61661c9c927c4ee482eb4b86dbb007084cb4 100644
--- a/VistaCoreLibs/VistaBase/VistaTimeUtils.h
+++ b/VistaCoreLibs/VistaBase/VistaTimeUtils.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATIMEUTILS_H
 #define _VISTATIMEUTILS_H
diff --git a/VistaCoreLibs/VistaBase/VistaTimer.cpp b/VistaCoreLibs/VistaBase/VistaTimer.cpp
index 0dce109414f2b8502a55f7624934b320eea5e8d4..5b6e8a54f9302b4a6afd14d8499549828bd0fa87 100644
--- a/VistaCoreLibs/VistaBase/VistaTimer.cpp
+++ b/VistaCoreLibs/VistaBase/VistaTimer.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaTimer.h"
 
diff --git a/VistaCoreLibs/VistaBase/VistaTimer.h b/VistaCoreLibs/VistaBase/VistaTimer.h
index 1f9df65316f50ae3564e5b363ccf092283aecefb..f7dc670b5b7917583508f0ae11e7a552e50f25b9 100644
--- a/VistaCoreLibs/VistaBase/VistaTimer.h
+++ b/VistaCoreLibs/VistaBase/VistaTimer.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATIMER_H
 #define _VISTATIMER_H
diff --git a/VistaCoreLibs/VistaBase/VistaTimerImp.cpp b/VistaCoreLibs/VistaBase/VistaTimerImp.cpp
index b53478f5129457290bd4829909a121416febe481..7bc2bb6c6a5875f9ad989dd29c175c31645cab88 100644
--- a/VistaCoreLibs/VistaBase/VistaTimerImp.cpp
+++ b/VistaCoreLibs/VistaBase/VistaTimerImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaTimerImp.h"
 
diff --git a/VistaCoreLibs/VistaBase/VistaTimerImp.h b/VistaCoreLibs/VistaBase/VistaTimerImp.h
index 7b117c5f969eff1d0f548888290dc75e148b250d..dbb11b71df8d9999e3cdae685b06b2e529d6820d 100644
--- a/VistaCoreLibs/VistaBase/VistaTimerImp.h
+++ b/VistaCoreLibs/VistaBase/VistaTimerImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATIMERIMP_H
 #define _VISTATIMERIMP_H
diff --git a/VistaCoreLibs/VistaBase/VistaTransformMatrix.cpp b/VistaCoreLibs/VistaBase/VistaTransformMatrix.cpp
index 500f896a847b2747720a44967ceeb3cc86a179b0..1ac0f4ef1f54f0e7e85156035bd0b8ad3484a0e7 100644
--- a/VistaCoreLibs/VistaBase/VistaTransformMatrix.cpp
+++ b/VistaCoreLibs/VistaBase/VistaTransformMatrix.cpp
@@ -34,7 +34,7 @@
 /* be held responsible. Basically, don't be a jerk, and remember that         */
 /* anything free comes with no guarantee.                                     */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaTransformMatrix.h" 
 
diff --git a/VistaCoreLibs/VistaBase/VistaTransformMatrix.h b/VistaCoreLibs/VistaBase/VistaTransformMatrix.h
index 835992616fb4bc39053619a7764d40c4a18cb005..d9769b680bba2c50a4e829e2e2ed685637be49ee 100644
--- a/VistaCoreLibs/VistaBase/VistaTransformMatrix.h
+++ b/VistaCoreLibs/VistaBase/VistaTransformMatrix.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATRANSFORMMATRIX_H
 #define _VISTATRANSFORMMATRIX_H
diff --git a/VistaCoreLibs/VistaBase/VistaUtilityMacros.h b/VistaCoreLibs/VistaBase/VistaUtilityMacros.h
index 4de316de57311f767087889ba26c1751128fa15b..e834c4e67384aec03e0f8e2f008c3fb2e48afbd4 100644
--- a/VistaCoreLibs/VistaBase/VistaUtilityMacros.h
+++ b/VistaCoreLibs/VistaBase/VistaUtilityMacros.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaBaseTypes.h 34351 2013-03-26 11:50:28Z dr165799 $
+
 
 #ifndef _VISTAUTILITYMACROS_H
 #define _VISTAUTILITYMACROS_H
diff --git a/VistaCoreLibs/VistaBase/VistaVector3D.h b/VistaCoreLibs/VistaBase/VistaVector3D.h
index 208c5355e5dde7a3b1af096eeee30df5f3f00f07..419339c343f1050fd8d44cff13544469f0a8d286 100644
--- a/VistaCoreLibs/VistaBase/VistaVector3D.h
+++ b/VistaCoreLibs/VistaBase/VistaVector3D.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAVECTOR3D_H
 #define _VISTAVECTOR3D_H
diff --git a/VistaCoreLibs/VistaBase/VistaVectorMath.h b/VistaCoreLibs/VistaBase/VistaVectorMath.h
index 1d7388b5ae0678ee7a203ea9cc419a637b1c6bfa..905bb76296839f167d0b5422f6daf7278e8caf42 100644
--- a/VistaCoreLibs/VistaBase/VistaVectorMath.h
+++ b/VistaCoreLibs/VistaBase/VistaVectorMath.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAVECTORMATH_H
 #define _VISTAVECTORMATH_H
diff --git a/VistaCoreLibs/VistaBase/VistaVersion.cpp b/VistaCoreLibs/VistaBase/VistaVersion.cpp
index 838c3e0c5ed3291e25e3e8efdac78b87f0c86ba4..d4c298de8c4d3eb24a631be3f13b9f7acac48480 100644
--- a/VistaCoreLibs/VistaBase/VistaVersion.cpp
+++ b/VistaCoreLibs/VistaBase/VistaVersion.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaVersion.h"
 
diff --git a/VistaCoreLibs/VistaBase/VistaVersion.h b/VistaCoreLibs/VistaBase/VistaVersion.h
index d1923f0f862adc18b8fc2f9dcae8ae12dde32c3c..32d5f7fe4a83eeb728118a53c265d6a2231b832c 100644
--- a/VistaCoreLibs/VistaBase/VistaVersion.h
+++ b/VistaCoreLibs/VistaBase/VistaVersion.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAVERSION_H
 #define _VISTAVERSION_H
@@ -36,29 +36,30 @@
  * 		<table border=0>
  * 			<tr>
  * 				<td align="right">API version:</td>
- * 				<td align="left"><b>1.15</b></td>
+ * 				<td align="left"><b>1.16</b></td>
  * 			</tr>
  * 			<tr>
  * 				<td align="right">codename:</td>
- * 				<td align="left"><b>ViSTA CONCORDE</b></td>
+ * 				<td align="left"><b>ViSTA HUBBLE</b></td>
  * 			</tr>
  * 			<tr>
  * 				<td align="right">API release date:</td>
- * 				<td align="left"><b>January 21st, 2016</b></td>
+ * 				<td align="left"><b>May 20th, 2016</b></td>
  * 			</tr>
  * 			<tr><td colspan=2>&nbsp;</td></tr>
- * 			<tr><td align="center" colspan=2><i>This is the ViSTA release 1.16.0, codename "CONCORDE".</i></td></tr>
- * 			<tr><td align="center" colspan=2><i>It is dedicated to the Concorde, which was the fastest</i></td></tr>
- * 			<tr><td align="center" colspan=2><i>commercial aircraft during its time and was introduced</i></td></tr>
- * 			<tr><td align="center" colspan=2><i>on January 21, 1976. </i></td></tr>
+ * 			<tr><td align="center" colspan=2><i>This is the ViSTA release 1.16.0, codename "HUBBLE".</i></td></tr>
+ * 			<tr><td align="center" colspan=2><i>It is dedicated to the Hubble Space Telescope, one of the</i></td></tr>
+ * 			<tr><td align="center" colspan=2><i>largest and most versatile space telescopes, observing in the</i></td></tr>
+ * 			<tr><td align="center" colspan=2><i>infrared, visible and ultraviolet spectra.</i></td></tr>
+ * 			<tr><td align="center" colspan=2><i>It entered service on May 20th, 1990.</i></td></tr>
  * 			<tr><td colspan=2>&nbsp;</td></tr>
  * 			<tr>
  * 				<td align="right">full version:</td>
- * 				<td align="left"><b>1.15.0</b></td>
+ * 				<td align="left"><b>1.16.0</b></td>
  * 			</tr>
  * 			<tr>
  * 				<td align="right">release date:</td>
- * 				<td align="left"><b>January 21st, 2016</b></td>
+ * 				<td align="left"><b>May 20th, 2016</b></td>
  * 			</tr>
  * 		</table>
  * 	</div>
@@ -68,10 +69,10 @@
 
 #define VISTA_HEAD
 #define VISTA_RELEASE_NAME "HEAD"
-//#define VISTA_RELEASE_NAME "CONCORDE"
-#define VISTA_VERSION "1.15.0"
+//#define VISTA_RELEASE_NAME "HUBBLE"
+#define VISTA_VERSION "1.16.0"
 #define VISTA_MAJOR    1
-#define VISTA_MINOR    15
+#define VISTA_MINOR    16
 #define VISTA_REVISION 0
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaBase/_SourceFiles.cmake b/VistaCoreLibs/VistaBase/_SourceFiles.cmake
index 1d6bdf268a85296b4fcb1993bc8413fb4f2d6d18..9db3714948017c337b45ad05741e894ca62946cf 100644
--- a/VistaCoreLibs/VistaBase/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaBase/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaCoreLibs/VistaDataFlowNet/CMakeLists.txt b/VistaCoreLibs/VistaDataFlowNet/CMakeLists.txt
index 5c886c873f5b3cced1ce3d206abfce1eac987558..0095767f8596ddb06c7d9a1816ad692e8c2f5947 100644
--- a/VistaCoreLibs/VistaDataFlowNet/CMakeLists.txt
+++ b/VistaCoreLibs/VistaDataFlowNet/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id$
+
 
 vista_adopt_version( VistaDataFlowNet VistaCoreLibs )
 
diff --git a/VistaCoreLibs/VistaDataFlowNet/Vdfn3DNormalizeNode.cpp b/VistaCoreLibs/VistaDataFlowNet/Vdfn3DNormalizeNode.cpp
index 1cee47c913fd5082f59d379247af15acea7a3986..8055c5cbf0833e32cb615b5fe4d46791424b25c9 100644
--- a/VistaCoreLibs/VistaDataFlowNet/Vdfn3DNormalizeNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/Vdfn3DNormalizeNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "Vdfn3DNormalizeNode.h"
 
diff --git a/VistaCoreLibs/VistaDataFlowNet/Vdfn3DNormalizeNode.h b/VistaCoreLibs/VistaDataFlowNet/Vdfn3DNormalizeNode.h
index 8b04990b10282c3fcfbecf6a10bcbdb942a9359e..ba8f0058ecc009ae022ae149b3ae0a2c967490ba 100644
--- a/VistaCoreLibs/VistaDataFlowNet/Vdfn3DNormalizeNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/Vdfn3DNormalizeNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFN3DNORMALIZENODE_H
 #define _VDFN3DNORMALIZENODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnAbsoluteNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnAbsoluteNode.h
index 4c56fbeb1617b1c372ccf474c8cd71fe5f2e28e1..2677b4dc93790ad1e8927f01f09192c3ac111188 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnAbsoluteNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnAbsoluteNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VdfnInvertNode.h 29136 2012-02-08 09:35:49Z dr165799 $
+
 
 #ifndef _VDFNABSOLUTENODE_H
 #define _VDFNABSOLUTENODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnActionNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnActionNode.cpp
index 07e611611201e464cab1ff0d6174c14482b073ec..c771bafb62550c645494f366a18cd0dfc82fa274 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnActionNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnActionNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnActionNode.h"
 
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnActionNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnActionNode.h
index 8a4d22c15813c95b04eaaa2b48324a69c895c13c..bbe4955c323e7da0e28fa5d9ba36604b9285d1dc 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnActionNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnActionNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNACTIONNODE_H
 #define _VDFNACTIONNODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnActionObject.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnActionObject.cpp
index 5bab08c1a06c35f593b8cdd805f972377de2f37d..6876083539a1b4de4843b98bcdbbd779432ac679 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnActionObject.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnActionObject.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnActionObject.h" 
 #include <VistaAspects/VistaPropertyFunctorRegistry.h>
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnActionObject.h b/VistaCoreLibs/VistaDataFlowNet/VdfnActionObject.h
index 0ee521dc3f04026ac1a5b939685a72d2477360f3..3ddf9f99927e68d8573e664213825c102c059611 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnActionObject.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnActionObject.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNACTIONOBJECT_H
 #define _VDFNACTIONOBJECT_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnAggregateNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnAggregateNode.h
index 01716cc38fa6d67a0cd3880bcb58f5367e1445b6..56ec99d8647d543ce5561b8f6129c1401989a030 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnAggregateNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnAggregateNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNAGGREGATENODE_H
 #define _VDFNAGGREGATENODE_H
@@ -35,6 +35,7 @@
 #include "VdfnHistoryPort.h"
 
 #include <VistaDeviceDriversBase/VistaDeviceSensor.h>
+#include <VistaDeviceDriversBase/VistaSensorReadState.h>
 
 
 #include <string>
@@ -134,8 +135,8 @@ protected:
 		for(unsigned int n=0; n < nNewMeasureCount; ++n)
 		{
 			// claim a "past" measure (copy in from most-current to oldest)
-			const VistaSensorMeasure *pMeasure = pData->m_oHistory.GetPast( n, *pData->m_readstate );
-			if (pMeasure) // can be 0 in case no data was delivered, yet, but driver signalled update
+			const VistaSensorMeasure *pMeasure = pData->m_pReadState->GetPastMeasure( n );
+			if( pMeasure ) // can be 0 in case no data was delivered, yet, but driver signalled update
 			{
 				// get value using the transcoder, store in vector
 				if( m_bStoreNewestEntryLast )
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnApplyTransformNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnApplyTransformNode.cpp
index a4dfa8613245bfdcd74f285dea0d201e9f8ab3b9..8f136a2b63c43d4dd17c08e1f3dcb5c8c09f8b8c 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnApplyTransformNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnApplyTransformNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnApplyTransformNode.h"
 
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnApplyTransformNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnApplyTransformNode.h
index b1f6aa8ae99331686f5229515a4e5c9890ce457c..1050f8a283ef513bb653b67c554d1da62a723cff 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnApplyTransformNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnApplyTransformNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNAPPLYTRANSFORMNODE_H
 #define _VDFNAPPLYTRANSFORMNODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnAxisRotateNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnAxisRotateNode.cpp
index 0d50fef527cf02b657fe54c1b39368140345d909..9e4f1c85b03a480ea4075909098c8aaa5c1cdfd5 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnAxisRotateNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnAxisRotateNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnAxisRotateNode.h"
 
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnAxisRotateNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnAxisRotateNode.h
index b8255ecf2480eed831879c5976b7f56dce43ae1b..6dad65f939e34969a1fe5ac3c132ad0e6d8b48bc 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnAxisRotateNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnAxisRotateNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNAXISROTATENODE_H
 #define _VDFNAXISROTATENODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnBinaryOpNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnBinaryOpNode.h
index 60d7b2ca7a3aeb259c29ea7ad6cc06941522b803..7cc6218c0d1b6d762d0eeda748d949c8ab231ccd 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnBinaryOpNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnBinaryOpNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNBINARYOPNODE_H
 #define _VDFNBINARYOPNODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnBinaryOps.h b/VistaCoreLibs/VistaDataFlowNet/VdfnBinaryOps.h
index 64230f76b0215fbd699a28c895276625e5af16db..67894be5f532f3c027288da1e1a8fd2a67c7a6f8 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnBinaryOps.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnBinaryOps.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNBINARYOPS_H
 #define _VDFNBINARYOPS_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnChangeDetectNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnChangeDetectNode.h
index ca0e6872216130eef3ef7eca6c0baaa3023deeb4..fc411742eb59cf1e1c97b42e0091436a3b9492ee 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnChangeDetectNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnChangeDetectNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNCHANGEDETECTNODE_H
 #define _VDFNCHANGEDETECTNODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnCompose3DVectorNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnCompose3DVectorNode.cpp
index 508e85b995bacd91cfd038691a1ebf305d522860..7300f163929a0bb835e988bca61654e01da6a5df 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnCompose3DVectorNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnCompose3DVectorNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnCompose3DVectorNode.h" 
 
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnCompose3DVectorNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnCompose3DVectorNode.h
index d5f89861eca2e9998e495a236b544a0b74611d55..294ddaa26dfefad8d18ce8b1222bd5cd3542317e 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnCompose3DVectorNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnCompose3DVectorNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNCOMPOSE3DVECTORNODE
 #define _VDFNCOMPOSE3DVECTORNODE
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnComposeQuaternionFromDirectionsNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnComposeQuaternionFromDirectionsNode.cpp
index 0b80b7298107c10fe143bf2dcf2072ff02167648..9068c3d988a4efc0f168109f36118369640706cf 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnComposeQuaternionFromDirectionsNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnComposeQuaternionFromDirectionsNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnComposeQuaternionFromDirectionsNode.h" 
 
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnComposeQuaternionFromDirectionsNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnComposeQuaternionFromDirectionsNode.h
index ba4ef2cbcc1848aaa9a7673d1cebacc88ee9d832..d1c926da8eb212b92804708048d96167c61fd2d5 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnComposeQuaternionFromDirectionsNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnComposeQuaternionFromDirectionsNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNCOMPOSEQUATERNIONFROMDIRECTIONSNODE
 #define _VDFNCOMPOSEQUATERNIONFROMDIRECTIONSNODE
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnComposeQuaternionNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnComposeQuaternionNode.cpp
index 99fde9c0361f0d05add88224a6049a81a9d0c205..9ea88e525eeae388a377984f4570dd8be0915b18 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnComposeQuaternionNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnComposeQuaternionNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnComposeQuaternionNode.h" 
 
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnComposeQuaternionNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnComposeQuaternionNode.h
index 7d2687a61692562ef9bf13f9ea0374217d2ee0e7..a3a27c440b05b23943524740782b6fe33b0794d3 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnComposeQuaternionNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnComposeQuaternionNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNCOMPOSEQUATERNIONNODE
 #define _VDFNCOMPOSEQUATERNIONNODE
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnComposeTransformMatrixNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnComposeTransformMatrixNode.cpp
index deace8fe152284c78a2c841cbdeaf305cfa4e46a..9bf31f0a5ef36eb5402b4e903939c1c7cb7ae94b 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnComposeTransformMatrixNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnComposeTransformMatrixNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnComposeTransformMatrixNode.h" 
 #include "VistaAspects/VistaConversion.h"
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnComposeTransformMatrixNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnComposeTransformMatrixNode.h
index 85d380d09e9d598d901ce61715e410f3f5d95b37..4d6308e596ec6291d11feac90c3adb34a1c81afa 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnComposeTransformMatrixNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnComposeTransformMatrixNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNCOMPOSETRANSFORMMATRIXNODE
 #define _VDFNCOMPOSETRANSFORMMATRIXNODE
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnCompositeNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnCompositeNode.cpp
index 49bf281b5dd0387192ef911f31486f12ae522ca7..670b77ad369357119fb165c160ddab121ed5582c 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnCompositeNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnCompositeNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnCompositeNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnCompositeNode.h
index ee3f3bda0033e78f624670b4d090a7e3841edd60..1cd4761b569068edf727257a0679b8b6ded98692 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnCompositeNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnCompositeNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNCOMPOSITENODE_H__
 #define _VDFNCOMPOSITENODE_H__
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnConditionalRouteNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnConditionalRouteNode.cpp
index 8610e8475c69948e56c44aff898c54d6287e4cd4..cb7b3560f07f65d66980cfbfad5a48d6a6c31b85 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnConditionalRouteNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnConditionalRouteNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnConditionalRouteNode.h"
 
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnConditionalRouteNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnConditionalRouteNode.h
index d335b70f6c41760fc5eccf47afd2fd02ec85e2dd..b7273c6b6dccf4e2d9aa099e9b87b79af4b8b263 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnConditionalRouteNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnConditionalRouteNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNCONDITIONALROUTENODE_H__
 #define _VDFNCONDITIONALROUTENODE_H__
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnConfig.h b/VistaCoreLibs/VistaDataFlowNet/VdfnConfig.h
index 54acfc34a81bb1f8cdf743504e6648d2624de3d8..d0a87ab1b1e2abe63fc268604646221bcb66bacf 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnConfig.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnConfig.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNCONFIG_H
 #define _VDFNCONFIG_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnConstantValueNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnConstantValueNode.h
index 3fab2263488c5a7ebfc52a03db4a0e10736f28f9..3a3c8c391e40d6a4de0896dc7587499d1aa1094c 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnConstantValueNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnConstantValueNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNCONSTANTVALUENODE_H
 #define _VDFNCONSTANTVALUENODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnCounterNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnCounterNode.h
index ae5cfcb9b57275183116a280967ebf81bb9c19d5..133c7f94259ce1df322693e4c78af04b4028265d 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnCounterNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnCounterNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNCOUNTERNODE_H
 #define _VDFNCOUNTERNODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnDecompose3DVectorNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnDecompose3DVectorNode.cpp
index 9a95322b2f4185f583adee39a215216d6f08ef9d..0260c7669bf3b6eb0486ca0bc4323e4e87d0d652 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnDecompose3DVectorNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnDecompose3DVectorNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnDecompose3DVectorNode.h" 
 
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnDecompose3DVectorNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnDecompose3DVectorNode.h
index c6318d2dbfc445a23942a2489932e7bf693999da..787c65537fe06d075db2112e289c1cb86b44f4c5 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnDecompose3DVectorNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnDecompose3DVectorNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNDECOMPOSE3DVECTORNODE_H
 #define _VDFNDECOMPOSE3DVECTORNODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnDecomposeQuaternionNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnDecomposeQuaternionNode.cpp
index 961db237789105629dfdc325710f584c6024a964..2c4534a5abc641914b1a04b40cc1c3f04ed067cf 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnDecomposeQuaternionNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnDecomposeQuaternionNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnDecomposeQuaternionNode.h" 
 
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnDecomposeQuaternionNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnDecomposeQuaternionNode.h
index 3ec46736d771fa183bef651955d371575bb3f44c..0454055cbfe7a612e43b13cfa56b49b0a968e494 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnDecomposeQuaternionNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnDecomposeQuaternionNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNDECOMPOSEQUATERNIONNODE_H
 #define _VDFNDECOMPOSEQUATERNIONNODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnDecomposeTransformMatrixNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnDecomposeTransformMatrixNode.cpp
index cc43f7f042484d701190e3fe8c5a146d95e95fb1..f31017da0cf2d7ba9b2b64c13fa06175324ad033 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnDecomposeTransformMatrixNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnDecomposeTransformMatrixNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnDecomposeTransformMatrixNode.h" 
 #include "VistaAspects/VistaConversion.h"
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnDecomposeTransformMatrixNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnDecomposeTransformMatrixNode.h
index c75b7aef4ac779edd7c964d017db8c4a9a0c3d34..94e4fa60a600b6cd7ea7d031d4097afbbb7001ef 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnDecomposeTransformMatrixNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnDecomposeTransformMatrixNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNDECOMPOSETRANSFORMMATRIXNODE_H
 #define _VDFNDECOMPOSETRANSFORMMATRIXNODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnDelayNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnDelayNode.h
index a4e9006869677982b0566bbe025b94d99c1965e5..5386a104bdba084bf2cff498c2587379da64261e 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnDelayNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnDelayNode.h
@@ -21,7 +21,7 @@
 /* Ingo Assenmacher (2008), Patric Schmitz (2010)                             */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNDELAYNODE_H
 #define _VDFNDELAYNODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnDemultiplexNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnDemultiplexNode.h
index 573095844386974acea621d4dc45eaa7b262d43e..37366a0428238e04ce9ba682cbc835cf53cabcbd 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnDemultiplexNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnDemultiplexNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNDEMULTIPLEXNODE_H__
 #define _VDFNDEMULTIPLEXNODE_H__
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnDifferenceNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnDifferenceNode.h
index 039a45072a91fa08580a16dbf20a966bddb8fea0..a57bf4a19cca7e586027d35c0b219a8af970e957 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnDifferenceNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnDifferenceNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VdfnTypeConvertNode.h 34351 2013-03-26 11:50:28Z dr165799 $
+
 
 #ifndef _VDFNDIFFERENCENODE_H
 #define _VDFNDIFFERENCENODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnDriverSensorNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnDriverSensorNode.cpp
index f1d04efe4abd1560ddc059974a6a545b0115e9c3..94135d7cb589a06292fe74645a69c5eb8bbcc811 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnDriverSensorNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnDriverSensorNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnDriverSensorNode.h"
 
@@ -47,16 +47,16 @@ VdfnDriverSensorNode::VdfnDriverSensorNode( VistaDeviceSensor *pSensor, VistaSen
 : IVdfnNode(),
   m_pSensor(pSensor),
   m_pHistoryPort( new HistoryPort ),
-  m_nOldUpdateIndex(0),
+  m_nOldMeasureCount(0),
   m_nLastUpdateIdx(0),
   m_nOldScore(0),
   m_nLastUpdateTsFromReadState(0)
 {
 	RegisterOutPort( "history",  m_pHistoryPort );
-	m_pHistoryPort->SetValue( new VdfnHistoryPortData( m_pSensor->GetMeasures(),
+	// set history, but not using SetValue to prevent incrementing port's update count
+	m_pHistoryPort->GetValueRef() = new VdfnHistoryPortData( m_pSensor->GetMeasures(),
 								  m_pSensor->GetMeasureTranscode(),
-								  m_pSensor, readstate ),
-								  0 );
+								  m_pSensor, readstate );
 }
 
 VdfnDriverSensorNode::~VdfnDriverSensorNode()
@@ -72,20 +72,20 @@ bool VdfnDriverSensorNode::GetIsValid() const
 bool VdfnDriverSensorNode::DoEvalNode()
 {
 	// cache some values
-	VdfnHistoryPortData *pd       = m_pHistoryPort->GetValue();
+	VdfnHistoryPortData *pHistoryData = m_pHistoryPort->GetValue();
 	VistaDeviceSensor   *pSensor  = m_pHistoryPort->GetValue()->m_pSensor;
 	IVistaDeviceDriver  *pDriver  = pSensor->GetParent();
 
 	// get last update index from read state
-	unsigned int nMIndex = pd->m_readstate->GetMeasureCount();
+	unsigned int nMeasureCount = pHistoryData->m_pReadState->GetMeasureCount();
 	// experimental feature
-	m_pHistoryPort->GetValue()->m_nRealNewMeasures = nMIndex - m_nOldUpdateIndex;
+	m_pHistoryPort->GetValue()->m_nRealNewMeasures = nMeasureCount - m_nOldMeasureCount;
 
 	// determine difference to last update
 	// |now - last| but no more than our desired read size (skimming, i.e. only what we are allowed to read as client)
 	// note that m_nOldUpdateIndex is changed as a sideffect here to be of use in the next update
-	m_pHistoryPort->GetValue()->m_nNewMeasures     = pd->m_readstate->GetNewAvailableMeasureCount( m_nOldUpdateIndex );
-	m_pHistoryPort->GetValue()->m_nUpdateIndex     = nMIndex; // yes, we alias the readstate's field here (simplification during serialisation).
+	m_pHistoryPort->GetValue()->m_nNewMeasures      = pHistoryData->m_pReadState->GetNewAvailableMeasureCount( m_nOldMeasureCount );
+	m_pHistoryPort->GetValue()->m_nMeasureCount     = nMeasureCount; // yes, we alias the readstate's field here (simplification during serialisation).
 
 	// this is a race: but the value is for statistics and highly fluctuating
 	m_pHistoryPort->GetValue()->m_nAvgDriverUpdTime = pDriver->GetAverageUpdateTime();
@@ -98,7 +98,7 @@ bool VdfnDriverSensorNode::DoEvalNode()
 	m_pHistoryPort->IncUpdateCounter();
 
 	// note the current index
-	m_nOldUpdateIndex = nMIndex;
+	m_nOldMeasureCount = nMeasureCount;
 	return true;
 }
 
@@ -106,10 +106,10 @@ unsigned int VdfnDriverSensorNode::CalcUpdateNeededScore() const
 {
 	// indicate change for this sensor by change of timestamp for 
 	// our observed readstate (polling)
-	if( m_pHistoryPort->GetValue()->m_readstate->GetUpdateTimeStamp() != m_nLastUpdateTsFromReadState )
+	if( m_pHistoryPort->GetValue()->m_pReadState->GetUpdateTimeStamp() != m_nLastUpdateTsFromReadState )
 	{
 		// mark last update ts
-		m_nLastUpdateTsFromReadState = m_pHistoryPort->GetValue()->m_readstate->GetUpdateTimeStamp();
+		m_nLastUpdateTsFromReadState = m_pHistoryPort->GetValue()->m_pReadState->GetUpdateTimeStamp();
 		return ++m_nLastUpdateIdx; // new state -> update
 	}
 	else
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnDriverSensorNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnDriverSensorNode.h
index 878458b7ead7155bc6809e7ee00d278afad424ae..c0a17621e8931b5583a47c06de0356d276249d3a 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnDriverSensorNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnDriverSensorNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNDRIVERSENSORNODE_H
 #define _VDFNDRIVERSENSORNODE_H
@@ -108,7 +108,7 @@ private:
 
 	mutable VistaType::uint32	m_nLastUpdateIdx,
 								m_nOldScore; // is updated in CalcUpdateNeededScore()
-	unsigned int    m_nOldUpdateIndex;
+	unsigned int    m_nOldMeasureCount;
 	mutable VistaType::microtime m_nLastUpdateTsFromReadState;
 };
 
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnDumpHistoryNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnDumpHistoryNode.cpp
index 63ce82a31b0fdb143ac5031c43121feb7ff6c1ce..1dc470972e4ef4516c59b70e882e536f40fc6710 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnDumpHistoryNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnDumpHistoryNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnDumpHistoryNode.h"
 #include <VistaBase/VistaExceptionBase.h>
@@ -66,7 +66,7 @@ bool VdfnDumpHistoryNode::DoEvalNode()
 
 	m_ofstream << "new measures\t: " << pData->m_nNewMeasures << std::endl
 			   << "unskimmed\t: " << pData->m_nRealNewMeasures << std::endl
-			   << "upd index\t: " << pData->m_nUpdateIndex << std::endl
+			   << "measure count\t: " << pData->m_nMeasureCount << std::endl
 			   //<< "upd ts\t: " << pHistory.m_nUpdateTs << std::endl
 //			   << "snap wh\t\t: " << pHistory.m_nSnapshotWriteHead << std::endl
 			   << "history size\t: " << pHistory.m_rbHistory.GetBufferSize() << std::endl
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnDumpHistoryNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnDumpHistoryNode.h
index c9c815deaac1988a28f0e14a453780f2e75f68ca..a4ed9c35b8b258770ea82d36cba544592feb8b37 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnDumpHistoryNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnDumpHistoryNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNDUMPHISTORYNODE_H
 #define _VDFNDUMPHISTORYNODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnForceFeedbackNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnForceFeedbackNode.cpp
index 869ca96979ad5c93ccd069fb202c57da2061aa04..04b52d012a6d635d640ea019c7b77510178b4690 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnForceFeedbackNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnForceFeedbackNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnForceFeedbackNode.h"
 
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnForceFeedbackNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnForceFeedbackNode.h
index 7ff3e87903b92c124fd6877d09504919948db8e5..c51cce4882500167e10f903a62391ce9103ae1a6 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnForceFeedbackNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnForceFeedbackNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNFORCEFEEDBACKNODE_H
 #define _VDFNFORCEFEEDBACKNODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnGetElementNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnGetElementNode.h
index da03c303ad5b01d7bc9b79a6baf803e92f26a096..3f96dd84528d5e27d6c64fe0c82a0261e6ddc89c 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnGetElementNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnGetElementNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNGETELEMENTNODE_H
 #define _VDFNGETELEMENTNODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnGetTransformNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnGetTransformNode.cpp
index 96dac2a4642b336fc7a9f32a3fdbb9406d919c3e..90e01b379decbec4e0242ea5259b70d99f76c1b0 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnGetTransformNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnGetTransformNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnGetTransformNode.h" 
 #include <VistaAspects/VistaTransformable.h>
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnGetTransformNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnGetTransformNode.h
index e7ccfe46b26194ff6c5de4909f4cae070ee8a4eb..46edd6788711a6ca4e98a3dd8ea592e1bd077ced 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnGetTransformNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnGetTransformNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNGETTRANSFORMNODE_H
 #define _VDFNGETTRANSFORMNODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnGraph.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnGraph.cpp
index cdee41d96d0a8e1fc7eae1d00139f7215ee1e97b..e23309add93f4fdeb3d268e0f53e9bf17d7b5516 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnGraph.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnGraph.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnGraph.h"
 #include "VdfnNode.h"
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnGraph.h b/VistaCoreLibs/VistaDataFlowNet/VdfnGraph.h
index 3d9860cd303852b2023b0075e3509182cb52bf6c..a37a90c4124c44784f68c471ed47d88cb687a6a6 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnGraph.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnGraph.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNGRAPH_H
 #define _VDFNGRAPH_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnHistoryPort.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnHistoryPort.cpp
index 4bf80d1dcd82d31bb8de06a08b418b61697626b5..2072ae7724660e00373e319727d9c577557a07ca 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnHistoryPort.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnHistoryPort.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnHistoryPort.h"
 #include "VistaDeviceDriversBase/VistaSensorReadState.h"
@@ -43,22 +43,22 @@ unsigned int VdfnHistoryPortData::MAGIC_COOKIE_VALUE = 0xCAFECAFE;
 VdfnHistoryPortData::VdfnHistoryPortData( const VistaMeasureHistory &oHistory,
 									IVistaMeasureTranscode *pTranscode,
 									VistaDeviceSensor *pSensor,
-									VistaSensorReadState *readstate)
+									VistaSensorReadState *pReadState)
 		: m_oHistory(oHistory),
 		  m_nNewMeasures(0),
 		  m_nRealNewMeasures(0),
-		  m_nUpdateIndex(0),
+		  m_nMeasureCount(0),
 		  m_nAvgDriverUpdTime(0),
 		  m_nAvgUpdFreq(0),
 		  m_pTranscode(pTranscode),
 		  m_pSensor(pSensor),
-		  m_readstate( readstate ),
+		  m_pReadState( pReadState ),
 		  MAGIC_COOKIE( MAGIC_COOKIE_VALUE )
 {
-	// pre-condition: m_readstate is not 0
-	assert( m_readstate );
-	m_readstate->SetUseIncrementalSerialization( IS_INCREMENTAL == 1 ? true : false );
-	m_readstate->SetUseOwnHistoryForDeSerialization(false);
+	// pre-condition: m_pReadState is not 0
+	assert( m_pReadState );
+	m_pReadState->SetUseIncrementalSerialization( IS_INCREMENTAL == 1 ? true : false );
+	m_pReadState->SetUseOwnHistoryForDeSerialization(false);
 }
 
 /*============================================================================*/
@@ -84,14 +84,14 @@ IVistaDeSerializer &operator>>(IVistaDeSerializer &oDeSer,
 
 	oDeSer >> (*pPort).m_nNewMeasures
 		   >> (*pPort).m_nRealNewMeasures
-		   >> (*pPort).m_nUpdateIndex
+		   >> (*pPort).m_nMeasureCount
 		   >> (*pPort).m_nAvgDriverUpdTime
 		   >> (*pPort).m_nAvgUpdFreq
 		   >> is_incremental;
 
 	assert( is_incremental == IS_INCREMENTAL ); // error trapping
 
-	(*pPort).m_readstate->DeSerialize( oDeSer );
+	(*pPort).m_pReadState->DeSerialize( oDeSer );
 
 	return oDeSer;
 }
@@ -109,13 +109,13 @@ IVistaSerializer   &operator<<(IVistaSerializer &oSer,
 
 	oSer << (*pPort).m_nNewMeasures
 		 << (*pPort).m_nRealNewMeasures
-		 << (*pPort).m_nUpdateIndex
+		 << (*pPort).m_nMeasureCount
 		 << (*pPort).m_nAvgDriverUpdTime
 		 << (*pPort).m_nAvgUpdFreq;
 
 	oSer << IS_INCREMENTAL;
 
-	(*pPort).m_readstate->Serialize( oSer );
+	(*pPort).m_pReadState->Serialize( oSer );
 
 	return oSer;
 }
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnHistoryPort.h b/VistaCoreLibs/VistaDataFlowNet/VdfnHistoryPort.h
index 5cc5c2fe0b61c3d6243976621af5566da11e20a4..ba701258c92acb216edce12bc7fd66bf77fa7e21 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnHistoryPort.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnHistoryPort.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNHISTORYPORT_H
 #define _VDFNHISTORYPORT_H
@@ -48,6 +48,7 @@
 /*============================================================================*/
 
 class VistaMeasureHistory;
+class VistaSensorReadState;
 
 /*============================================================================*/
 /* CLASS DEFINITIONS                                                          */
@@ -72,13 +73,13 @@ public:
 	VdfnHistoryPortData( const VistaMeasureHistory &oHistory,
 			  IVistaMeasureTranscode *pTranscode,
 			  VistaDeviceSensor *pSensor,
-			  VistaSensorReadState *readstate );
+			  VistaSensorReadState *pReadstate );
 
 	const VistaMeasureHistory  &m_oHistory;   /**< the history to look at */
 
 	unsigned int				m_nNewMeasures; /**< experimental: the number of new measures since last evaluate */
 	unsigned int				m_nRealNewMeasures; /**< experimental: the actual (unskimmed) number of new measures */
-	unsigned int                m_nUpdateIndex; /**< the current update index. reflects VistaSensor::GetDataCount() */
+	unsigned int                m_nMeasureCount;
 	VistaType::microtime        m_nAvgDriverUpdTime;
 	double                      m_nAvgUpdFreq;
 
@@ -91,7 +92,7 @@ public:
 												   this is a system specific attribute. user code
 												   is discouraged to use this attribute, as it might
 												   not be consistent on all nodes in a cluster. */
-	VistaSensorReadState       *m_readstate;
+	VistaSensorReadState       *m_pReadState;
 
 	unsigned int                MAGIC_COOKIE;
 	static unsigned int         MAGIC_COOKIE_VALUE;
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnHistoryProjectNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnHistoryProjectNode.cpp
index fed7ba5b80ea7fabf2bcb4b4d10af4239cb97f41..fac85d831a5ee03390752fd63c8412bbe9f00e01 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnHistoryProjectNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnHistoryProjectNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VdfnHistoryProjectNode.cpp 55095 2016-03-12 18:41:23Z ingoassenmacher $
+
 
 #include "VdfnHistoryProjectNode.h"
 #include "VdfnUtil.h"
@@ -112,12 +112,14 @@ bool VdfnHistoryProjectNode::DoEvalNode()
 
 			m_pIterateState->SetValue( m_nUnprocessedMeasures, GetUpdateTimeStamp() );
 
-			if( --m_nUnprocessedMeasures != ~0u )
-				pMeasure = pHistoryData->m_oHistory.GetPast(m_nUnprocessedMeasures, *pHistoryData->m_readstate);
+			if( m_nUnprocessedMeasures != 0 )
+			{
+				--m_nUnprocessedMeasures;
+				pMeasure = pHistoryData->m_pReadState->GetPastMeasure( m_nUnprocessedMeasures );
+			}
 			else
 			{
 				pMeasure = NULL;
-				m_nUnprocessedMeasures = 0;
 			}
 			break;
 		}
@@ -130,9 +132,20 @@ bool VdfnHistoryProjectNode::DoEvalNode()
 		case MD_INDEXED:
 		{
 			unsigned int nPast = m_pBackwardIndex ? m_pBackwardIndex->GetValue() : 0;
-			pMeasure = pHistoryData->m_oHistory.GetPast(nPast, *pHistoryData->m_readstate);
-			if (pMeasure && ((pMeasure->m_nMeasureIdx == 0) || (pMeasure->m_nDeliverTs > (*pHistoryData->m_readstate).GetUpdateTimeStamp())))
+			pMeasure = pHistoryData->m_pReadState->GetPastMeasure( nPast );
+			// check that the measure is valid, and that is not a "turnaround (access further back than history allows)"
+			// which is indicated by a wrong measure index difference
+			if( pMeasure && pMeasure->GetIsValid() )
+			{
+				// measure index + 1 = measure count
+				unsigned int nIndexDelta = pHistoryData->m_nMeasureCount - ( pMeasure->m_nMeasureIdx + 1 );
+				if( nIndexDelta != nPast )
+				{
 					pMeasure = NULL; // invalid read
+					vstr::warnp() << "[HistoryProjectNode] attempt to retrieve measure with backward index ["
+								<< nPast << "] exceeded history, please ensure history is large enough" << std::endl;
+				}
+			}
 			break;
 		}
 		default:
@@ -140,13 +153,13 @@ bool VdfnHistoryProjectNode::DoEvalNode()
 		{
 			//Lazy Sampling: take current value
 			//pMeasure = m_pHistory->GetValue()->m_oHistory.GetCurrentRead( *m_pHistory->GetValue()->m_readstate );
-			pMeasure = pHistoryData->m_readstate->GetCurrentMeasure();
+			pMeasure = pHistoryData->m_pReadState->GetCurrentMeasure();
 			break;
 		}
 	}
 
-	if( pMeasure == NULL )
-		return true; // there just are no samples in the history yet / can this happen?
+	if( pMeasure == NULL || pMeasure->GetIsValid() == false )
+		return true; // there just are no samples in the history yet
 
 	m_pOutputIndex->SetValue( pMeasure->m_nMeasureIdx, GetUpdateTimeStamp() );
 
@@ -300,6 +313,42 @@ void VdfnHistoryProjectNode::UpdateOutPortMap()
 
 }
 
+unsigned int VdfnHistoryProjectNode::CalcUpdateNeededScore() const
+{
+
+	int nValue = 0;
+
+	if( m_pSamplingMode )
+		nValue += m_pSamplingMode->GetUpdateCounter();
+	
+
+	eMode nMode = ( m_pSamplingMode ? eMode(m_pSamplingMode->GetValue()) : m_eInitialMode );
+	switch( nMode )
+	{
+		case MD_HOT:
+		{
+			VdfnHistoryPortData* pHistoryData = m_pHistory->GetValue();
+			nValue += pHistoryData->m_oHistory.GetMeasureCount();
+			break;
+		} 
+		case MD_INDEXED:
+		{
+			if( m_pBackwardIndex )
+				nValue += m_pBackwardIndex->GetUpdateCounter();
+			nValue += m_pHistory->GetUpdateCounter();
+			break;
+		}
+		case MD_ITERATE:
+		case MD_LAZY:
+		default:
+		{
+			nValue += m_pHistory->GetUpdateCounter();
+			break;
+		}
+	}
+	return nValue;
+}
+
 bool VdfnHistoryProjectNode::GetNeedsReEvaluation() const
 {
 	// For the ReEvalNode: if  there are still some unprocessed measures, we
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnHistoryProjectNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnHistoryProjectNode.h
index 15d107bf7e498e7fccfba0b0b23c69995f2e7a0d..86379a0ef8e5bcc6265a75c54077ff77fa55fdc0 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnHistoryProjectNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnHistoryProjectNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNHISTORYPROJECTNODE_H
 #define _VDFNHISTORYPROJECTNODE_H
@@ -115,11 +115,14 @@ public:
 
 protected:
 	virtual bool DoEvalNode();
+	virtual unsigned int CalcUpdateNeededScore() const override;
 private:
 	/**
 	 * pre-condition: history port set
 	 */
 	void UpdateOutPortMap();
+
+
 	struct _sSetHlp
 	{
 		_sSetHlp()
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnInvertNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnInvertNode.cpp
index 0bf814ba26db27ee314c09001f98ff48ee7ae45b..fa6a04ff2bec2bd701c47cd304a73d2b5fa6fc28 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnInvertNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnInvertNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnInvertNode.h"
 #include <VistaBase/VistaVectorMath.h>
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnInvertNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnInvertNode.h
index a608355a37986689dfe56abb690ac1a31d0f7e6b..847b5b8a9015319f5083b4be3bedfe19116bc95f 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnInvertNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnInvertNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNINVERTNODE_H
 #define _VDFNINVERTNODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnLatestUpdateNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnLatestUpdateNode.h
index 147a5f084dc032809a616e56ac9d15d6ab91671e..8f849920da38f84f4f6c0f070bbc24fe3cc1564a 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnLatestUpdateNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnLatestUpdateNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNLATESTUPDATENODE_H
 #define _VDFNLATESTUPDATENODE_H
@@ -101,11 +101,10 @@ protected:
 	bool DoEvalNode()
 	{
 		double latestStamp = -1;
-		double d;
 		IVdfnPort* latestPort = NULL;
 		for( PortMap::const_iterator it = m_mpInPorts.begin(); it != m_mpInPorts.end(); ++it )
 		{
-			d = it->second->GetUpdateTimeStamp();
+			double d = it->second->GetUpdateTimeStamp();
 			if(d > latestStamp)
 			{
 				latestStamp = d;
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnLoggerNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnLoggerNode.cpp
index 2a4745f81aea9a09de78f197bc4fd579c8af2f6b..8eaede7ede3c2d0d6b1d02a011fb3e7060a83f93 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnLoggerNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnLoggerNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnLoggerNode.h"
 #include "VdfnUtil.h"
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnLoggerNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnLoggerNode.h
index 5a2ed56a74b4d6728170cb6e998e517e031c5029..3e00b4355c12eac32a1c2725a66f2dfc516eebb5 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnLoggerNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnLoggerNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNLOGGERNODE_H
 #define _VDFNLOGGERNODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnModuloCounterNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnModuloCounterNode.h
index 6187cb8c452afd3f5cdc6d96316646288064e13b..8c1b13f2923710a1419a63b6aea0bcb0cb14d4e4 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnModuloCounterNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnModuloCounterNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNMODULOCOUNTERNODE_H
 #define _VDFNMODULOCOUNTERNODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnMultiplexNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnMultiplexNode.h
index e79412b9d8737723df06ea748c2587850d5d6071..a5fe4eb02d4c9c297d9bff0589b7163f1202bb38 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnMultiplexNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnMultiplexNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNMULTIPLEXNODE_H__
 #define _VDFNMULTIPLEXNODE_H__
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnNegateNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnNegateNode.h
index 8133cf277bd3ee0f6b669aad825abcf5759cae29..a740997c6a4ac1cd5967c14b96e950fae6882eaa 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnNegateNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnNegateNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNNEGATENODE_H
 #define _VDFNNEGATENODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnNode.cpp
index 214879076293727fd405b58c73baa2efe55854b3..55775f44be2b52d54459cd5a1286e05e7dc52925 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnNode.h"
 
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnNode.h
index b492a23bbf37881e91e117261b13180622442f25..028acc6bb4778ed4eb2dda8c1fdba8b521b89dda 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNNODE_H
 #define _VDFNNODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnNodeCreators.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnNodeCreators.cpp
index d752ac6495e03d17c6ead2c940e648779bb97d2d..27df1eabc0a5aa90e67963e592a03516624eeac3 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnNodeCreators.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnNodeCreators.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnNodeCreators.h"
 #include "VdfnPortFactory.h"
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnNodeCreators.h b/VistaCoreLibs/VistaDataFlowNet/VdfnNodeCreators.h
index 8846b1301a5fb4648a37f8cb036c1a8019d7474e..bd263552930bc2ff74123dfaae36ab9394f79efc 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnNodeCreators.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnNodeCreators.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNNODECREATORS_H
 #define _VDFNNODECREATORS_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnNodeFactory.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnNodeFactory.cpp
index 3f4bc621faff681c38831c7d18a18ecd776f8148..cae44d850582f75148f1081b5844b1aa2241bf20 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnNodeFactory.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnNodeFactory.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnNodeFactory.h"
 
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnNodeFactory.h b/VistaCoreLibs/VistaDataFlowNet/VdfnNodeFactory.h
index a0787e8fd8e9b92eb39d6d78b474ffd94ba86f67..4e47cc3850cbb4916569c84ca2108fc68de81fbf 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnNodeFactory.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnNodeFactory.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNNODEFACTORY_H
 #define _VDFNNODEFACTORY_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnObjectRegistry.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnObjectRegistry.cpp
index 21517c80bf47a44ab54e2b0eefe11fe43a4ac1c8..e928bb7163ae0dda008a8d08547afdf0d36981e3 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnObjectRegistry.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnObjectRegistry.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnObjectRegistry.h" 
 #include <VistaAspects/VistaNameable.h>
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnObjectRegistry.h b/VistaCoreLibs/VistaDataFlowNet/VdfnObjectRegistry.h
index c3e0a702ab1b190da3b7868780616f2140b42364..408acc98ab51264836e7f5823c8bb9c1c8e82461 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnObjectRegistry.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnObjectRegistry.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNOBJECTREGISTRY_H
 #define _VDFNOBJECTREGISTRY_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnOutstreamNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnOutstreamNode.cpp
index 0e30e474385557d4607fd21bda99412a3e702fef..1d61e490220ac5f3a76c13f93cf8123a86aca90e 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnOutstreamNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnOutstreamNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VdfnApplyTransformNode.cpp 30800 2012-06-26 07:22:40Z dr165799 $
+
 
 #include "VdfnOutstreamNode.h"
 
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnOutstreamNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnOutstreamNode.h
index 5476b2829315f8002c9e13aa215a9422eddd9054..497b1362d2b9d6ac14dea19d21650ff4bd3591e0 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnOutstreamNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnOutstreamNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VdfnApplyTransformNode.h 29589 2012-03-16 15:52:51Z dr165799 $
+
 
 #ifndef _VDFNOUTSTREAMNODE_H
 #define _VDFNOUTSTREAMNODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnPersistence.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnPersistence.cpp
index 0f7b0bc7775ecac04953299a12b11ca1d865b96c..7ec5698a20dbb89bc9f4a51a9b6295ac30c3cd8b 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnPersistence.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnPersistence.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnPersistence.h"
 
@@ -778,12 +778,12 @@ VdfnGraph *VdfnPersistence::LoadGraph( const std::string &strGraphXmlFile,
 										 const std::string &strParameterFile)
 {
 	VdfnGraph *pGraph = NULL;
-	bool bValid = false;
-
 	TiXmlDocument doc( strGraphXmlFile.c_str() );
 	bool loadOkay = doc.LoadFile();
 	if(loadOkay)
 	{
+		bool bValid = false;
+
 		TiXmlHandle docHandle( &doc );
 		TiXmlHandle module = docHandle.FirstChild("module");
 		TiXmlHandle nodes = module.FirstChild( "nodespace" );
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnPersistence.h b/VistaCoreLibs/VistaDataFlowNet/VdfnPersistence.h
index 053504aa1cc6fef7c323dc3c17083bc2ef5303dd..9af784236a9cb19e9412ade75f9953b90650b974 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnPersistence.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnPersistence.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNPERSISTENCE_H
 #define _VDFNPERSISTENCE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnPort.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnPort.cpp
index 7023f315feea7b94dbbbf11a8741dca631d9e377..3f2f3fa1a5b4d070e83829adb38f65f6a2616d78 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnPort.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnPort.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnPort.h" 
 
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnPort.h b/VistaCoreLibs/VistaDataFlowNet/VdfnPort.h
index 3a0d4f052831ed7afeb4c66124450ac2c0064bf1..2558c0cbe02c51b87cc4ef7f520b8385d0271a70 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnPort.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnPort.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNPORT_H
 #define _VDFNPORT_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnPortFactory.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnPortFactory.cpp
index 1eef3349145b2a6fbbdd4e9aa4acf1e08ac7d927..7a249bd9a0438faaa5d3de648628fb2376274b48 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnPortFactory.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnPortFactory.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnPortFactory.h" 
 #include <VistaAspects/VistaPropertyFunctor.h>
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnPortFactory.h b/VistaCoreLibs/VistaDataFlowNet/VdfnPortFactory.h
index dfd05ce93da6e92d9567fa3f380cb312faa41ebd..e1170e3a3753a9d240576ca473640500897b1e17 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnPortFactory.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnPortFactory.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNPORTFACTORY_H
 #define _VDFNPORTFACTORY_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnProjectVectorNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnProjectVectorNode.cpp
index 651ffd5748b025d58789bf3c10b41e3bf429fc9f..18fdebe7ac431a257690dcb2095808be6f6c6597 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnProjectVectorNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnProjectVectorNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnProjectVectorNode.h" 
 #include <VistaAspects/VistaAspectsUtils.h>
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnProjectVectorNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnProjectVectorNode.h
index 26b92f29a5617036b67f45fd2c2cbfd5b56b21a8..a3957b981bef1efef1863d10446dd0040c18837c 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnProjectVectorNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnProjectVectorNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNPROJECTVECTORNODE_H
 #define _VDFNPROJECTVECTORNODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnRangeCheckNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnRangeCheckNode.h
index c672ecd13ddc22df75e8ea5134b910459964ab4d..668d9baaa522c9323625121152ed247c01e4f8f2 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnRangeCheckNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnRangeCheckNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNRANGECHECKNODE_H
 #define _VDFNRANGECHECKNODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnReEvalNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnReEvalNode.cpp
index 48794a90d9e61587050d546cc31ebfb8dfa0421d..02d0ae3cfc14f6a527b603f587868103b04d3c73 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnReEvalNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnReEvalNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnReEvalNode.h" 
 
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnReEvalNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnReEvalNode.h
index abd87cec4fe56cb82a78cd53dba6194b41293bfc..1d0a99396e25b19540ea7a9400f45f8c60c37e85 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnReEvalNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnReEvalNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNREEVALNODE_H
 #define _VDFNREEVALNODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnReadWorkspaceNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnReadWorkspaceNode.cpp
index df7aef00f4073b2dea8503d0dca6a4f33a4b2033..e2195c72107619be7379646e4f4fd808d89718ac 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnReadWorkspaceNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnReadWorkspaceNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnReadWorkspaceNode.h"
 
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnReadWorkspaceNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnReadWorkspaceNode.h
index f28ec65c76023e12134bc9176ca77a4b2269cef2..69fd3859dc0235db9040da42c648781ece39c772 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnReadWorkspaceNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnReadWorkspaceNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNREADWORKSPACENODE_H
 #define _VDFNREADWORKSPACENODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnSamplerNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnSamplerNode.cpp
index 76d3402817a3917e573c648d91a7067815aa5436..bd026a9b19649b761aaaa57cec73b4be0659f5b9 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnSamplerNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnSamplerNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnSamplerNode.h"
 
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnSamplerNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnSamplerNode.h
index 56b6ec7a0bdb3269884e2b8ed2446243180a54a4..aceae8072fb63698c35dacb1823f2b64dabc7a2a 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnSamplerNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnSamplerNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNSAMPLERNODE_H
 #define _VDFNSAMPLERNODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnSerializer.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnSerializer.cpp
index 95c09a4624251a5fe5a86359b6a54332dfa1c86b..fbbb5523dc90e1227b2432b7067fd3063046a8e5 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnSerializer.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnSerializer.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnSerializer.h" 
 
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnSerializer.h b/VistaCoreLibs/VistaDataFlowNet/VdfnSerializer.h
index c110c2158c14dc6cc39ab59aa945db32a8bf9154..3d935f1b3eae4145a2d47afef3fcf5a45e474adb 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnSerializer.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnSerializer.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNSERIALIZER_H
 #define _VDFNSERIALIZER_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnSetTransformNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnSetTransformNode.cpp
index 63275d0a675a2cbd0a4239271e733ecf4270a2ee..a91c3cd1b8305a6760509e1e2b16f45a3fdbf213 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnSetTransformNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnSetTransformNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnSetTransformNode.h"
 
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnSetTransformNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnSetTransformNode.h
index ca9132043623914f79a53908f8d52a4b90da4ab5..46e88e37cfd23c963eae954abbaaccc0184a0a5f 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnSetTransformNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnSetTransformNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNSETTRANSFORMNODE_H
 #define _VDFSETTRANSFORMNODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnShallowNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnShallowNode.cpp
index a43d8dfdda128b79366914c93e9cafbc367d93fc..50013f104221509970665f690f903ce087e53c95 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnShallowNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnShallowNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnShallowNode.h"
 #include "VdfnPort.h"
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnShallowNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnShallowNode.h
index 0ed1c9ab229c0b45ad2be41ed80fb9241b0b9efa..211e485b5e99f4396b7f48cb9189dc53a794ae61 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnShallowNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnShallowNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNSHALLOWNODE_H
 #define _VDFNSHALLOWNODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnThresholdNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnThresholdNode.h
index 681a18155e074831e15ca0e9f21556c634494970..436f04a0e905750c91933313a70a67548220c3ab 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnThresholdNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnThresholdNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNTHRESHOLDNODE
 #define _VDFNTHRESHOLDNODE
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnTimerNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnTimerNode.cpp
index 2323514aafd5ea0e56f6ffcaf5bfd7cfc476f3b2..b8657d2b2d2f077e8ed22790e5da77b6247be889 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnTimerNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnTimerNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnTimerNode.h" 
 #include "VdfnUtil.h"
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnTimerNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnTimerNode.h
index 51683502b7c5fc1a020754527da1963c20d9df05..dfcdd3003664352efd725ba228c3f83ef0bfc5e2 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnTimerNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnTimerNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNTIMERNODE_H
 #define _VDFNTIMERNODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnToggleNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnToggleNode.cpp
index e8ac20ac6de424e2f0920a8c8a059c5a22953296..3422277b7bdbe97c0fcd6fd8471166f931593eec 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnToggleNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnToggleNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnToggleNode.h"
 #include "VdfnPort.h"
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnToggleNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnToggleNode.h
index 508ca962fcaceea594003871f307fffaba45db7d..46772e33914c3e1c5c88384bab88048bbbadf827 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnToggleNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnToggleNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNTOGGLENODE_H
 #define _VDFNTOGGLENODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnTrackingRedundancyNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnTrackingRedundancyNode.cpp
index 6e8397d274e25ab3b88200c589cc614acb935ba9..9dad6175241c9a9abd21c88b734a455fdbe21c0b 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnTrackingRedundancyNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnTrackingRedundancyNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnTrackingRedundancyNode.h" 
 
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnTrackingRedundancyNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnTrackingRedundancyNode.h
index 356b3b61575c1d7d8ecd7fde92802dca4d3f00b5..368877a61568d10c66f6f035dff589807e3f2b37 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnTrackingRedundancyNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnTrackingRedundancyNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNTRACKINGREDUNDANCYNODE
 #define _VDFNTRACKINGREDUNDANCYNODE
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnTypeConvertNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnTypeConvertNode.h
index 8ad44346917613912fe94f11259e964f86fcbf7b..6dd2e9946444e8783a36df597b206289eda2daeb 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnTypeConvertNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnTypeConvertNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNTYPECONVERTNODE_H
 #define _VDFNTYPECONVERTNODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnTypeConvertNodeCreator.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnTypeConvertNodeCreator.cpp
index 414f21873805233d17a7f7f7a495c3458b2e3bc5..94bfc6dfa7a346cf246625b622a2b62901226f77 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnTypeConvertNodeCreator.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnTypeConvertNodeCreator.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnTypeConvertNodeCreator.h"
 
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnTypeConvertNodeCreator.h b/VistaCoreLibs/VistaDataFlowNet/VdfnTypeConvertNodeCreator.h
index 97f77a777d3d0872376dd78586844dbe0e96d5f5..d010fcef1e80016120f8d296ce94e502780d2592 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnTypeConvertNodeCreator.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnTypeConvertNodeCreator.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNTYPECONVERTNODECREATOR_H
 #define _VDFNTYPECONVERTNODECREATOR_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnUpdateThresholdNode.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnUpdateThresholdNode.cpp
index d32de3e96805b2afb0b31b971129c154032c0e84..cdf78668711f33db126f3211fe675fc704edcdc5 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnUpdateThresholdNode.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnUpdateThresholdNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VdfnUpdateThresholdNode.h" 
 #include "VdfnUtil.h"
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnUpdateThresholdNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnUpdateThresholdNode.h
index 96134259945d7d2b5f7af274c43dbbf4624446de..e5a830717d8e05c9317cb14ad5b8158372f0405b 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnUpdateThresholdNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnUpdateThresholdNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNUPDATETHRESHOLDNODE_H
 #define _VDFNUPDATETHRESHOLDNODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnUtil.cpp b/VistaCoreLibs/VistaDataFlowNet/VdfnUtil.cpp
index 131b9c0133f49da86c264f809e90eb3ece1cb651..bedc3d08d00d4a324d1da7c128996e3554c9f665 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnUtil.cpp
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnUtil.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <list>
 using namespace std;
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnUtil.h b/VistaCoreLibs/VistaDataFlowNet/VdfnUtil.h
index f957d7ce297c1f41f5cad4d4fd6c4321ad72ac72..880f1fb0dfcab3830237174f3cde55755f814ef2 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnUtil.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnUtil.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNUTIL_H
 #define _VDFNUTIL_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnValueToTriggerNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnValueToTriggerNode.h
index 14bf2e670ce110537972912ac856cf9e49c9c7e4..9a0c958e40d0c9c8e63aa6ac2eda615ff93eb49e 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnValueToTriggerNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnValueToTriggerNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNVALUETOTRIGGERNODE_H
 #define _VDFNVALUETOTRIGGERNODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnVariableNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnVariableNode.h
index 43a9c0429f677cc026e764123621ba35d0ec1cca..e936c5831c8aef46054b721293bcf7257f66c712 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnVariableNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnVariableNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VdfnNegateNode.h 30802 2012-06-26 07:32:23Z dr165799 $
+
 
 #ifndef _VDFNVARIABLENODE_H
 #define _VDFNVARIABLENODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/VdfnVectorDecomposeNode.h b/VistaCoreLibs/VistaDataFlowNet/VdfnVectorDecomposeNode.h
index 60a30223a899dec23c74b6045f935e19a33775e5..b4549f97c6806c5967890e81b834717728241801 100644
--- a/VistaCoreLibs/VistaDataFlowNet/VdfnVectorDecomposeNode.h
+++ b/VistaCoreLibs/VistaDataFlowNet/VdfnVectorDecomposeNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VDFNVECTORDECOMPOSENODE_H
 #define _VDFNVECTORDECOMPOSENODE_H
diff --git a/VistaCoreLibs/VistaDataFlowNet/_SourceFiles.cmake b/VistaCoreLibs/VistaDataFlowNet/_SourceFiles.cmake
index 626255d4934014e1c17658f305e30f64bba6c490..cefe2e14773c93112de269773fabca4baf40623d 100644
--- a/VistaCoreLibs/VistaDataFlowNet/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaDataFlowNet/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaCoreLibs/VistaDeviceDrivers/Vista3DCSpaceNavigatorDriver/Vista3DCSpaceNavigatorCMakeTest.cpp b/VistaCoreLibs/VistaDeviceDrivers/Vista3DCSpaceNavigatorDriver/Vista3DCSpaceNavigatorCMakeTest.cpp
index f302202307599e2e0b66b8b616efd56a821f7850..80bad87169654931839e70e741e5031a07285f57 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/Vista3DCSpaceNavigatorDriver/Vista3DCSpaceNavigatorCMakeTest.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/Vista3DCSpaceNavigatorDriver/Vista3DCSpaceNavigatorCMakeTest.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #define _ATL_APARTMENT_THREADED
 #define _ATL_NO_AUTOMATIC_NAMESPACE
diff --git a/VistaCoreLibs/VistaDeviceDrivers/Vista3DCSpaceNavigatorDriver/Vista3DCSpaceNavigatorDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/Vista3DCSpaceNavigatorDriver/Vista3DCSpaceNavigatorDriver.cpp
index d15fbfc77528e3cfd2875357c8ed40e362d29b14..1cb2816fed6abb2ec257b34687b7abad953eb2af 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/Vista3DCSpaceNavigatorDriver/Vista3DCSpaceNavigatorDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/Vista3DCSpaceNavigatorDriver/Vista3DCSpaceNavigatorDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 // include header here
 
@@ -113,7 +113,7 @@ struct Vista3DCSpaceNavigator::_sPrivate
 	_sPrivate()
 		: m_nKeyStates(0)
 		, m_bLastZero(false)
-		, m_pWorkspace(new VistaDriverWorkspaceAspect)
+		, m_pWorkspace(NULL)
 	{
 		m_nOldKeys[0] = 0;
 		m_nOldKeys[1] = 0;	
@@ -604,8 +604,6 @@ bool Vista3DCSpaceNavigator::DoSensorUpdate(VistaType::microtime dTs)
 		memcpy( m, &m_pPrivate->m_measure, sizeof(_sMeasure) );
 
 		MeasureStop(0);
-
-		GetSensorByIndex(0)->SetUpdateTimeStamp( dTs );
 	}
 
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/Vista3DCSpaceNavigatorDriver/Vista3DCSpaceNavigatorDriver.h b/VistaCoreLibs/VistaDeviceDrivers/Vista3DCSpaceNavigatorDriver/Vista3DCSpaceNavigatorDriver.h
index f802137da9eb3014c284f911c12bb2d6807768bf..a259c5923b25ad02f214fa76f59e41f0b6807ba6 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/Vista3DCSpaceNavigatorDriver/Vista3DCSpaceNavigatorDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/Vista3DCSpaceNavigatorDriver/Vista3DCSpaceNavigatorDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTA3DCSPACENAVIGATORDRIVER_H
 #define _VISTA3DCSPACENAVIGATORDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/Vista3DCSpaceNavigatorDriver/Vista3DCSpaceNavigatorDriver_sdk.cpp b/VistaCoreLibs/VistaDeviceDrivers/Vista3DCSpaceNavigatorDriver/Vista3DCSpaceNavigatorDriver_sdk.cpp
index 02cb447e422c2b8b6ed3bfa61ca231a9b1e61797..2141a5b3442e7a1f14db854b6be674cb9b080fc0 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/Vista3DCSpaceNavigatorDriver/Vista3DCSpaceNavigatorDriver_sdk.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/Vista3DCSpaceNavigatorDriver/Vista3DCSpaceNavigatorDriver_sdk.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: Vista3DCSpaceNavigatorDriver.cpp 49927 2015-05-09 20:42:37Z ingoassenmacher $
+
 
 // include header here
 
@@ -737,7 +737,6 @@ bool Vista3DCSpaceNavigator::DoSensorUpdate(VistaType::microtime dTs)
 	*m->getWrite<Vista3DCSpaceNavigator::_sMeasure>() = m_pPrivate->m_current_state;
 
 	MeasureStop( *p );
-	p->SetUpdateTimeStamp( dTs );
 	return true;
 }
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/Vista3DCSpaceNavigatorDriver/Vista3DCSpaceNavigatorPlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/Vista3DCSpaceNavigatorDriver/Vista3DCSpaceNavigatorPlugin.cpp
index f29ae76af959d7a711fd1a9aea72af9b97fe6539..94e0367305c1568de9efe4015e97ee01493857c5 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/Vista3DCSpaceNavigatorDriver/Vista3DCSpaceNavigatorPlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/Vista3DCSpaceNavigatorDriver/Vista3DCSpaceNavigatorPlugin.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*============================================================================*/
 /* INCLUDES                                                                   */
diff --git a/VistaCoreLibs/VistaDeviceDrivers/Vista3DCSpaceNavigatorDriver/Vista3DCSpaceNavigatorTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/Vista3DCSpaceNavigatorDriver/Vista3DCSpaceNavigatorTranscoder.cpp
index 5520635e93a2d57677bfd9c225dbc2a467a031ac..8691c0264cab9079e63ceed9ba714b576fffd574 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/Vista3DCSpaceNavigatorDriver/Vista3DCSpaceNavigatorTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/Vista3DCSpaceNavigatorDriver/Vista3DCSpaceNavigatorTranscoder.cpp
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include <VistaDeviceDriversBase/VistaDeviceSensor.h>
 #include "Vista3DCSpaceNavigatorDriver.h"
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaCHAI3DHapticDevicesDriver/VistaCHAI3DHapticDevicesCommonShare.h b/VistaCoreLibs/VistaDeviceDrivers/VistaCHAI3DHapticDevicesDriver/VistaCHAI3DHapticDevicesCommonShare.h
index 04441f0f1c485428074273f7912914bb18574416..8e368ca1b3f29e5285f7b5fd11c65f94de97eee8 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaCHAI3DHapticDevicesDriver/VistaCHAI3DHapticDevicesCommonShare.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaCHAI3DHapticDevicesDriver/VistaCHAI3DHapticDevicesCommonShare.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTACHAI3DHapticDevicesDRIVERCONFIG_H
 #define _VISTACHAI3DHapticDevicesDRIVERCONFIG_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaCHAI3DHapticDevicesDriver/VistaCHAI3DHapticDevicesDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaCHAI3DHapticDevicesDriver/VistaCHAI3DHapticDevicesDriver.cpp
index 75d80a68548d78894c242c4529a9321b2d19f931..0d072cb418d3296a26355a5975df7104df4ce571 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaCHAI3DHapticDevicesDriver/VistaCHAI3DHapticDevicesDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaCHAI3DHapticDevicesDriver/VistaCHAI3DHapticDevicesDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaCHAI3DHapticDevicesDriver.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaCHAI3DHapticDevicesDriver/VistaCHAI3DHapticDevicesDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaCHAI3DHapticDevicesDriver/VistaCHAI3DHapticDevicesDriver.h
index 437ee5919b3a4d506649f801a46fafe97bd8f79b..c18d5bdbff62d0fd72feb96b5bfcb04af3e8e106 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaCHAI3DHapticDevicesDriver/VistaCHAI3DHapticDevicesDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaCHAI3DHapticDevicesDriver/VistaCHAI3DHapticDevicesDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef __VISTACHAI3DHAPTICDEVICESDRIVER_H
 #define __VISTACHAI3DHAPTICDEVICESDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaCHAI3DHapticDevicesDriver/VistaCHAI3DHapticDevicesPlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaCHAI3DHapticDevicesDriver/VistaCHAI3DHapticDevicesPlugin.cpp
index 4356bbbdf661233bc6d6f48a47242640e098d072..f38939452b46e573cbb8a8a9427231cd865c3fd6 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaCHAI3DHapticDevicesDriver/VistaCHAI3DHapticDevicesPlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaCHAI3DHapticDevicesDriver/VistaCHAI3DHapticDevicesPlugin.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*============================================================================*/
 /* INCLUDES                                                                   */
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaCHAI3DHapticDevicesDriver/VistaCHAI3DHapticDevicesTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaCHAI3DHapticDevicesDriver/VistaCHAI3DHapticDevicesTranscoder.cpp
index 0b86d9a86f3d97eeb7a678d148d6f2895692f8a7..887aa4c6cb4a39f8c95b4d1e1f5b97314a8e834f 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaCHAI3DHapticDevicesDriver/VistaCHAI3DHapticDevicesTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaCHAI3DHapticDevicesDriver/VistaCHAI3DHapticDevicesTranscoder.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*============================================================================*/
 /* INCLUDES                                                                   */
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaCyberGloveDriver/VistaCyberGloveCommonShare.h b/VistaCoreLibs/VistaDeviceDrivers/VistaCyberGloveDriver/VistaCyberGloveCommonShare.h
index 4bec7906919985960eb29c953c88b60946af1b0b..e791644cd02ea6d4dd0d66b9700f67263b86374b 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaCyberGloveDriver/VistaCyberGloveCommonShare.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaCyberGloveDriver/VistaCyberGloveCommonShare.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTACYBERGLOVECOMMONSHARE_H__
 #define _VISTACYBERGLOVECOMMONSHARE_H__
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaCyberGloveDriver/VistaCyberGloveDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaCyberGloveDriver/VistaCyberGloveDriver.cpp
index ccbc6ef5a262e4f80281c99a8a3f89e8f9cd2b01..c2db7bc51b37face204d7a83f5622b44ac2986e7 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaCyberGloveDriver/VistaCyberGloveDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaCyberGloveDriver/VistaCyberGloveDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*============================================================================*/
 /* INCLUDES                                                                   */
@@ -1471,7 +1471,6 @@ bool VistaCyberGloveDriver::DoSensorUpdate( VistaType::microtime nTs )
 
 	// we are done. Indicate that to the history
 	MeasureStop(0);
-	GetSensorByIndex(0)->SetUpdateTimeStamp(nTs);
 
 #ifdef WIN32
 	_postCommunicate();
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaCyberGloveDriver/VistaCyberGloveDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaCyberGloveDriver/VistaCyberGloveDriver.h
index 7e53c6d3985f0e8406c2697099b55b10b9de8d31..4be0fd17b293b68ff2c4a71e6dfb9b7a804cc5e3 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaCyberGloveDriver/VistaCyberGloveDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaCyberGloveDriver/VistaCyberGloveDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTACYBERGLOVEDRIVER_H__
 #define _VISTACYBERGLOVEDRIVER_H__
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaCyberGloveDriver/VistaCyberGlovePlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaCyberGloveDriver/VistaCyberGlovePlugin.cpp
index 53d3902c77cd0c59d227aaae17a2258c86d32396..54628717966dd712df9e8861781679b895874e21 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaCyberGloveDriver/VistaCyberGlovePlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaCyberGloveDriver/VistaCyberGlovePlugin.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*============================================================================*/
 /* INCLUDES                                                                   */
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaCyberGloveDriver/VistaCyberGloveTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaCyberGloveDriver/VistaCyberGloveTranscoder.cpp
index 59636d85343302e4f63f7ff9c0d10a28f7362382..94a96620554df5720bd36ba26276c94accd29a34 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaCyberGloveDriver/VistaCyberGloveTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaCyberGloveDriver/VistaCyberGloveTranscoder.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*============================================================================*/
 /* INCLUDES                                                                   */
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackDriver/VistaDTrackCommonShare.h b/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackDriver/VistaDTrackCommonShare.h
index 867532ef287f4560cc06fcff7a0aad231e96f83c..73d2d606f74497c08549364444d30865d2634a5a 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackDriver/VistaDTrackCommonShare.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackDriver/VistaDTrackCommonShare.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADTRACKCOMMONSHARE_H
 #define _VISTADTRACKCOMMONSHARE_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackDriver/VistaDTrackDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackDriver/VistaDTrackDriver.cpp
index 1b76082ebd5720245db85318a5b0f8c042cbbeef..9aa97e93864cead7a9b13ee5e1ac3f95b20cc094 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackDriver/VistaDTrackDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackDriver/VistaDTrackDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDTrackDriver.h"
 
@@ -280,6 +280,10 @@ public:
 		  m_pProtocol(NULL)
 	{
 	}
+	virtual ~VistaDTrackProtocolAspect()
+	{
+		delete m_pProtocol;
+	}
 
 	bool SetProtocol( const _cVersionTag &oTag )
 	{
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackDriver/VistaDTrackDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackDriver/VistaDTrackDriver.h
index 5b95df0dc6f578544298ac9382707ea953c25d06..147d4c1de46e80fcf5844de300a0fc406d1677f7 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackDriver/VistaDTrackDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackDriver/VistaDTrackDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADTRACKDRIVER_H
 #define _VISTADTRACKDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackDriver/VistaDTrackPlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackDriver/VistaDTrackPlugin.cpp
index 0a019f298c5947a47d13967cc2a3daf9f2c9956f..42d1b78a11bc5784ad19cd0e0b50e3250518276a 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackDriver/VistaDTrackPlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackDriver/VistaDTrackPlugin.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDTrackDriver.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackDriver/VistaDTrackTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackDriver/VistaDTrackTranscoder.cpp
index 18562d3d095073ede80ccfb57ffcf9083afaf2d9..40cab81c03b387504017e28037d4964595c81c38 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackDriver/VistaDTrackTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackDriver/VistaDTrackTranscoder.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDTrackCommonShare.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackSDKDriver/VistaDTrackSDKDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackSDKDriver/VistaDTrackSDKDriver.cpp
index 7706db36f507fa508eb440a3acc19762e15be4c0..1eecd3b71450806415f43ce1aef8e21e8d987502 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackSDKDriver/VistaDTrackSDKDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackSDKDriver/VistaDTrackSDKDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <DTrack.hpp>
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackSDKDriver/VistaDTrackSDKDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackSDKDriver/VistaDTrackSDKDriver.h
index cab3e1aa1ea0ba7243f88626cc1c30850c4ca323..991105247f31974759cdb69b63096cea3df12f0e 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackSDKDriver/VistaDTrackSDKDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackSDKDriver/VistaDTrackSDKDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef __VISTADTRACKSDKDRIVERDRIVER_H
 #define __VISTADTRACKSDKDRIVERDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackSDKDriver/VistaDTrackSDKDriverConfig.h b/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackSDKDriver/VistaDTrackSDKDriverConfig.h
index 9d9171583bffab1fac06091c50b621caef7b4b44..ff518bb9ab38f91a196ecd4a81f5393ab5d79643 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackSDKDriver/VistaDTrackSDKDriverConfig.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackSDKDriver/VistaDTrackSDKDriverConfig.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef __VISTADTRACKSDKDRIVERCONFIG_H
 #define __VISTADTRACKSDKDRIVERCONFIG_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackSDKDriver/VistaDTrackSDKDriverPlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackSDKDriver/VistaDTrackSDKDriverPlugin.cpp
index 30ed99256fa4cd478e155c233dfeccfdafb2fa96..9740e3600ca4eb491eacab375464a3841a9bb43c 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackSDKDriver/VistaDTrackSDKDriverPlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackSDKDriver/VistaDTrackSDKDriverPlugin.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*============================================================================*/
 /* INCLUDES                                                                   */
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackSDKDriver/VistaDTrackSDKDriverPlugin.h b/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackSDKDriver/VistaDTrackSDKDriverPlugin.h
index ccaac412c5d2e112ccb14ad644c5838770ec7d55..b706e28970ef147894b339c48ba7a83bace8b6b8 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackSDKDriver/VistaDTrackSDKDriverPlugin.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackSDKDriver/VistaDTrackSDKDriverPlugin.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef __VISTADTRACKSDKDRIVERPLUGINPLUGIN_H
 #define __VISTADTRACKSDKDRIVERPLUGINPLUGIN_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackSDKDriver/VistaDTrackSDKDriverTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackSDKDriver/VistaDTrackSDKDriverTranscoder.cpp
index 8b91f7b5dd4f5036ebb63e4245993fa51f0e06a2..bf02b67c5694744d626523df0b1110dc682d71c9 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackSDKDriver/VistaDTrackSDKDriverTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaDTrackSDKDriver/VistaDTrackSDKDriverTranscoder.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*============================================================================*/
 /* INCLUDES                                                                   */
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaDepthSenseDriver/VistaDepthSenseDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaDepthSenseDriver/VistaDepthSenseDriver.cpp
index ef0037dd1609ce7dabcff6dba2222c28c3f75bde..3237323bfb4ddb047ee14a576c6c4f6dfa42ef99 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaDepthSenseDriver/VistaDepthSenseDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaDepthSenseDriver/VistaDepthSenseDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaDepthSenseDriver.cpp 40274 2014-01-29 09:59:23Z dr165799 $
+
 
 #include <cstring>
 #include <cassert>
@@ -158,7 +158,6 @@ namespace {
 
 	void PrintDepthNodeConfig(DepthNode::Configuration conf) {
 		std::string sMode;
-		std::string sFrameFormat;
 
 		switch(conf.mode) {
 		case DepthSense::DepthNode::CAMERA_MODE_UNKNOWN:
@@ -429,8 +428,7 @@ public:
 		if(pParams->GetDumpAvailableConfigs())
 			vstr::debugi() << "Supported color node configurations:" << std::endl;
 
-		for( VecConf::const_iterator it = vConfigs.begin();
-			 it != vConfigs.end() ; it++ ) {
+		for( VecConf::const_iterator it = vConfigs.begin(); it != vConfigs.end() ; ++it ) {
 			// @todo read values from driver config
 			if(it->compression == DepthSense::COMPRESSION_TYPE_YUY2 &&
 			   it->frameFormat == DepthSense::FRAME_FORMAT_QVGA &&
@@ -481,8 +479,7 @@ public:
 
 		if(pParams->GetDumpAvailableConfigs())
 			vstr::debug() << "Supported depth node configurations:" << std::endl;
-		for( VecConf::const_iterator it = vConfigs.begin();
-			 it != vConfigs.end() ; it++ ) {
+		for( VecConf::const_iterator it = vConfigs.begin(); it != vConfigs.end(); ++it ) {
 			if(it->mode == DepthSense::DepthNode::CAMERA_MODE_CLOSE_MODE &&
 			   it->frameFormat == DepthSense::FRAME_FORMAT_QVGA &&
 			   it->framerate == 30 &&
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaDepthSenseDriver/VistaDepthSenseDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaDepthSenseDriver/VistaDepthSenseDriver.h
index 04a7aa18ea21e8204224b77091a7b662fd3ba776..c6b1b8f163778b7591264176091863172d13d824 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaDepthSenseDriver/VistaDepthSenseDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaDepthSenseDriver/VistaDepthSenseDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaDepthSenseDriver.h 40274 2014-01-29 09:59:23Z dr165799 $
+
 
 #ifndef __VISTADEPTHSENSEDRIVER_H
 #define __VISTADEPTHSENSEDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaDepthSenseDriver/VistaDepthSensePlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaDepthSenseDriver/VistaDepthSensePlugin.cpp
index e5c6b65bff49a1bf6697926d5593c9534ccb7388..e2f42c508d60ef24c557a0548b054dfd2b7f48ed 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaDepthSenseDriver/VistaDepthSensePlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaDepthSenseDriver/VistaDepthSensePlugin.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: $
+
 
 /*============================================================================*/
 /* INCLUDES                                                                   */
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaDepthSenseDriver/VistaDepthSenseTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaDepthSenseDriver/VistaDepthSenseTranscoder.cpp
index 58e9dd3d54b0c31a7f426b143dcb052c85efaa61..3943fa87991d4bdb13b4d9d8ea2ee9190b7165a1 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaDepthSenseDriver/VistaDepthSenseTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaDepthSenseDriver/VistaDepthSenseTranscoder.cpp
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id:  $
- */
+
 
 #include <VistaDeviceDriversBase/VistaDeviceSensor.h>
 #include <VistaDeviceDriversBase/VistaDriverPlugDev.h>
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaDirectXGamepadDriver/VistaDirectXGamepadDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaDirectXGamepadDriver/VistaDirectXGamepadDriver.cpp
index 9c700d546663cb394f76739a75e900147a66303b..16b26bbb65c9986367e45494877ae376e797fb70 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaDirectXGamepadDriver/VistaDirectXGamepadDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaDirectXGamepadDriver/VistaDirectXGamepadDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 // include header here
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaDirectXGamepadDriver/VistaDirectXGamepadDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaDirectXGamepadDriver/VistaDirectXGamepadDriver.h
index f8448249f377dcdf1203823f56ac66635260558d..63f3cae99b7fa4c66c8599fb034df28703fa8952 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaDirectXGamepadDriver/VistaDirectXGamepadDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaDirectXGamepadDriver/VistaDirectXGamepadDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(WIN32)
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaDirectXGamepadDriver/VistaDirectXGamepadPlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaDirectXGamepadDriver/VistaDirectXGamepadPlugin.cpp
index 7b191762c334d9fba4139c2a99c2722d8f511ed8..221a11eba2681cfc3cef2ff6974ae232d921d0e2 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaDirectXGamepadDriver/VistaDirectXGamepadPlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaDirectXGamepadDriver/VistaDirectXGamepadPlugin.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*============================================================================*/
 /* INCLUDES                                                                   */
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaDirectXGamepadDriver/VistaDirectXGamepadSensorMeasures.h b/VistaCoreLibs/VistaDeviceDrivers/VistaDirectXGamepadDriver/VistaDirectXGamepadSensorMeasures.h
index 902bdf6543ca669b358ca1434df5f681680a9fed..27d1434556e41490b5cdeda761f0a46e7742fa58 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaDirectXGamepadDriver/VistaDirectXGamepadSensorMeasures.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaDirectXGamepadDriver/VistaDirectXGamepadSensorMeasures.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef __VISTADIRECTXGAMEPADSENSORMEASURES_H
 #define __VISTADIRECTXGAMEPADSENSORMEASURES_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaDirectXGamepadDriver/VistaDirectXGamepadTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaDirectXGamepadDriver/VistaDirectXGamepadTranscoder.cpp
index af2020522f29014bc42304e5e150416e47e133f1..16d2a39d3879b91881b38eb917b241e7ba92d9a3 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaDirectXGamepadDriver/VistaDirectXGamepadTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaDirectXGamepadDriver/VistaDirectXGamepadTranscoder.cpp
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 
 #include "VistaDirectXGamepadSensorMeasures.h"
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaDirectXGamepadDriver/tests/DirectXGamepadTestApp.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaDirectXGamepadDriver/tests/DirectXGamepadTestApp.cpp
index 2cfd26d55acf39871ed55a87090f74909480db21..55584645f48d29e15bc56c3fb3347829a867ff1e 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaDirectXGamepadDriver/tests/DirectXGamepadTestApp.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaDirectXGamepadDriver/tests/DirectXGamepadTestApp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 // include header here
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaFastrakDriver/VistaFastrakCommonShare.h b/VistaCoreLibs/VistaDeviceDrivers/VistaFastrakDriver/VistaFastrakCommonShare.h
index a36d8652425746b05ebb08d536118da9f5cb9fe4..44e11fa4cf47963a9973f7794ae95f0877dde3c7 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaFastrakDriver/VistaFastrakCommonShare.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaFastrakDriver/VistaFastrakCommonShare.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAFASTRAKCOMMONSHARE_H
 #define _VISTAFASTRAKCOMMONSHARE_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaFastrakDriver/VistaFastrakDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaFastrakDriver/VistaFastrakDriver.cpp
index a6fef3fa95ca7cbef926acb57a6945abb3f6acf0..ab90f1f2337e254d2e9508d5f35a3705ee267aa6 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaFastrakDriver/VistaFastrakDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaFastrakDriver/VistaFastrakDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaFastrakDriver.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaFastrakDriver/VistaFastrakDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaFastrakDriver/VistaFastrakDriver.h
index 46fa1fe844385c5d0908f3fc29b1fe28cf1a6d93..cf8ba9c123645aa13742cf91ff2c1ebb0085cb5d 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaFastrakDriver/VistaFastrakDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaFastrakDriver/VistaFastrakDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAFASTRAKDRIVER_H
 #define _VISTAFASTRAKDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaFastrakDriver/VistaFastrakPlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaFastrakDriver/VistaFastrakPlugin.cpp
index 7ab455c21f2e5408ef05adff94f980bda0d20e10..ca8fe68c6a9f793e323818a867ffdf6d6156f2cc 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaFastrakDriver/VistaFastrakPlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaFastrakDriver/VistaFastrakPlugin.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaFastrakDriver.h"
 #include "VistaFastrakCommonShare.h"
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaFastrakDriver/VistaFastrakTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaFastrakDriver/VistaFastrakTranscoder.cpp
index 9713659e8a2d490f7679d29692fb5265aad27ae1..9cef7a279148edfc514c8cf20ec282005d0c1120 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaFastrakDriver/VistaFastrakTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaFastrakDriver/VistaFastrakTranscoder.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 #include <VistaDeviceDriversBase/VistaDriverPlugDev.h>
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaGlutJoystickDriver/VistaGlutJoystickDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaGlutJoystickDriver/VistaGlutJoystickDriver.cpp
index d9a568e50281190d92480d8431810dba85996b9b..a6f9fa11c3f1f7756eccffeb2b5ff081e170b144 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaGlutJoystickDriver/VistaGlutJoystickDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaGlutJoystickDriver/VistaGlutJoystickDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaGlutJoystickDriver.h"
 #include <map>
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaGlutJoystickDriver/VistaGlutJoystickDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaGlutJoystickDriver/VistaGlutJoystickDriver.h
index 7aa17279b9799ea560fa981db3949c105c15ba23..38340cc1d302512677022d14ddd731342c04dea1 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaGlutJoystickDriver/VistaGlutJoystickDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaGlutJoystickDriver/VistaGlutJoystickDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOPENSGGLUTJOYSTICKDRIVER_H
 #define _VISTAOPENSGGLUTJOYSTICKDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaGlutJoystickDriver/VistaGlutJoystickPlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaGlutJoystickDriver/VistaGlutJoystickPlugin.cpp
index 5e3af561a055d970a4712684491fe511f3fbc470..82d651357c211df6decfad60621caedf20e3d877 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaGlutJoystickDriver/VistaGlutJoystickPlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaGlutJoystickDriver/VistaGlutJoystickPlugin.cpp
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #if defined(WIN32) && !defined(VISTAGLUTJOYSTICKPLUGIN_STATIC)
 	#ifdef VISTAGLUTJOYSTICKPLUGIN_EXPORTS
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaGlutJoystickDriver/VistaGlutJoystickTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaGlutJoystickDriver/VistaGlutJoystickTranscoder.cpp
index 89b587bf8851ef3e81843e37bc24d45a7e25420b..fc6296bd36319967943512c9081a050c93e657d7 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaGlutJoystickDriver/VistaGlutJoystickTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaGlutJoystickDriver/VistaGlutJoystickTranscoder.cpp
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include <VistaDeviceDriversBase/VistaDeviceSensor.h>
 #include "VistaGlutJoystickDriver.h"
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaGlutKeyboardDriver/VistaGlutKeyboardDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaGlutKeyboardDriver/VistaGlutKeyboardDriver.cpp
index f860fcd82049ef9fd07cbc1a7d5956fff4d45e11..ae2447fc97c265f8d28dbe2b16788a310c2fdfd7 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaGlutKeyboardDriver/VistaGlutKeyboardDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaGlutKeyboardDriver/VistaGlutKeyboardDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaGlutKeyboardDriver.h"
 #include <map>
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaGlutKeyboardDriver/VistaGlutKeyboardDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaGlutKeyboardDriver/VistaGlutKeyboardDriver.h
index ae809ce3dcd2a3c18f856476e0decc321de5cfa6..f5f52cf5ddd83704afee7d08bf8f8584d20f5b70 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaGlutKeyboardDriver/VistaGlutKeyboardDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaGlutKeyboardDriver/VistaGlutKeyboardDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAGLUTKEYBOARDDRIVER_H
 #define _VISTAGLUTKEYBOARDDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaGlutKeyboardDriver/VistaGlutKeyboardPlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaGlutKeyboardDriver/VistaGlutKeyboardPlugin.cpp
index d390b77ca43045d8ef828c458e5419f288d8e328..5684ff01826d6c9fb2cb7d449f6f0c820381c465 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaGlutKeyboardDriver/VistaGlutKeyboardPlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaGlutKeyboardDriver/VistaGlutKeyboardPlugin.cpp
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "VistaGlutKeyboardDriver.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaGlutKeyboardDriver/VistaGlutKeyboardTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaGlutKeyboardDriver/VistaGlutKeyboardTranscoder.cpp
index 4383c465ac5e8ac04cfb6f59aa8a73d6952e8a49..bfc0043c05ec39bbe1af6fed42fca84d0e87b903 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaGlutKeyboardDriver/VistaGlutKeyboardTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaGlutKeyboardDriver/VistaGlutKeyboardTranscoder.cpp
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include <VistaDeviceDriversBase/Drivers/VistaKeyboardDriver.h>
 #include <VistaDeviceDriversBase/VistaDriverPlugDev.h>
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaGlutMouseDriver/VistaGlutMouseDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaGlutMouseDriver/VistaGlutMouseDriver.cpp
index 8c321640389c0ddda96385b95dda76c46a9d24e8..e38f48ce603c2d3dcc80f1bd0d4e46403aad0746 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaGlutMouseDriver/VistaGlutMouseDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaGlutMouseDriver/VistaGlutMouseDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaGlutMouseDriver.cpp 55148 2016-03-16 15:27:43Z dr165799 $
+
 
 #include "VistaGlutMouseDriver.h"
 #include <map>
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaGlutMouseDriver/VistaGlutMouseDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaGlutMouseDriver/VistaGlutMouseDriver.h
index 19ee978419741794192c28c457782a1078c8630c..2904431ddb61a0c8d416dab12b362c7a695e5178 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaGlutMouseDriver/VistaGlutMouseDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaGlutMouseDriver/VistaGlutMouseDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAGLUTMOUSEDRIVER_H
 #define _VISTAGLUTMOUSEDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaGlutMouseDriver/VistaGlutMousePlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaGlutMouseDriver/VistaGlutMousePlugin.cpp
index 94409d4419656952888db00b2e8edf7f59b416c7..4646eddc378cb4fb1a91322cc002972d43377909 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaGlutMouseDriver/VistaGlutMousePlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaGlutMouseDriver/VistaGlutMousePlugin.cpp
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "VistaGlutMouseDriver.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaGlutMouseDriver/VistaGlutMouseTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaGlutMouseDriver/VistaGlutMouseTranscoder.cpp
index d7da72fa025651221ed601996fa7424f302194a4..87e50c7ae9188a7328df96678438d3481fc19f91 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaGlutMouseDriver/VistaGlutMouseTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaGlutMouseDriver/VistaGlutMouseTranscoder.cpp
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include <VistaDeviceDriversBase/Drivers/VistaMouseDriver.h>
 #include <VistaDeviceDriversBase/VistaDriverPlugDev.h>
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaHIDDriver/VistaHIDCommonShare.h b/VistaCoreLibs/VistaDeviceDrivers/VistaHIDDriver/VistaHIDCommonShare.h
index b0b50889981c7b4656e1d8d6b14742de90dcc048..c32cf804dd38f96b5b90a9f16340f0d9f2497556 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaHIDDriver/VistaHIDCommonShare.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaHIDDriver/VistaHIDCommonShare.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAHIDDRIVERCOMMONSHARE_H__
 #define _VISTAHIDDRIVERCOMMONSHARE_H__
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaHIDDriver/VistaHIDDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaHIDDriver/VistaHIDDriver.cpp
index ef774d44edbbed49d558ed13ddc4e24ca0944f94..4649a2e6cbd64e0114bb1d89d00a5730a8d9cd0e 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaHIDDriver/VistaHIDDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaHIDDriver/VistaHIDDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /* The Windows-specific code (especially the InitDriver routine) has been 
  * copied from the VRPN toolkit, which is released in the public domain.
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaHIDDriver/VistaHIDDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaHIDDriver/VistaHIDDriver.h
index 0dbeb531235d946d29b08cd18a4cf21d9e62d0ed..cdf2bfaf44ece36a4fb41919c03cf264c834110f 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaHIDDriver/VistaHIDDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaHIDDriver/VistaHIDDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAHIDDRIVER_H__
 #define _VISTAHIDDRIVER_H__
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaHIDDriver/VistaHIDDriverForceFeedbackAspect.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaHIDDriver/VistaHIDDriverForceFeedbackAspect.cpp
index e048c614cb3081406af7a295a7d5a6946271b058..a7da3799441bcc627d27459b4b117dba7a81d2d5 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaHIDDriver/VistaHIDDriverForceFeedbackAspect.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaHIDDriver/VistaHIDDriverForceFeedbackAspect.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(LINUX)
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaHIDDriver/VistaHIDDriverForceFeedbackAspect.h b/VistaCoreLibs/VistaDeviceDrivers/VistaHIDDriver/VistaHIDDriverForceFeedbackAspect.h
index 91e160dbf7d5783b2818d8572fbf9774324df64c..41e3cfd599e9b5d75cddf56354a69710c3f5e1ea 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaHIDDriver/VistaHIDDriverForceFeedbackAspect.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaHIDDriver/VistaHIDDriverForceFeedbackAspect.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAHIDDRIVERFORCEFEEDBACKASPECT_H
 #define _VISTAHIDDRIVERFORCEFEEDBACKASPECT_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaHIDDriver/VistaHIDPlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaHIDDriver/VistaHIDPlugin.cpp
index 8295dfddf6380c18f26064061edee9f5973b279c..859ec244f0ace8176e23c669cea8c0914b250d9e 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaHIDDriver/VistaHIDPlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaHIDDriver/VistaHIDPlugin.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /* The Windows-specific code (especially the InitDriver routine) has been 
  * copied from the VRPN toolkit, which is released in the public domain.
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaHIDDriver/VistaHIDTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaHIDDriver/VistaHIDTranscoder.cpp
index 96902ad2a850b055e4b77815fb41dc6462c7e834..b81596018663c3adf37b8a99901fcf785e8dc26d 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaHIDDriver/VistaHIDTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaHIDDriver/VistaHIDTranscoder.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /* The Windows-specific code (especially the InitDriver routine) has been 
  * copied from the VRPN toolkit, which is released in the public domain.
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaHapticDeviceEmulatorDriver/VistaHapticDeviceEmulatorCommonShare.h b/VistaCoreLibs/VistaDeviceDrivers/VistaHapticDeviceEmulatorDriver/VistaHapticDeviceEmulatorCommonShare.h
index 27c44d433936469ab739f302baa06c6f418d227c..44edf989479538dadab1a33ef4da6da067bbd795 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaHapticDeviceEmulatorDriver/VistaHapticDeviceEmulatorCommonShare.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaHapticDeviceEmulatorDriver/VistaHapticDeviceEmulatorCommonShare.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAPHANTOMSERVERDRIVERCONFIG_H
 #define _VISTAPHANTOMSERVERDRIVERCONFIG_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaHapticDeviceEmulatorDriver/VistaHapticDeviceEmulatorDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaHapticDeviceEmulatorDriver/VistaHapticDeviceEmulatorDriver.cpp
index c99dbd5f54d3eb903672be839bf46ab98ad4c73e..b599ecf120fea68c5c9fdbb0067274132c382ec7 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaHapticDeviceEmulatorDriver/VistaHapticDeviceEmulatorDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaHapticDeviceEmulatorDriver/VistaHapticDeviceEmulatorDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaHapticDeviceEmulatorDriver.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaHapticDeviceEmulatorDriver/VistaHapticDeviceEmulatorDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaHapticDeviceEmulatorDriver/VistaHapticDeviceEmulatorDriver.h
index b357e8169fdbe431169e02939e39a2db5f1f8afa..71f45eb1050edbe94fd6fb8a64d63a1f82ba342e 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaHapticDeviceEmulatorDriver/VistaHapticDeviceEmulatorDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaHapticDeviceEmulatorDriver/VistaHapticDeviceEmulatorDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VistaHapticDeviceEmulatorDRIVER_H
 #define _VistaHapticDeviceEmulatorDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaHapticDeviceEmulatorDriver/VistaHapticDeviceEmulatorPlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaHapticDeviceEmulatorDriver/VistaHapticDeviceEmulatorPlugin.cpp
index c170a776a0e2b002722d5bbc3112cdd389d7149e..65b4f1ff872c9338e5135eac771a1aaea857dd2e 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaHapticDeviceEmulatorDriver/VistaHapticDeviceEmulatorPlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaHapticDeviceEmulatorDriver/VistaHapticDeviceEmulatorPlugin.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaHapticDeviceEmulatorDriver.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaHapticDeviceEmulatorDriver/VistaHapticDeviceEmulatorTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaHapticDeviceEmulatorDriver/VistaHapticDeviceEmulatorTranscoder.cpp
index 83245ad7cc8873bf611defefe845191a76d6dd58..4b9dc41c7083300f501e61ba4b4515cd084152fd 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaHapticDeviceEmulatorDriver/VistaHapticDeviceEmulatorTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaHapticDeviceEmulatorDriver/VistaHapticDeviceEmulatorTranscoder.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaDeviceDriversBase/VistaDeviceSensor.h>
 #include <VistaDeviceDriversBase/VistaDriverPlugDev.h>
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaIRManDriver/VistaIRManDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaIRManDriver/VistaIRManDriver.cpp
index d5ec6784817a047b60b64a726c6c0fbad8e8da63..155894321f47ac9fa86797b2268a2f82bd08971f 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaIRManDriver/VistaIRManDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaIRManDriver/VistaIRManDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaIRManDriver.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaIRManDriver/VistaIRManDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaIRManDriver/VistaIRManDriver.h
index afb57e85dd2f169cb61649fd68d5e705b4980eff..3b02d179c9d3779da5923914483b6b6a64aba52c 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaIRManDriver/VistaIRManDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaIRManDriver/VistaIRManDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAIRMANDRIVER_H
 #define _VISTAIRMANDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaIRManDriver/VistaIRManDriverConfig.h b/VistaCoreLibs/VistaDeviceDrivers/VistaIRManDriver/VistaIRManDriverConfig.h
index 7acd4532a7ee29ebafc7dc6fdb2bd55df4752673..417b90137317d171641008590e162e3fc31d85e8 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaIRManDriver/VistaIRManDriverConfig.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaIRManDriver/VistaIRManDriverConfig.h
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef _VISTAIRMANDRIVERCONFIG_H_
 #define _VISTAIRMANDRIVERCONFIG_H_
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaIRManDriver/VistaIRManPlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaIRManDriver/VistaIRManPlugin.cpp
index ccf5111dfbb8c24850e5a5d13fe335566917b9dd..47cd8cb8e5c280fa4b6c35546845b3e773b125d7 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaIRManDriver/VistaIRManPlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaIRManDriver/VistaIRManPlugin.cpp
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #if defined(WIN32) && !defined(VISTAIRMANPLUGIN_STATIC)
 	#ifdef VISTAIRMANPLUGIN_EXPORTS
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaIRManDriver/VistaIRManTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaIRManDriver/VistaIRManTranscoder.cpp
index 058f3543e20ea0393b7d8e257b1d59682c16af15..5ddb31d4b3704c143d1dd1214d2d0d050d47ed2c 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaIRManDriver/VistaIRManTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaIRManDriver/VistaIRManTranscoder.cpp
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include <VistaDeviceDriversBase/VistaDeviceSensor.h>
 #include "VistaIRManDriver.h"
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaJswJoystickDriver/VistaJswJoystickDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaJswJoystickDriver/VistaJswJoystickDriver.cpp
index d72e975658a970cda05bd3b8d13fa8fc2c2af706..32777fa4fa2c5a11a85c634369ba39a1b3ddfae8 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaJswJoystickDriver/VistaJswJoystickDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaJswJoystickDriver/VistaJswJoystickDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaJswJoystickDriver.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaJswJoystickDriver/VistaJswJoystickDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaJswJoystickDriver/VistaJswJoystickDriver.h
index 6b34895fba1eb78d0021e3a6f25569c9c2db6b8b..ba013f5bc71ac4929340a8fe2b729ed9f457988f 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaJswJoystickDriver/VistaJswJoystickDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaJswJoystickDriver/VistaJswJoystickDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef __VISTAJSWJOYSTICKDRIVER_H
 #define __VISTAJSWJOYSTICKDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaJswJoystickDriver/VistaJswJoystickPlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaJswJoystickDriver/VistaJswJoystickPlugin.cpp
index 93da9b12abd7082aaae5fbe5d0a4003b4a2ebd0f..18764d4be52e51d8dc8d6a97ad9e49f975045164 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaJswJoystickDriver/VistaJswJoystickPlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaJswJoystickDriver/VistaJswJoystickPlugin.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*============================================================================*/
 /* INCLUDES                                                                   */
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaJswJoystickDriver/VistaJswJoystickTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaJswJoystickDriver/VistaJswJoystickTranscoder.cpp
index dbd0b6aacf13860d5bac91065bc286a47962d62c..bf287cdca8fa36dd594f379b732b66a0faef4860 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaJswJoystickDriver/VistaJswJoystickTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaJswJoystickDriver/VistaJswJoystickTranscoder.cpp
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include <VistaDeviceDriversBase/VistaDeviceSensor.h>
 #include <VistaDeviceDriversBase/VistaDriverPlugDev.h>
@@ -237,13 +235,13 @@ namespace
 
 			VistaVector3D vec;
 
-			if(m_nFirst != ~0 && m_nFirst < 16)
+			if(m_nFirst != static_cast<unsigned int>(~0) && m_nFirst < 16)
 				vec[0] = m->m_nAxes[m_nFirst];
 
-			if(m_nSecond != ~0 && m_nSecond < 16)
+			if(m_nSecond != static_cast<unsigned int>(~0) && m_nSecond < 16)
 				vec[1] = m->m_nAxes[m_nSecond];
 
-			if(m_nThird != ~0 && m_nThird < 16)
+			if(m_nThird != static_cast<unsigned int>(~0) && m_nThird < 16)
 				vec[2] = m->m_nAxes[m_nThird];
 
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaLeapMotionDriver/VistaLeapMotionCommonShare.h b/VistaCoreLibs/VistaDeviceDrivers/VistaLeapMotionDriver/VistaLeapMotionCommonShare.h
index 823a17668dc40d0e5be39e6532bfaacea6959689..5701514c6302985bea0130c49bb2b04bf8516f1f 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaLeapMotionDriver/VistaLeapMotionCommonShare.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaLeapMotionDriver/VistaLeapMotionCommonShare.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaLeapMotionCommonShare.h 40274 2014-01-29 09:59:23Z dr165799 $
+
 
 #ifndef _VISTALEAPMOTIONCOMMONSHARE_H
 #define _VISTALEAPMOTIONCOMMONSHARE_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaLeapMotionDriver/VistaLeapMotionDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaLeapMotionDriver/VistaLeapMotionDriver.cpp
index f5ab8ded1d7e33039bf42bb11f2b85daf10bbed7..21d9f7c02527d7b27f94c51220e6135792719dd3 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaLeapMotionDriver/VistaLeapMotionDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaLeapMotionDriver/VistaLeapMotionDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaLeapMotionDriver.cpp 40274 2014-01-29 09:59:23Z dr165799 $
+
 
 #include "VistaLeapMotionDriver.h"
 
@@ -618,8 +618,6 @@ bool VistaLeapMotionDriver::DoSensorUpdate( VistaType::microtime dTs )
 				VistaLeapMotionMeasures::HandMeasure* pData = pMeasure->getWrite< VistaLeapMotionMeasures::HandMeasure >();
 				FillHand( *pData, oHands[nHand], oFrame.timestamp() );
 				MeasureStop( nSensorId );
-				GetSensorByIndex(m_nHandsSensorId)->SetUpdateTimeStamp( dTs );
-	
 			}
 
 			unsigned int nFingersSensorId = m_pSensors->GetSensorId( m_nFingerSensorId, 0 );
@@ -637,7 +635,6 @@ bool VistaLeapMotionDriver::DoSensorUpdate( VistaType::microtime dTs )
 					pData->m_aFingers[ nIndex ] = VistaLeapMotionMeasures::Finger();
 
 				MeasureStop( nFingersSensorId );
-				GetSensorByIndex(m_nFingerSensorId)->SetUpdateTimeStamp( dTs );
 			}
 
 			unsigned int nToolsSensorId = m_pSensors->GetSensorId( m_nToolsSensorId, 0 );
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaLeapMotionDriver/VistaLeapMotionDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaLeapMotionDriver/VistaLeapMotionDriver.h
index d5bc30b11b4d782940b21930b4a8043f52c9b89e..41d333abe3273ea1f65b9f6490f3eb86ff60ec34 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaLeapMotionDriver/VistaLeapMotionDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaLeapMotionDriver/VistaLeapMotionDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaLeapMotionDriver.h 40274 2014-01-29 09:59:23Z dr165799 $
+
 
 #ifndef _VISTALEAPMOTIONDRIVER_H
 #define _VISTALEAPMOTIONDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaLeapMotionDriver/VistaLeapMotionPlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaLeapMotionDriver/VistaLeapMotionPlugin.cpp
index 8fd0b6e305a45cda9d0bf9ae3ffd0dc1c04f1622..e777d36bb815e8448149705c5813fb0afa0e3965 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaLeapMotionDriver/VistaLeapMotionPlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaLeapMotionDriver/VistaLeapMotionPlugin.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaLeapMotionPlugin.cpp 40274 2014-01-29 09:59:23Z dr165799 $
+
 
 #include "VistaLeapMotionDriver.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaLeapMotionDriver/VistaLeapMotionTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaLeapMotionDriver/VistaLeapMotionTranscoder.cpp
index 1006fde88d7a8aa71118484263e4b8612aa712f9..78b53c039d9538af6dadcdb76563ecf6ea432e04 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaLeapMotionDriver/VistaLeapMotionTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaLeapMotionDriver/VistaLeapMotionTranscoder.cpp
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id: VistaVRPNTranscoder.cpp 41343 2014-03-25 10:13:22Z dr165799 $
- */
+
 
 
 #include <VistaDeviceDriversBase/VistaDeviceSensor.h>
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaMIDIDriver/VistaMIDICommonShare.h b/VistaCoreLibs/VistaDeviceDrivers/VistaMIDIDriver/VistaMIDICommonShare.h
index 5854085149bc26718d0ee1661de94a695ef08278..636e50e5a3d2397b068dcba6d6873eebd20c805b 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaMIDIDriver/VistaMIDICommonShare.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaMIDIDriver/VistaMIDICommonShare.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAMIDICOMMONSHARE_H__
 #define _VISTAMIDICOMMONSHARE_H__
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaMIDIDriver/VistaMIDIDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaMIDIDriver/VistaMIDIDriver.cpp
index 6bb2e70ecda44b9267efafd63fd694b37986f8c5..689ed7bbc01f2765f1722173975676c0eb3a8765 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaMIDIDriver/VistaMIDIDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaMIDIDriver/VistaMIDIDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaMIDIDriver.h"
 #include <VistaDeviceDriversBase/VistaDeviceSensor.h>
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaMIDIDriver/VistaMIDIDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaMIDIDriver/VistaMIDIDriver.h
index f9afd5ad56f71d77b1186a553499d95080f21993..952afee7fb21703034048f474c1b99b640ce6c4f 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaMIDIDriver/VistaMIDIDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaMIDIDriver/VistaMIDIDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAMIDIDRIVER_H__
 #define _VISTAMIDIDRIVER_H__
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaMIDIDriver/VistaMIDIPlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaMIDIDriver/VistaMIDIPlugin.cpp
index 0f20b2605a57d5919c4f6482e7093817719567fc..f16ba8299fc5a96c641d72ee1dbccbb8d69e151a 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaMIDIDriver/VistaMIDIPlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaMIDIDriver/VistaMIDIPlugin.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaMIDIDriver.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaMIDIDriver/VistaMIDITranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaMIDIDriver/VistaMIDITranscoder.cpp
index 4c431601c7458f6d49ba89a97aaf3720ff7d8bbb..bb0627a3a2a0bf35c8a8270f9d16f7137dd9d9b3 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaMIDIDriver/VistaMIDITranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaMIDIDriver/VistaMIDITranscoder.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaDeviceDriversBase/VistaDeviceSensor.h>
 #include <VistaDeviceDriversBase/DriverAspects/VistaDriverMeasureHistoryAspect.h>
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOSGKeyboardDriver/VistaOSGKeyboardDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaOSGKeyboardDriver/VistaOSGKeyboardDriver.cpp
index e85319ca78f9dfa7442dd132e204894c078ec64f..068eb459e051adf9ca82296474b4dec3f3e46115 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOSGKeyboardDriver/VistaOSGKeyboardDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOSGKeyboardDriver/VistaOSGKeyboardDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaOSGKeyboardDriver.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOSGKeyboardDriver/VistaOSGKeyboardDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaOSGKeyboardDriver/VistaOSGKeyboardDriver.h
index 67d7eaa6abd93cca2e576308ef736e59787685fc..8981c57993c921069b0e9cd84dce0a989f397ca2 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOSGKeyboardDriver/VistaOSGKeyboardDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOSGKeyboardDriver/VistaOSGKeyboardDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOSGKEYBOARDDRIVER_H
 #define _VISTAOSGKEYBOARDDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOSGKeyboardDriver/VistaOSGKeyboardPlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaOSGKeyboardDriver/VistaOSGKeyboardPlugin.cpp
index f26e4762b5e6a944c04c64f5fae22076bfa2442c..314e511b855e736a71d3800b10a4ae8c06683e08 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOSGKeyboardDriver/VistaOSGKeyboardPlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOSGKeyboardDriver/VistaOSGKeyboardPlugin.cpp
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "VistaOSGKeyboardDriver.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOSGKeyboardDriver/VistaOSGKeyboardTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaOSGKeyboardDriver/VistaOSGKeyboardTranscoder.cpp
index 2fbb0851adfc42dd1d4dd3abf663d646196ad0bc..91b1a252d6f6cd61e0740ac28203d9bc5db5951c 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOSGKeyboardDriver/VistaOSGKeyboardTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOSGKeyboardDriver/VistaOSGKeyboardTranscoder.cpp
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include <VistaDeviceDriversBase/Drivers/VistaKeyboardDriver.h>
 #include <VistaDeviceDriversBase/VistaDriverPlugDev.h>
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOSGMouseDriver/VistaOSGMouseDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaOSGMouseDriver/VistaOSGMouseDriver.cpp
index 3307d14acd43ec18cc349a7217482ffd76e3314c..d80a3a34e77dd22219d9849ef92013386aa79567 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOSGMouseDriver/VistaOSGMouseDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOSGMouseDriver/VistaOSGMouseDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaOSGMouseDriver.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOSGMouseDriver/VistaOSGMouseDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaOSGMouseDriver/VistaOSGMouseDriver.h
index e187aef224c7fe02ae826d5d6afbc8daf6a9c51a..e9023936500d1e532362f8fe6e75b48a9c95e028 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOSGMouseDriver/VistaOSGMouseDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOSGMouseDriver/VistaOSGMouseDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOSGMOUSEDRIVER_H
 #define _VISTAOSGMOUSEDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOSGMouseDriver/VistaOSGMousePlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaOSGMouseDriver/VistaOSGMousePlugin.cpp
index f9c86b8d739f80d1d2375c086a6155e443b0c353..97427984b01bac8e779371e59ba1fbfb38b9de02 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOSGMouseDriver/VistaOSGMousePlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOSGMouseDriver/VistaOSGMousePlugin.cpp
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "VistaOSGMouseDriver.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOSGMouseDriver/VistaOSGMouseTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaOSGMouseDriver/VistaOSGMouseTranscoder.cpp
index 0ceff5eca94d02ee31224e3046b52f4ca725e88a..68180d1cc26fda17b3b1b70519ebaa4023a30378 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOSGMouseDriver/VistaOSGMouseTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOSGMouseDriver/VistaOSGMouseTranscoder.cpp
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include <VistaDeviceDriversBase/Drivers/VistaMouseDriver.h>
 #include <VistaDeviceDriversBase/VistaDriverPlugDev.h>
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenALRecordDriver/OpenALSoundContext.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenALRecordDriver/OpenALSoundContext.cpp
index 3850c854dc69e1e6c04d36573166f4bc3bbc6136..8bed33e6a09114c7cd194edf8261b14138888f46 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenALRecordDriver/OpenALSoundContext.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenALRecordDriver/OpenALSoundContext.cpp
@@ -18,9 +18,7 @@
 /*                                                 All rights reserved.       */
 /*                                             .                              */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "OpenALSoundContext.h"
 #include <iostream>
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenALRecordDriver/OpenALSoundContext.h b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenALRecordDriver/OpenALSoundContext.h
index e224411db89bd86bb4c334a613135345ec4a6498..196433a09f3f15ce75b13ba03d040c355c4679c6 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenALRecordDriver/OpenALSoundContext.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenALRecordDriver/OpenALSoundContext.h
@@ -31,9 +31,7 @@
 /*        - ...               :   ...                                         */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef __OPENALSOUNDCONTEXT_H
 #define __OPENALSOUNDCONTEXT_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenALRecordDriver/VistaOpenALRecordDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenALRecordDriver/VistaOpenALRecordDriver.cpp
index c97f12667fd89002790d1d9c3cc07eeefda08bc4..48fffe74169c4b8d5c306ee2c86a5dbdf8713bb3 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenALRecordDriver/VistaOpenALRecordDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenALRecordDriver/VistaOpenALRecordDriver.cpp
@@ -21,7 +21,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaOpenALRecordDriver.h"
 #include "OpenALSoundContext.h"
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenALRecordDriver/VistaOpenALRecordDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenALRecordDriver/VistaOpenALRecordDriver.h
index 836ac92e4a4d085fcf9667cd78ac0ce26cf382cb..ebe79b4cc506ae5690a632c39beac13535b257d3 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenALRecordDriver/VistaOpenALRecordDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenALRecordDriver/VistaOpenALRecordDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef __VISTAOPENALRECORDDRIVER_H
 #define __VISTAOPENALRECORDDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenALRecordDriver/VistaOpenALRecordPlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenALRecordDriver/VistaOpenALRecordPlugin.cpp
index 8812278b5c8a08fc5bcc1e45a1953a4d1674ad58..992ab6c6924aec2cc67d15d992bedb2874f6dd6e 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenALRecordDriver/VistaOpenALRecordPlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenALRecordDriver/VistaOpenALRecordPlugin.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*============================================================================*/
 /* INCLUDES                                                                   */
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenALRecordDriver/VistaOpenALRecordTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenALRecordDriver/VistaOpenALRecordTranscoder.cpp
index c7da2ec33734084916e183a6a3be5784b6debe7b..f8dcd144305370890f99b1de02c139078aaacd8a 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenALRecordDriver/VistaOpenALRecordTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenALRecordDriver/VistaOpenALRecordTranscoder.cpp
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include <VistaDeviceDriversBase/VistaDeviceSensor.h>
 #include <VistaDeviceDriversBase/VistaDriverPlugDev.h>
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVCaptureDriver/VistaOpenCVCaptureDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVCaptureDriver/VistaOpenCVCaptureDriver.cpp
index 4fa933a71d75c43815e2f9fb53b973475ed15d58..338df2cea0d5f5ef5029230ff16affcb0490672c 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVCaptureDriver/VistaOpenCVCaptureDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVCaptureDriver/VistaOpenCVCaptureDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaOpenCVCaptureDriver.h"
 
@@ -536,7 +536,7 @@ bool VistaOpenCVCaptureDriver::DoConnect()
 	IVistaDeviceDriver::SensorInfo info = GetSensorInfo( 0 );
 	if( info.IsValid() )
 	{
-		SetupSensorHistory( pSensor, info.m_sensorHistorySize, info.m_MaxAccessTimeInMs );
+		SetupSensorHistory( pSensor, (unsigned int)info.m_sensorHistorySize, info.m_MaxAccessTimeInMs );
 		pSensor->SetSensorName( info.m_sensorName );
 	}
 
@@ -554,7 +554,7 @@ bool VistaOpenCVCaptureDriver::DoConnect()
 	info = GetSensorInfo( 1 );
 	if( info.IsValid() )
 	{
-		SetupSensorHistory( pSensor, info.m_sensorHistorySize, info.m_MaxAccessTimeInMs );
+		SetupSensorHistory( pSensor, (unsigned int)info.m_sensorHistorySize, info.m_MaxAccessTimeInMs );
 		pSensor->SetSensorName( info.m_sensorName );
 	}
 
@@ -795,7 +795,7 @@ void VistaOpenCVCaptureDriver::OnUpdateMeasureSize()
 			                          history.m_nClientReadSize,
 			                          history.m_nDriverWriteSize,
 									  // this is the line that will change the memory
-			                          m_pParams->GetParameter<Parameters>()->GetMemorySize() );
+			                         (unsigned int)m_pParams->GetParameter<Parameters>()->GetMemorySize() );
 }
 
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVCaptureDriver/VistaOpenCVCaptureDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVCaptureDriver/VistaOpenCVCaptureDriver.h
index 752993bd18020caad864026c56353b7bdc62f7ca..2131ecf6ff5ef927e8bc9f7e9a4c5cc9cce7dbdc 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVCaptureDriver/VistaOpenCVCaptureDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVCaptureDriver/VistaOpenCVCaptureDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef __VISTAOPENCVCAPTUREDRIVER_H
 #define __VISTAOPENCVCAPTUREDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVCaptureDriver/VistaOpenCVCapturePlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVCaptureDriver/VistaOpenCVCapturePlugin.cpp
index 43bc74cbac1c2d7535e453997f24d934cd074025..913748f6001f375ad36450efb839ab5469424810 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVCaptureDriver/VistaOpenCVCapturePlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVCaptureDriver/VistaOpenCVCapturePlugin.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*============================================================================*/
 /* INCLUDES                                                                   */
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVCaptureDriver/VistaOpenCVCaptureTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVCaptureDriver/VistaOpenCVCaptureTranscoder.cpp
index 019eb5c10bd3f47d7920674252be58e902b078e5..e6acaaba574a1405d69ddb66778c29fb0b01af12 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVCaptureDriver/VistaOpenCVCaptureTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVCaptureDriver/VistaOpenCVCaptureTranscoder.cpp
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include <VistaDeviceDriversBase/VistaDeviceSensor.h>
 #include <VistaDeviceDriversBase/VistaDriverPlugDev.h>
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/FaceTrackTest/CMakeLists.txt b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/FaceTrackTest/CMakeLists.txt
index 67a6830bbd8ffc62bfeac9d5f1db7d7318703e8e..c7f0dc3b7b97d2b1ca84a8ad963b76963dc25f6f 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/FaceTrackTest/CMakeLists.txt
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/FaceTrackTest/CMakeLists.txt
@@ -1,5 +1,5 @@
-# $Id$
-# $Id$
+
+
 
 cmake_minimum_required( VERSION 2.8 )
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/FaceTrackTest/configfiles/keyboard.xml b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/FaceTrackTest/configfiles/keyboard.xml
index 4e5b8ef075ac797680c4cd79324ffb42560300e6..adc73bd3f5857981c9e7483709f935bc2cf31859 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/FaceTrackTest/configfiles/keyboard.xml
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/FaceTrackTest/configfiles/keyboard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
+
 <module>
 	<nodespace>
 	</nodespace>
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/FaceTrackTest/configfiles/ucp_facetrack.xml b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/FaceTrackTest/configfiles/ucp_facetrack.xml
index ccafa2d90f786700db69273626ab35ab5598fa61..398c36b603c546c0ed9bc0d39b69ae157e676d32 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/FaceTrackTest/configfiles/ucp_facetrack.xml
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/FaceTrackTest/configfiles/ucp_facetrack.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
+
 <module>
 	<nodespace>
 	</nodespace>
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/FaceTrackTest/configfiles/vista.ini b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/FaceTrackTest/configfiles/vista.ini
index 126368052be90c5bbb43a271c57b966786726008..bef52e67515e0ed4619a8532e3570b01a077545f 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/FaceTrackTest/configfiles/vista.ini
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/FaceTrackTest/configfiles/vista.ini
@@ -1,11 +1,11 @@
 #######################################################################
 #        V I S T A     I N I T I A L I Z A T I O N     F I L E        #
 #######################################################################
-# $Id: interaction_desktop.ini 20902 2011-04-18 08:29:52Z dr165799 $
+
 
 [SYSTEM]
 GRAPHICSSECTION	= GRAPHICS
-DRIVERPLUGINDIRS = ${VISTACORELIBS_DRIVER_PLUGIN_DIRS}
+DRIVERPLUGINDIRS = ${VISTACORELIBS_DRIVER_PLUGIN_DIRS}
 DEVICEDRIVERS = KEYBOARD, OPENCV
 INTERACTIONCONTEXTS = KEYCONTROL, OPENCV_CTX
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/FaceTrackTest/main.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/FaceTrackTest/main.cpp
index 6f615c9d610fdfa5cc083a4f16c44109b8fccdc1..18332492adfa5ae8f84aefc9267471ecd01fc849 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/FaceTrackTest/main.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/FaceTrackTest/main.cpp
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include <VistaKernel/VistaSystem.h>
 #include <VistaKernel/GraphicsManager/VistaGeometryFactory.h>
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/VistaOpenCVFaceTrackDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/VistaOpenCVFaceTrackDriver.cpp
index bb0a00ea8f31d1d92c4f3aee36de8111222279c0..66c61af01c0b33532b9a84a4ecaf4baeaba2194f 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/VistaOpenCVFaceTrackDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/VistaOpenCVFaceTrackDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaOpenCVFaceTrackDriver.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/VistaOpenCVFaceTrackDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/VistaOpenCVFaceTrackDriver.h
index 9f03d9467d69e9d34867919e4b5d195b39b544f3..5bc69e4ea7590c4bb609e55409e6d0aa22f97216 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/VistaOpenCVFaceTrackDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/VistaOpenCVFaceTrackDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef __VISTAOPENCVFACETRACKDRIVER_H
 #define __VISTAOPENCVFACETRACKDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/VistaOpenCVFaceTrackPlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/VistaOpenCVFaceTrackPlugin.cpp
index 2df2ee0bdd6ff30c90f4205803a07cf8d3e5cb74..29c82e66e8df2b06363ef1d24a4a455301d68c07 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/VistaOpenCVFaceTrackPlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/VistaOpenCVFaceTrackPlugin.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*============================================================================*/
 /* INCLUDES                                                                   */
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/VistaOpenCVFaceTrackTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/VistaOpenCVFaceTrackTranscoder.cpp
index d020df845693f536fccae1cfe157213ccb344ec2..61a38203dbecba1129472dd94c9cfb25ae7432f5 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/VistaOpenCVFaceTrackTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenCVFaceTrackDriver/VistaOpenCVFaceTrackTranscoder.cpp
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
-* $Id$
-*/
+
 
 #include <VistaDeviceDriversBase/VistaDeviceSensor.h>
 #include <VistaDeviceDriversBase/VistaDriverPlugDev.h>
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/CMakeLists.txt b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/CMakeLists.txt
index 6cec5f5e018ed41259c1e08e2591f2df01209b70..9b08a5830ca2ffb64430af6727e5c2afd1983316 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/CMakeLists.txt
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id$
+
 
 cmake_minimum_required( VERSION 2.8 )
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/KinectHandler.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/KinectHandler.cpp
index f16dee0c9f7aa67c5c05c3de06483c4fad501d20..a9d307b6fb605deb1391ad89fdbb16e2a090ff61 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/KinectHandler.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/KinectHandler.cpp
@@ -20,9 +20,7 @@
 /*                                                 All rights reserved.       */
 /*                                             .                              */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "KinectHandler.h" 
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/KinectHandler.h b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/KinectHandler.h
index 64fc75a5eaf54408ed3a7f26a33875c5c0a39393..99e8f83d12af478e1c3122825d072030f8ff6417 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/KinectHandler.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/KinectHandler.h
@@ -31,9 +31,7 @@
 /*        - CSpatialDfn : IVdfnActionObject                                   */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef __SPATIALDFN_H
 #define __SPATIALDFN_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/configfiles/keyboard.xml b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/configfiles/keyboard.xml
index 4e5b8ef075ac797680c4cd79324ffb42560300e6..adc73bd3f5857981c9e7483709f935bc2cf31859 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/configfiles/keyboard.xml
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/configfiles/keyboard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
+
 <module>
 	<nodespace>
 	</nodespace>
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/configfiles/navigator_spacenavigator.xml b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/configfiles/navigator_spacenavigator.xml
index 90b154c0dbc65f4a13368c7b149bf74a0720e8ad..204b3911d309e367fa6b737e260f94a2b4f20cb7 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/configfiles/navigator_spacenavigator.xml
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/configfiles/navigator_spacenavigator.xml
@@ -1,4 +1,4 @@
-<!-- $Id$ -->
+
 <module>
 	<nodespace>
 	</nodespace>
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/configfiles/spatial_kinect.xml b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/configfiles/spatial_kinect.xml
index 276b19ec46e5041a405fa859057a197c40173475..f2e9ab0e34a9474ef938949bea6b056055ef8c66 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/configfiles/spatial_kinect.xml
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/configfiles/spatial_kinect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
+
 <module>
 	<nodespace>
 	</nodespace>
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/configfiles/ucp_kinect.xml b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/configfiles/ucp_kinect.xml
index 597b1eed2525b3e8662ce35828e45e75beeccf13..17ed8dc4857dda56bfd100f77431715f3e3992f8 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/configfiles/ucp_kinect.xml
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/configfiles/ucp_kinect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
+
 <module>
 	<nodespace>
 	</nodespace>
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/configfiles/vista.ini b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/configfiles/vista.ini
index c0ce9f5f91d0edbddb6ae3d5a1bfbb3760006b7f..8a7088756cc2133046be0db3e170b8f22c50e7a6 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/configfiles/vista.ini
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/configfiles/vista.ini
@@ -1,7 +1,7 @@
 #######################################################################
 #        V I S T A     I N I T I A L I Z A T I O N     F I L E        #
 #######################################################################
-# $Id: interaction_desktop.ini 20902 2011-04-18 08:29:52Z dr165799 $
+
 [SYSTEM]
 GRAPHICSSECTION	= GRAPHICS
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/main.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/main.cpp
index cc998e4147657ecfd0d09c67d23d6cd64594c0a9..9f089eec87ade24e3db2fc528f1153daadf0c9b3 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/main.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/KinectTest/main.cpp
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "KinectHandler.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/VistaOpenNIDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/VistaOpenNIDriver.cpp
index 82d402e4fc6befaec64ee0695e69a435aa6bb354..badde24f2c8a8eb99f96f1bfed5545c9d0db5345 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/VistaOpenNIDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/VistaOpenNIDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaOpenNIDriver.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/VistaOpenNIDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/VistaOpenNIDriver.h
index 413cd145d2fac5e24c9181d2db256b2feee48469..3d70d6651e4669a8a5d7ab7e43d2a84b182caa0c 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/VistaOpenNIDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/VistaOpenNIDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef __VISTAOPENNIDRIVER_H
 #define __VISTAOPENNIDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/VistaOpenNIPlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/VistaOpenNIPlugin.cpp
index 39b2151d4f54c5b0ceba9600cb487dcaa93c7912..e525576dcb2c11abac428bfcef94fdbed34e6210 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/VistaOpenNIPlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/VistaOpenNIPlugin.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*============================================================================*/
 /* INCLUDES                                                                   */
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/VistaOpenNITranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/VistaOpenNITranscoder.cpp
index 9e08961750a77a01d6372af033ba6da2cd5e8cc2..8225fc9c6cb1d70b589f31b9d32d25662bff7d86 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/VistaOpenNITranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOpenNIDriver/VistaOpenNITranscoder.cpp
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 
 #include "VistaOpenNIDriver.h"
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOptitrackDriver/VistaOptitrackCommonShare.h b/VistaCoreLibs/VistaDeviceDrivers/VistaOptitrackDriver/VistaOptitrackCommonShare.h
index 83d5ffd5905b93ede2c0f63c6730273488207002..95ec50b78cb21b8a766d2242937567283a87e942 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOptitrackDriver/VistaOptitrackCommonShare.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOptitrackDriver/VistaOptitrackCommonShare.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaOptitrackCommonShare.h 40274 2014-01-29 09:59:23Z dr165799 $
+
 
 #ifndef _VISTAOPTITRACKCOMMONSHARE_H
 #define _VISTAOPTITRACKCOMMONSHARE_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOptitrackDriver/VistaOptitrackDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaOptitrackDriver/VistaOptitrackDriver.cpp
index b09987d1904726daadbcc1e352f0de2a06e471d2..2361b2978b0b63b75bc660752c3b025187728597 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOptitrackDriver/VistaOptitrackDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOptitrackDriver/VistaOptitrackDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaOptitrackDriver.cpp 42497 2014-06-11 16:10:03Z dr165799 $
+
 
 #include "VistaOptitrackDriver.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOptitrackDriver/VistaOptitrackDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaOptitrackDriver/VistaOptitrackDriver.h
index d81b13a38ba5ba6f58b77715ff7f8733641eb853..694011eb3b6d2da8de949ccc72491f7db2805b3b 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOptitrackDriver/VistaOptitrackDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOptitrackDriver/VistaOptitrackDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaOptitrackDriver.h 40274 2014-01-29 09:59:23Z dr165799 $
+
 
 #ifndef _VISTAOPTITRACKDRIVER_H
 #define _VISTAOPTITRACKDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOptitrackDriver/VistaOptitrackPlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaOptitrackDriver/VistaOptitrackPlugin.cpp
index d7461d7dc2ea53ec4d829e220a01791dabeac43d..4839483859f2f5f9583dacd068305f2895fbe64d 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOptitrackDriver/VistaOptitrackPlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOptitrackDriver/VistaOptitrackPlugin.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaOptitrackPlugin.cpp 40274 2014-01-29 09:59:23Z dr165799 $
+
 
 #include "VistaOptitrackDriver.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaOptitrackDriver/VistaOptitrackTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaOptitrackDriver/VistaOptitrackTranscoder.cpp
index cc69df81e6a627cddc3a7fcc5ba3f0d70984c12b..e9ef73912ecbaccdbf8dc431dab24e8f9e457f6c 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaOptitrackDriver/VistaOptitrackTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaOptitrackDriver/VistaOptitrackTranscoder.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaOptitrackTranscoder.cpp 46997 2015-01-15 13:08:07Z ps790413 $
+
 
 #include "VistaOptitrackCommonShare.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomDriver/VistaPhantomCommonShare.h b/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomDriver/VistaPhantomCommonShare.h
index f9c6520f9db7171347bc247f2bde464813749180..2258d0af479fbe934e5a25feb884ed7cc1c85b73 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomDriver/VistaPhantomCommonShare.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomDriver/VistaPhantomCommonShare.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAPHANTOMDRIVERCONFIG_H
 #define _VISTAPHANTOMDRIVERCONFIG_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomDriver/VistaPhantomDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomDriver/VistaPhantomDriver.cpp
index db0cc313e7fe16b9412de57f2215b02cc8fd3d6c..a032ba6ce5932bee00b7143f540007e77e4051a2 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomDriver/VistaPhantomDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomDriver/VistaPhantomDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaPhantomDriver.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomDriver/VistaPhantomDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomDriver/VistaPhantomDriver.h
index e358396b6f0ba9e5686a64c8af53ab256d1dc549..6e159f5c131afc567f101ac3530d9096a4d138d9 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomDriver/VistaPhantomDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomDriver/VistaPhantomDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef __VISTAPHANTOMDRIVER_H
 #define __VISTAPHANTOMDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomDriver/VistaPhantomPlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomDriver/VistaPhantomPlugin.cpp
index 995830be40d8e993a5696ee55a6c174ef939f777..25de90dc631c555ccb59049cdf662e04d95eee53 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomDriver/VistaPhantomPlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomDriver/VistaPhantomPlugin.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*============================================================================*/
 /* INCLUDES                                                                   */
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomDriver/VistaPhantomTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomDriver/VistaPhantomTranscoder.cpp
index 81335684b3155e5b828ddad06f33c7f4fda5b4b7..88b52963abed618f15f57a93c0ad08cd639383a8 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomDriver/VistaPhantomTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomDriver/VistaPhantomTranscoder.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*============================================================================*/
 /* INCLUDES                                                                   */
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomServerDriver/VistaPhantomServerCommonShare.h b/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomServerDriver/VistaPhantomServerCommonShare.h
index 3ab052c1704fcb4d6e4d5eacc072b33e502b7c10..7fda6d0b2e34cd755d4ee37905e9c902192a6d1d 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomServerDriver/VistaPhantomServerCommonShare.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomServerDriver/VistaPhantomServerCommonShare.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAPHANTOMDRIVERCONFIG_H
 #define _VISTAPHANTOMDRIVERCONFIG_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomServerDriver/VistaPhantomServerDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomServerDriver/VistaPhantomServerDriver.cpp
index 599ff30200ab50b667c541e8d62418e11fc35e4c..d7bbd8575eb51ad494d2ef6f492502703ed373ae 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomServerDriver/VistaPhantomServerDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomServerDriver/VistaPhantomServerDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaPhantomServerDriver.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomServerDriver/VistaPhantomServerDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomServerDriver/VistaPhantomServerDriver.h
index e5117744d818c4fc03bebbb69f2eef3e9b9603d4..d650850447ab69cb08e88ee84f05c486faeeac7a 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomServerDriver/VistaPhantomServerDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomServerDriver/VistaPhantomServerDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAPHANTOMSERVERDRIVER_H
 #define _VISTAPHANTOMSERVERDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomServerDriver/VistaPhantomServerPlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomServerDriver/VistaPhantomServerPlugin.cpp
index 5785a78f43d2f78925d4d1142ba6e91de295a699..c73e4d2faa4f0b5b4b38fe2839aeab875995db53 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomServerDriver/VistaPhantomServerPlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomServerDriver/VistaPhantomServerPlugin.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaPhantomServerDriver.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomServerDriver/VistaPhantomServerTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomServerDriver/VistaPhantomServerTranscoder.cpp
index ba371bacf5a3621f2dbfabb485ace419635955e9..5791e5c07c0ac25c485c623473e7e827f70c1115 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomServerDriver/VistaPhantomServerTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaPhantomServerDriver/VistaPhantomServerTranscoder.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaDeviceDriversBase/VistaDeviceSensor.h>
 #include <VistaDeviceDriversBase/VistaDriverPlugDev.h>
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaSixenseDriver/VistaSixenseCommonShare.h b/VistaCoreLibs/VistaDeviceDrivers/VistaSixenseDriver/VistaSixenseCommonShare.h
index 42b68c662b195b1020ac74cc4b5951a2d81bacf0..9a81fa88edda02863aa9eb68af9d829f749981e4 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaSixenseDriver/VistaSixenseCommonShare.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaSixenseDriver/VistaSixenseCommonShare.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaSixenseCommonShare.h 29645 2012-03-22 18:08:40Z dr165799 $
+
 
 #ifndef _VISTASIXENSECOMMONSHARE_H
 #define _VISTASIXENSECOMMONSHARE_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaSixenseDriver/VistaSixenseDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaSixenseDriver/VistaSixenseDriver.cpp
index b0aa687230fe49ae410fedccd87e423d676735c5..fb79bd4a0ecedc31875531ca2c0c6a9b7b90b1f5 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaSixenseDriver/VistaSixenseDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaSixenseDriver/VistaSixenseDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaSixenseDriver.cpp 31564 2012-08-13 15:41:17Z dr165799 $
+
 
 #include "VistaSixenseDriver.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaSixenseDriver/VistaSixenseDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaSixenseDriver/VistaSixenseDriver.h
index 901fb8067a558e7df601cd2bcd05e337c10a4744..e936b514813f71f5538a2d029829488e6a966967 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaSixenseDriver/VistaSixenseDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaSixenseDriver/VistaSixenseDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaSixenseDriver.h 29136 2012-02-08 09:35:49Z dr165799 $
+
 
 #ifndef _VISTASIXENSEDRIVER_H
 #define _VISTASIXENSEDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaSixenseDriver/VistaSixensePlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaSixenseDriver/VistaSixensePlugin.cpp
index 763e71407e1f97e001c75822eaec9c60d7ae6dab..8f3b51badf21188ead3f3d6230c7a73e430de779 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaSixenseDriver/VistaSixensePlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaSixenseDriver/VistaSixensePlugin.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaSixensePlugin.cpp 29136 2012-02-08 09:35:49Z dr165799 $
+
 
 #include "VistaSixenseDriver.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaSixenseDriver/VistaSixenseTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaSixenseDriver/VistaSixenseTranscoder.cpp
index 5c2234c6b2c6cfc218c8ad65afb938998e361a1b..57943d40d0429512a4e070362f553b509cdb4924 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaSixenseDriver/VistaSixenseTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaSixenseDriver/VistaSixenseTranscoder.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaSixenseTranscoder.cpp 30800 2012-06-26 07:22:40Z dr165799 $
+
 
 #include "VistaSixenseCommonShare.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceMouseDriver/VistaSpaceMouseCommonShare.h b/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceMouseDriver/VistaSpaceMouseCommonShare.h
index 89bc33f765db04e85f18226657cbb6036f8ca64d..0d6396583e799588afe0d3428e24a7a2724738be 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceMouseDriver/VistaSpaceMouseCommonShare.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceMouseDriver/VistaSpaceMouseCommonShare.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASPACEMOUSEDRIVERCONFIG_H
 #define _VISTASPACEMOUSEDRIVERCONFIG_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceMouseDriver/VistaSpaceMouseDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceMouseDriver/VistaSpaceMouseDriver.cpp
index 97b952ffb64546097c6cb48f04fd8d67b963cb2a..8134e15eb03eb2a52e042a017a09a3c084ae6361 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceMouseDriver/VistaSpaceMouseDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceMouseDriver/VistaSpaceMouseDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaSpaceMouseDriver.h"
 #include "VistaSpaceMouseCommonShare.h"
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceMouseDriver/VistaSpaceMouseDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceMouseDriver/VistaSpaceMouseDriver.h
index 0f5865b602fe55225b9b1a40b160369203b186e5..d726dcb31caadc471ae30f28177ea9823e18d048 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceMouseDriver/VistaSpaceMouseDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceMouseDriver/VistaSpaceMouseDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASPACEMOUSEDRIVER_H
 #define _VISTASPACEMOUSEDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceMouseDriver/VistaSpaceMousePlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceMouseDriver/VistaSpaceMousePlugin.cpp
index a9a9e7bd8355ecb111a65e5329284ccb57f01248..3ac5c793b92505da342143bd71af30c0a5e41af3 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceMouseDriver/VistaSpaceMousePlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceMouseDriver/VistaSpaceMousePlugin.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(WIN32) && !defined(VISTASPACEMOUSEDRIVERPLUGIN_STATIC)
 	#ifdef VISTASPACEMOUSEPLUGIN_EXPORTS
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceMouseDriver/VistaSpaceMouseTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceMouseDriver/VistaSpaceMouseTranscoder.cpp
index 6db4b9d722c587731f120ae9b5c5754450fde773..92008e9b7cc575161bcb45bfc1579066e4a5c8a1 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceMouseDriver/VistaSpaceMouseTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceMouseDriver/VistaSpaceMouseTranscoder.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaDeviceDriversBase/VistaDeviceSensor.h>
 #include <VistaDeviceDriversBase/VistaDriverPlugDev.h>
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceNavigatorDriver/VistaSpaceNavigatorDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceNavigatorDriver/VistaSpaceNavigatorDriver.cpp
index 9e18dc0f28d11ddb9969a1ec37cf9c00dc8ce0dd..44f52537e8df5d1e037615560e2125b47e369258 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceNavigatorDriver/VistaSpaceNavigatorDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceNavigatorDriver/VistaSpaceNavigatorDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*
 #if !defined(_isnan)
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceNavigatorDriver/VistaSpaceNavigatorDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceNavigatorDriver/VistaSpaceNavigatorDriver.h
index 651727e33c80cb1c1fd078674475217d623d2a55..7521ccde12ace4b3f5941de51b9f2811f5f99bdd 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceNavigatorDriver/VistaSpaceNavigatorDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceNavigatorDriver/VistaSpaceNavigatorDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef __VISTASPACENAVIGATORDRIVER_H
 #define __VISTASPACENAVIGATORDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceNavigatorDriver/VistaSpaceNavigatorPlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceNavigatorDriver/VistaSpaceNavigatorPlugin.cpp
index 9cecabebe937c86a6bfe850d98cc800e471549be..43036a1f639c671d9dac4ffa2b0f2143816d00d8 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceNavigatorDriver/VistaSpaceNavigatorPlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceNavigatorDriver/VistaSpaceNavigatorPlugin.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*============================================================================*/
 /* INCLUDES                                                                   */
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceNavigatorDriver/VistaSpaceNavigatorTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceNavigatorDriver/VistaSpaceNavigatorTranscoder.cpp
index a9af7522fce9bbcf62b715a3485774300f0663f7..f6c376f1c1d7d36056b80165d4c04118ce0910d6 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceNavigatorDriver/VistaSpaceNavigatorTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaSpaceNavigatorDriver/VistaSpaceNavigatorTranscoder.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*============================================================================*/
 /* MACROS AND DEFINES, CONSTANTS AND STATICS, FUNCTION-PROTOTYPES             */
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaVRPNDriver/VistaVRPNDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaVRPNDriver/VistaVRPNDriver.cpp
index c61e2cc513ec9fb2f5773dda74c6d7d4117fcea9..be4cb4cccc8d8a11b9d984d5d1f6d696b4a1b575 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaVRPNDriver/VistaVRPNDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaVRPNDriver/VistaVRPNDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaVRPNDriver.h"
 #include <VistaDeviceDriversBase/DriverAspects/VistaDriverInfoAspect.h>
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaVRPNDriver/VistaVRPNDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaVRPNDriver/VistaVRPNDriver.h
index 670822a3bff2b7d34b5cc3ac6a047c2ce30ec0cd..4bcfe557f988a065ce1e750ae419a7927bcbcbb6 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaVRPNDriver/VistaVRPNDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaVRPNDriver/VistaVRPNDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef __VISTAVRPNRIVER_H
 #define __VISTAVRPNRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaVRPNDriver/VistaVRPNPlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaVRPNDriver/VistaVRPNPlugin.cpp
index bbbab5fe7f09924077ded971c2e9a9ade2d56551..415812578596bd00142388112094039acfcc4148 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaVRPNDriver/VistaVRPNPlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaVRPNDriver/VistaVRPNPlugin.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*============================================================================*/
 /* INCLUDES                                                                   */
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaVRPNDriver/VistaVRPNTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaVRPNDriver/VistaVRPNTranscoder.cpp
index 91f82eedb006e2cf0cb3356c39ce8b3953deb004..563d3e2a8f695fe776b243cbfc888ec0cc5ed22f 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaVRPNDriver/VistaVRPNTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaVRPNDriver/VistaVRPNTranscoder.cpp
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 
 #include <VistaDeviceDriversBase/VistaDeviceSensor.h>
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaWiimoteDriver/VistaWiimoteCommonShare.h b/VistaCoreLibs/VistaDeviceDrivers/VistaWiimoteDriver/VistaWiimoteCommonShare.h
index 4b5f6347ef61e7b15bc0d084f055ba86b63fc157..f509bfc0c918507b73f0f7937a9e73f48ee9f205 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaWiimoteDriver/VistaWiimoteCommonShare.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaWiimoteDriver/VistaWiimoteCommonShare.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAWIIMOTEDRIVERCOMMONSHARE_H_
 #define _VISTAWIIMOTEDRIVERCOMMONSHARE_H_
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaWiimoteDriver/VistaWiimoteDriver.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaWiimoteDriver/VistaWiimoteDriver.cpp
index 8e91101645d5eab5d6056b6fc95574e4e1bb0475..cd7fe901b6c9017f58c01cc1edee91179f926b25 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaWiimoteDriver/VistaWiimoteDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaWiimoteDriver/VistaWiimoteDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 #include "VistaWiimoteDriver.h"
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaWiimoteDriver/VistaWiimoteDriver.h b/VistaCoreLibs/VistaDeviceDrivers/VistaWiimoteDriver/VistaWiimoteDriver.h
index 72e4bbc1655885bf7e039234e1c4ced2dd3c3a9d..fff70fa42aec18ba1c2a49588a6300f27c41a1ae 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaWiimoteDriver/VistaWiimoteDriver.h
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaWiimoteDriver/VistaWiimoteDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef __VISTAWIIMOTEDRIVER_H
 #define __VISTAWIIMOTEDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaWiimoteDriver/VistaWiimotePlugin.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaWiimoteDriver/VistaWiimotePlugin.cpp
index 85afdb988fe57c8d52e895dfd2b9093e022e86d9..56d4d14053c4f521c7945a2b978fd555e9a4471c 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaWiimoteDriver/VistaWiimotePlugin.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaWiimoteDriver/VistaWiimotePlugin.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*============================================================================*/
 /* INCLUDES                                                                   */
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaWiimoteDriver/VistaWiimoteTranscoder.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaWiimoteDriver/VistaWiimoteTranscoder.cpp
index a20f7ea3f0a61b353f587a68b1ca9cc4fe1a54cb..16201daa0dfc205bf1377c482d1b53341055cf45 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaWiimoteDriver/VistaWiimoteTranscoder.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaWiimoteDriver/VistaWiimoteTranscoder.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*============================================================================*/
 /* MACROS AND DEFINES, CONSTANTS AND STATICS, FUNCTION-PROTOTYPES             */
diff --git a/VistaCoreLibs/VistaDeviceDrivers/VistaWiimoteDriver/WiimoteTest/main.cpp b/VistaCoreLibs/VistaDeviceDrivers/VistaWiimoteDriver/WiimoteTest/main.cpp
index f8ae048375a1d482de04e4e144cd08fa02a4b17a..b32a8d7c008fd28a27bea345824cd3f79b386016 100644
--- a/VistaCoreLibs/VistaDeviceDrivers/VistaWiimoteDriver/WiimoteTest/main.cpp
+++ b/VistaCoreLibs/VistaDeviceDrivers/VistaWiimoteDriver/WiimoteTest/main.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaInterProcComm/DataLaVista/Common/VistaPentiumBasedRTC.h>
 #include <VistaDeviceDrivers/WiimoteDriver/VistaWiimoteDriver.h>
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/CMakeLists.txt b/VistaCoreLibs/VistaDeviceDriversBase/CMakeLists.txt
index 6b49e577dd1c4b78614bbf2bdc246fe0341ade06..ac9ffd798aafb3750ed68ed49e1b64ddf02e8974 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/CMakeLists.txt
+++ b/VistaCoreLibs/VistaDeviceDriversBase/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id$
+
 
 vista_adopt_version( VistaDeviceDriversBase VistaCoreLibs )
 
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDeviceDriverAspectRegistry.cpp b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDeviceDriverAspectRegistry.cpp
index 71caafdc5aa8065bd8bd523bfaa57bfff463eea9..8ee82137866f84e8eeed669c47b3937effe018b6 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDeviceDriverAspectRegistry.cpp
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDeviceDriverAspectRegistry.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDeviceDriverAspectRegistry.h" 
 
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDeviceDriverAspectRegistry.h b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDeviceDriverAspectRegistry.h
index c4c58371ddd3dd80a8c14b6aeeb6c6b180c6095c..531d54863c4f4f9d8d751d07bae94253af94bcce 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDeviceDriverAspectRegistry.h
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDeviceDriverAspectRegistry.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADEVICEDRIVERASPECTREGISTRY_H
 #define _VISTADEVICEDRIVERASPECTREGISTRY_H
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDeviceIdentificationAspect.cpp b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDeviceIdentificationAspect.cpp
index cd34d3eeadc99484109d652d54a52b8e08b385da..a280c7aaa7a045a81f1d2abff201f0812410b999 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDeviceIdentificationAspect.cpp
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDeviceIdentificationAspect.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDeviceIdentificationAspect.h" 
 #include "VistaDeviceDriverAspectRegistry.h"
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDeviceIdentificationAspect.h b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDeviceIdentificationAspect.h
index 3a49c8669723760fa8606c5d6f8259c8f0923d47..5f6e0f67abb51d5d36251d48c2058cbb9fc5e92e 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDeviceIdentificationAspect.h
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDeviceIdentificationAspect.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADEVICEIDENTIFICATIONASPECT_H
 #define _VISTADEVICEIDENTIFICATIONASPECT_H
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverAbstractWindowAspect.cpp b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverAbstractWindowAspect.cpp
index 132fddd19990654350fccce6d0c28b7e6f281e8b..930fd33af7c65c8c3b3133d965a1c7d8f9133f49 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverAbstractWindowAspect.cpp
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverAbstractWindowAspect.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDriverAbstractWindowAspect.h" 
 #include "VistaDeviceDriverAspectRegistry.h"
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverAbstractWindowAspect.h b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverAbstractWindowAspect.h
index fe2eed41040501407697f73a75e5f0395ed6f16a..90438f75b24ba55cb7edcc9c03496a425cee7ef5 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverAbstractWindowAspect.h
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverAbstractWindowAspect.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADRIVERABSTRACTWINDOWASPECT_H
 #define _VISTADRIVERABSTRACTWINDOWASPECT_H
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverConnectionAspect.cpp b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverConnectionAspect.cpp
index d6b5051ca968adfcd39e9d8e4a505786872ea6b1..7c361e57558906375dc55cffc626019995d1be02 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverConnectionAspect.cpp
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverConnectionAspect.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDriverConnectionAspect.h"
 #include <VistaInterProcComm/Connections/VistaConnection.h>
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverConnectionAspect.h b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverConnectionAspect.h
index 48806b816c065dd71d02ab3f6e345e7a1ffcc290..e80d183de5cce65c56f7aff36dea8bc1b5a5c0e1 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverConnectionAspect.h
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverConnectionAspect.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADRIVERCONNECTIONASPECT_H
 #define _VISTADRIVERCONNECTIONASPECT_H
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverEnableAspect.cpp b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverEnableAspect.cpp
index a06fdc13c0a837aff9e6029443298cceac01cf10..c6010a8c0f87ef1dc74629491f9fd9359e92b221 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverEnableAspect.cpp
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverEnableAspect.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaDriverEnableAspect.cpp 40274 2014-01-29 09:59:23Z dr165799 $
+
 
 #include "VistaDriverEnableAspect.h" 
 #include "VistaDeviceDriverAspectRegistry.h"
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverEnableAspect.h b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverEnableAspect.h
index e6063aa9a969deb41ad284e14655a3836d8e6849..9bf129306dd773564f93a06a7717e85c522f1378 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverEnableAspect.h
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverEnableAspect.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaDriverEnableAspect.h 40274 2014-01-29 09:59:23Z dr165799 $
+
 
 #ifndef _VISTADRIVERENABLEASPECT_H
 #define _VISTADRIVERENABLEASPECT_H
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverForceFeedbackAspect.cpp b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverForceFeedbackAspect.cpp
index b46f4a3e781324083758f09f9c306eb4c132619c..1ff97d1dd18199fbf631514d63eb75e2211fff7c 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverForceFeedbackAspect.cpp
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverForceFeedbackAspect.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDriverForceFeedbackAspect.h"
 #include "VistaDeviceDriverAspectRegistry.h"
@@ -28,6 +28,7 @@
 #include "VistaDriverMeasureHistoryAspect.h"
 
 #include <VistaDeviceDriversBase/VistaDeviceSensor.h>
+#include <VistaDeviceDriversBase/VistaSensorReadState.h>
 #include <VistaInterProcComm/Concurrency/VistaMutex.h>
 #include <VistaMath/VistaGeometries.h>
 #include <VistaBase/VistaTimer.h>
@@ -109,6 +110,7 @@ IVistaDriverForceFeedbackAspect::IForceAlgorithm::IForceAlgorithm( unsigned int
 : m_pSensor( new VistaDeviceSensor ),
   m_pHistoryAspect( new VistaDriverMeasureHistoryAspect(~0) )
 {
+	m_pReadState = new VistaSensorReadState( m_pSensor, false );
 	m_pHistoryAspect->RegisterSensor( m_pSensor );
 
 	// ok, this is kindof a wild guess
@@ -124,14 +126,15 @@ IVistaDriverForceFeedbackAspect::IForceAlgorithm::~IForceAlgorithm()
 {
 	m_pHistoryAspect->UnregisterSensor( m_pSensor );
 	delete m_pSensor;
+	delete m_pReadState;
 	delete m_pHistoryAspect;
 }
 
 
-bool IVistaDriverForceFeedbackAspect::IForceAlgorithm::Publish( VistaSensorReadState &readState )
+bool IVistaDriverForceFeedbackAspect::IForceAlgorithm::Publish()
 {
 	// adjust read head
-	return m_pSensor->ActivateMeasures( readState );
+	return m_pReadState->SetToLatestSample();
 }
 
 bool IVistaDriverForceFeedbackAspect::IForceAlgorithm::UpdateForce( 
@@ -150,9 +153,8 @@ bool IVistaDriverForceFeedbackAspect::IForceAlgorithm::UpdateForce(
 
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-VistaPlaneConstraint::VistaPlaneConstraint( VistaSensorReadState &readState )
+VistaPlaneConstraint::VistaPlaneConstraint()
 : IVistaDriverForceFeedbackAspect::IForceAlgorithm( sizeof( _sPlane ) )
-, m_readState(readState)
 {
 
 }
@@ -167,8 +169,7 @@ bool VistaPlaneConstraint::UpdateForce( double dTs, const VistaVector3D &v3Curre
 		          VistaVector3D   &v3ResultingForce,
 		          VistaVector3D &v3ResultingTorque)
 {
-	const VistaMeasureHistory &hist = m_pSensor->GetMeasures();
-	const VistaSensorMeasure *pM    = hist.GetCurrentRead( m_readState );
+	const VistaSensorMeasure *pM    = m_pReadState->GetCurrentMeasure();
 	if(pM == NULL)
 		return false; // no new constraint, no forces
 	const _sPlane *pPlane = pM->getRead< _sPlane >();
@@ -240,12 +241,11 @@ bool VistaPlaneConstraint::SetConstraintPlane(  const VistaVector3D &v3ToOrigin,
 	pPlane->m_nDamping = nDamping;
 
 	m_pHistoryAspect->MeasureStop(m_pSensor); // mark stop
-	m_pSensor->SetUpdateTimeStamp( dTimeStamp );
 
 	// ok, we are done, let's publish to the driver immediately!
 	// this is ok, as with the ff-aspect and constraint model, we have a 1:1 reader / writer
 	// so we do not need to wait for other conditions, besides... no one else can access the
 	// driver / history and stuff (by design: this method is not reentrant)
-	return Publish( m_readState );
+	return Publish();
 }
 
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverForceFeedbackAspect.h b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverForceFeedbackAspect.h
index 0a066d4b32bb590165caaf80e57585de86a8c956..85451223bf1ded5f05a05ba9de45ec5863e7e762 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverForceFeedbackAspect.h
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverForceFeedbackAspect.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADRIVERFORCEFEEDBACKASPECT_H
 #define _VISTADRIVERFORCEFEEDBACKASPECT_H
@@ -185,9 +185,10 @@ public:
 		 *  call publish once done with the update of the writeout.
          * @return true iff the data was published to the ''writer''
 		 */
-		bool Publish( VistaSensorReadState &readState );
+		bool Publish();
 
 		VistaDriverMeasureHistoryAspect *m_pHistoryAspect; /**< low level access to the parameter storage */
+		VistaSensorReadState* m_pReadState; /**<ReadState for History>**/
 		VistaDeviceSensor *m_pSensor; /**< low level access to the parameter storage */
 	private:
 
@@ -238,7 +239,7 @@ class VISTADEVICEDRIVERSAPI VistaPlaneConstraint
 : public IVistaDriverForceFeedbackAspect::IForceAlgorithm
 {
 public:
-	VistaPlaneConstraint( VistaSensorReadState & );
+	VistaPlaneConstraint();
     virtual ~VistaPlaneConstraint();
 
 	/**
@@ -281,8 +282,5 @@ private:
 		float m_nStiffness;
 		float m_nDamping;
 	};
-	
-	VistaSensorReadState &m_readState;
-
 };
 #endif //_VISTADRIVERFORCEFEEDBACKASPECT_H
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverGenericParameterAspect.cpp b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverGenericParameterAspect.cpp
index eca945adc13a371cd08c8b44199388e98db1b3c3..e730a378ca35b4eed80e92927a4a74227f1ffe93 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverGenericParameterAspect.cpp
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverGenericParameterAspect.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDriverGenericParameterAspect.h"
 #include "VistaDeviceDriverAspectRegistry.h"
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverGenericParameterAspect.h b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverGenericParameterAspect.h
index 4711e84b9ce5697b8f51940ecb99d878a96343b3..420e61b2da9dfda431ba2ead5b867b4c70297dd7 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverGenericParameterAspect.h
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverGenericParameterAspect.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADRIVERGENERICPARAMETERASPECT_H
 #define _VISTADRIVERGENERICPARAMETERASPECT_H
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverInfoAspect.cpp b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverInfoAspect.cpp
index ef7f16aae52074f4303d1c6ecc96f051a372622d..3c4ef604944b6f1b23c9f57f7ede2b5251fff822 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverInfoAspect.cpp
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverInfoAspect.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDriverInfoAspect.h" 
 #include "VistaDeviceDriverAspectRegistry.h"
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverInfoAspect.h b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverInfoAspect.h
index 849981d4176c131fffef30d2ade3c42eb70fec33..a8859eacf60de585b1e2fd281c7e223fadc1804a 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverInfoAspect.h
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverInfoAspect.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADRIVERINFOASPECT_H
 #define _VISTADRIVERINFOASPECT_H
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverLoggingAspect.cpp b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverLoggingAspect.cpp
index a73a34d949db5482e35cc7d7ad1505d1d493f190..d022d8fc9a804d5ff7d0309cd83d60efe136a33b 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverLoggingAspect.cpp
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverLoggingAspect.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDriverLoggingAspect.h" 
 #include <VistaDeviceDriversBase/VistaDeviceDriver.h>
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverLoggingAspect.h b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverLoggingAspect.h
index 46c630a7238331731c6c092e336965eb2f971d41..d525673765c717a593b17dca38521784439ebe87 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverLoggingAspect.h
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverLoggingAspect.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADRIVERLOGGINGASPECT_H
 #define _VISTADRIVERLOGGINGASPECT_H
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverMeasureHistoryAspect.cpp b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverMeasureHistoryAspect.cpp
index e13697b0c9f9edbc6721f6f6690267f0c042b6e8..525d5a475703cf16e00189549136ced61ef76605 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverMeasureHistoryAspect.cpp
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverMeasureHistoryAspect.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDriverMeasureHistoryAspect.h"
 #include "VistaDeviceDriverAspectRegistry.h"
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverMeasureHistoryAspect.h b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverMeasureHistoryAspect.h
index 6dc587b8da8fa6d607491ea4c935cbd72fa24abc..622056bd1a9a46ab9f75eb45b06f4f8ad863caea 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverMeasureHistoryAspect.h
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverMeasureHistoryAspect.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADRIVERMEASUREHISTORYASPECT_H
 #define _VISTADRIVERMEASUREHISTORYASPECT_H
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverProtocolAspect.cpp b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverProtocolAspect.cpp
index 3489ec144b93775e491ec920935266bfb7afef5f..afc43a702a52779142ce3c9775b77d9c791f5c60 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverProtocolAspect.cpp
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverProtocolAspect.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDriverProtocolAspect.h"
 #include "VistaDeviceDriverAspectRegistry.h"
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverProtocolAspect.h b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverProtocolAspect.h
index 9074147a272baafc0979a158471c6c0ff925056c..b4c13dd76b59bca1c18cd7c50eed3b7e36cdb9af 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverProtocolAspect.h
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverProtocolAspect.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADRIVERPROTOCOLASPECT_H
 #define _VISTADRIVERPROTOCOLASPECT_H
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverReferenceFrameAspect.cpp b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverReferenceFrameAspect.cpp
index 5af6df6c81c2dde3548d052260f5be2af7fd1c08..f4b2a09f5474c0dc8189169ab2c94d29ca3842ca 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverReferenceFrameAspect.cpp
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverReferenceFrameAspect.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDriverReferenceFrameAspect.h" 
 #include "VistaDeviceDriverAspectRegistry.h"
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverReferenceFrameAspect.h b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverReferenceFrameAspect.h
index 7232621101e765439ea116ecca6bdfbd7f8797cf..6a7f02b62f678b0ff3164070f03fc24654a62f79 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverReferenceFrameAspect.h
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverReferenceFrameAspect.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADRIVERREFERENCEFRAMEASPECT_H
 #define _VISTADRIVERREFERENCEFRAMEASPECT_H
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverSensorMappingAspect.cpp b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverSensorMappingAspect.cpp
index 29cce68ec3bb9d31ac6cc22f1305f6173a95612a..dc318bd4570769e6adce80abe5fd6a9dcf7391ac 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverSensorMappingAspect.cpp
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverSensorMappingAspect.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDriverSensorMappingAspect.h"
 #include "VistaDeviceDriverAspectRegistry.h"
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverSensorMappingAspect.h b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverSensorMappingAspect.h
index 4566eab8c149f14a329b8040cfcf4bf96de9eca8..4c9231d60ff9260505b4bbda477086bdc6bacb7c 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverSensorMappingAspect.h
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverSensorMappingAspect.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADRIVERSENSORMAPPINGASPECT_H
 #define _VISTADRIVERSENSORMAPPINGASPECT_H
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverThreadAspect.cpp b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverThreadAspect.cpp
index ede3253edd2d3d542110074c2efc4c755cef13d7..f0b92d69c15e8c99a1cc42d402f5f50c55919c0f 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverThreadAspect.cpp
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverThreadAspect.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDriverThreadAspect.h"
 #include "VistaDeviceDriverAspectRegistry.h"
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverThreadAspect.h b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverThreadAspect.h
index b86d41bd5e3dcc0c50d8bbb687092c411485ef54..0bcf3270b2270c8669e28f89e6bcce856b6a4cb5 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverThreadAspect.h
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverThreadAspect.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADRIVERTHREADASPECT_H
 #define _VISTADRIVERTHREADASPECT_H
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverWorkspaceAspect.cpp b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverWorkspaceAspect.cpp
index f6aacd6aa380e7d8dd399f5138620f6c3d8d6c86..dba01d808ea346ed19cb1d2b5282045ed6b937bd 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverWorkspaceAspect.cpp
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverWorkspaceAspect.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDriverWorkspaceAspect.h" 
 #include "VistaDeviceDriverAspectRegistry.h"
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverWorkspaceAspect.h b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverWorkspaceAspect.h
index 3eff347b248f79b4f25c6b22dad0cf0cd7007a46..56867fb544a7d0f70bb787878da1a2e73a1e0616 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverWorkspaceAspect.h
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/VistaDriverWorkspaceAspect.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADRIVERWORKSPACEASPECT_H
 #define _VISTADRIVERWORKSPACEASPECT_H
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/_SourceFiles.cmake b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/_SourceFiles.cmake
index 38efe56c889ec01d18e8b2b6742e71941b76e311..a790c7b2db747aa80d7e5b536b7e2185f6de2171 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaDeviceDriversBase/DriverAspects/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id:$
+
 
 set( RelativeDir "./DriverAspects" )
 set( RelativeSourceGroup "Source Files\\DriverAspects" )
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/Drivers/VistaKeyboardDriver.cpp b/VistaCoreLibs/VistaDeviceDriversBase/Drivers/VistaKeyboardDriver.cpp
index 4c29d27e15fc32e6753471f6068eecc828494b7f..b9f184b1ebdbcb3c7a5b55967ea7155a2d379517 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/Drivers/VistaKeyboardDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDriversBase/Drivers/VistaKeyboardDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaKeyboardDriver.h"
 #include <VistaDeviceDriversBase/VistaDeviceSensor.h>
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/Drivers/VistaKeyboardDriver.h b/VistaCoreLibs/VistaDeviceDriversBase/Drivers/VistaKeyboardDriver.h
index eab5520e39374693e5f2d6febf665329d0d6a923..e3f9b8f2235bf07d5759f51c0eff40388efcb764 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/Drivers/VistaKeyboardDriver.h
+++ b/VistaCoreLibs/VistaDeviceDriversBase/Drivers/VistaKeyboardDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAKEYBOARDDRIVER_H
 #define _VISTAKEYBOARDDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/Drivers/VistaMouseDriver.cpp b/VistaCoreLibs/VistaDeviceDriversBase/Drivers/VistaMouseDriver.cpp
index 6b56d1214a4a7d8e3d22d799ed21e266bbe8f0d9..baa521286ea31d6f4a4c742895d91c601099693c 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/Drivers/VistaMouseDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDriversBase/Drivers/VistaMouseDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaMouseDriver.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/Drivers/VistaMouseDriver.h b/VistaCoreLibs/VistaDeviceDriversBase/Drivers/VistaMouseDriver.h
index 6980972fb67f4b8a0954fa8347170374ef753d70..54e3a8249454993e121c74c6de897704b707b5c2 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/Drivers/VistaMouseDriver.h
+++ b/VistaCoreLibs/VistaDeviceDriversBase/Drivers/VistaMouseDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAMOUSEDRIVER_H
 #define _VISTAMOUSEDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/Drivers/VistaShallowDriver.cpp b/VistaCoreLibs/VistaDeviceDriversBase/Drivers/VistaShallowDriver.cpp
index 973dc256c513f0b5f9a1e892f3baedfec5b9410b..81ff1a9fe2cc7f138fe3d091bb190eed898c5820 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/Drivers/VistaShallowDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDriversBase/Drivers/VistaShallowDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaShallowDriver.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/Drivers/VistaShallowDriver.h b/VistaCoreLibs/VistaDeviceDriversBase/Drivers/VistaShallowDriver.h
index 1732281838b754c76a7acea107bbed6f0c52ef77..e77cc48436ff5611e67ba47aaa56beb8bbe3fe33 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/Drivers/VistaShallowDriver.h
+++ b/VistaCoreLibs/VistaDeviceDriversBase/Drivers/VistaShallowDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASHALLOWDRIVER_H
 #define _VISTASHALLOWDRIVER_H
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/Drivers/_SourceFiles.cmake b/VistaCoreLibs/VistaDeviceDriversBase/Drivers/_SourceFiles.cmake
index db3251bba1276ecb51b0a2fcd051d2d9c1a40728..d38089632d8a968909d22e45b3b1eab0dd3ae2a8 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/Drivers/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaDeviceDriversBase/Drivers/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "./Drivers" )
 set( RelativeSourceGroup "Source Files\\Drivers" )
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/VistaConnectionUpdater.cpp b/VistaCoreLibs/VistaDeviceDriversBase/VistaConnectionUpdater.cpp
index 9f3d5cce8ff250ecad9f663182b5fdd51b6300f1..db0872694ce5fd42c068001517147b019b1f8718 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/VistaConnectionUpdater.cpp
+++ b/VistaCoreLibs/VistaDeviceDriversBase/VistaConnectionUpdater.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaConnectionUpdater.h" 
 
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/VistaConnectionUpdater.h b/VistaCoreLibs/VistaDeviceDriversBase/VistaConnectionUpdater.h
index e9b1215dc71d1f801318ad1ec3cbc4b797f2e1e6..e74dea3e93bcb4758b9c4915e9445ed7aaddccf3 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/VistaConnectionUpdater.h
+++ b/VistaCoreLibs/VistaDeviceDriversBase/VistaConnectionUpdater.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTACONECTIONUPDATER_H
 #define _VISTACONECTIONUPDATER_H
@@ -30,6 +30,7 @@
 /* INCLUDES                                                                   */
 /*============================================================================*/
 #include "VistaDeviceDriversConfig.h"
+#include <VistaAspects/VistaUncopyable.h>
 
 /*============================================================================*/
 /* MACROS AND DEFINES                                                         */
@@ -61,6 +62,7 @@ class IVistaExplicitCallbackInterface;
  */
 class VISTADEVICEDRIVERSAPI VistaConnectionUpdater
 {
+	VISTA_UNCOPYABLE( VistaConnectionUpdater );
 public:
 	/**
 	 * Creates an updater that allocates a VistaThreadPool with nNumJobs
@@ -151,13 +153,6 @@ public:
 
 protected:
 private:
-	VistaConnectionUpdater(const VistaConnectionUpdater&) {} //**< makes no sense to copy this loop */
-
-	VistaConnectionUpdater &operator=(const VistaConnectionUpdater &) //**< makes no sense to copy this loop */
-	{
-		return *this;
-	}
-
 	class UpdateThread;
 	UpdateThread *m_pUpdateThread;
 };
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/VistaDeviceDriver.cpp b/VistaCoreLibs/VistaDeviceDriversBase/VistaDeviceDriver.cpp
index 544bde73a2e4445ac31b61020ef44083d5762aa5..73476669c0369b88d0a373089cb0f7d0a56fc035 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/VistaDeviceDriver.cpp
+++ b/VistaCoreLibs/VistaDeviceDriversBase/VistaDeviceDriver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDeviceDriver.h"
 #include "VistaDeviceSensor.h"
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/VistaDeviceDriver.h b/VistaCoreLibs/VistaDeviceDriversBase/VistaDeviceDriver.h
index 7b4a8c77daf0af6a742d1ab482409cc2a0ffca95..2fc2ec4a5d81aaab961e2e1efe925e30fe161463 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/VistaDeviceDriver.h
+++ b/VistaCoreLibs/VistaDeviceDriversBase/VistaDeviceDriver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADEVICEDRIVER_H
 #define _VISTADEVICEDRIVER_H
@@ -98,6 +98,7 @@ class IVistaDriverMeta;
  */
 class VISTADEVICEDRIVERSAPI IVistaDeviceDriver
 {
+	VISTA_UNCOPYABLE( IVistaDeviceDriver );
 public:
 	virtual ~IVistaDeviceDriver();
 
@@ -641,7 +642,6 @@ private:
 	SENSORINFOMAP m_defaultHistorySizes; // history size record per sensor index
 
 
-	bool                        m_bEnabled;
 	VistaWindowAverageTimer*    m_pFrequencyTimer;
 	VistaAverageTimer*          m_pUpdateTimer;
 
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/VistaDeviceDriversConfig.h b/VistaCoreLibs/VistaDeviceDriversBase/VistaDeviceDriversConfig.h
index 03260ffbe01f6520012ae4a6a687865376f8be1b..7f71e9f5d0ca83bba82c5b95833389fbe0a35141 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/VistaDeviceDriversConfig.h
+++ b/VistaCoreLibs/VistaDeviceDriversBase/VistaDeviceDriversConfig.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADEVICEDRIVERSCONFIG_H
 #define _VISTADEVICEDRIVERSCONFIG_H
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/VistaDeviceSensor.cpp b/VistaCoreLibs/VistaDeviceDriversBase/VistaDeviceSensor.cpp
index 45019e3d5347a1f1fc57ae997eac0494ccf5235e..8e46643ad120183faa4912128e796fe4dad1217e 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/VistaDeviceSensor.cpp
+++ b/VistaCoreLibs/VistaDeviceDriversBase/VistaDeviceSensor.cpp
@@ -20,11 +20,9 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
 
-#include "VistaDeviceSensor.h"
 
-#include "VistaSensorReadState.h"
+#include "VistaDeviceSensor.h"
 
 #include <VistaAspects/VistaPropertyFunctorRegistry.h>
 #include <VistaAspects/VistaAspectsUtils.h>
@@ -218,30 +216,49 @@ IVistaTranscoderFactoryFactory::~IVistaTranscoderFactoryFactory() {}
 /*============================================================================*/
 
 
+const VistaSensorMeasure* VistaMeasureHistory::GetMeasure( const VistaType::uint32 nReadHead ) const
+{
+	if( nReadHead == ~0u )
+		return GetMostCurrent();
 
-const VistaSensorMeasure *VistaMeasureHistory::GetMostCurrent() const
+	const VistaSensorMeasure& pMeasure = (*m_rbHistory.index( nReadHead ));
+	return &pMeasure;
+}
+
+
+const VistaSensorMeasure *VistaMeasureHistory::GetPast( unsigned int nNum, const VistaType::uint32 nReadHead ) const
 {
-	// the latest data resides directly behind (pred) the current write head
-	// position, so this is what we look at
-	VistaMeasureHistory::Buffer::const_iterator cit(
-			m_rbHistory.index(
-					m_rbHistory.pred(
-							m_pAtomics->AtomicRead((VistaType::uint32)m_rbHistory.GetCurrentVal()))));
-	return &(*(cit));
+	if( nReadHead == ~0u )
+	{
+		return GetCurrentPast( nNum );
+	}
+	else	
+	{
+		Buffer::const_iterator itHead = m_rbHistory.index( nReadHead );
+		const VistaSensorMeasure& pMeasure = itHead - nNum;
+		return &pMeasure;
+	}
+}
 
+const VistaSensorMeasure *VistaMeasureHistory::GetMostCurrent() const
+{
+	// return measure at current read head
+	VistaMeasureHistory::Buffer::const_iterator cit( m_rbHistory.index( GetCurrentReadHead() ) );
+	const VistaSensorMeasure& pMeasure = (*cit);
+	return &pMeasure;
 }
 
 
 
 const VistaSensorMeasure *VistaMeasureHistory::GetCurrentPast(unsigned int nNum) const
 {
-	VistaMeasureHistory::Buffer::const_iterator cit(
-			m_rbHistory.index(
-					m_rbHistory.pred(
-							m_pAtomics->AtomicRead((VistaType::uint32)m_rbHistory.GetCurrentVal()))));
-	return &(cit - nNum);
+	VistaMeasureHistory::Buffer::const_iterator cit( m_rbHistory.index( GetCurrentReadHead() ) );
+	const VistaSensorMeasure& pMeasure = cit - nNum;
+	return &pMeasure;
 }
 
+
+
 const VistaMeasureHistory::Buffer &VistaMeasureHistory::GetReadBuffer() const
 {
 	return m_rbHistory;
@@ -257,7 +274,7 @@ VistaMeasureHistory::VistaMeasureHistory( VistaAtomics *pAtomics, IVistaDeviceDr
   m_nClientReadSize(0),
   m_pAtomics(pAtomics),
   m_nMeasureSize(0),
-  m_initialized(false),
+  m_bIsInitialized(false),
   m_pAllocMemFunctor( pAlloc ),
   m_pFreeMemFunctor( pFree )
 {
@@ -270,7 +287,7 @@ VistaMeasureHistory::VistaMeasureHistory( const VistaMeasureHistory& oHistory, c
   m_nClientReadSize(0),
   m_pAtomics( oHistory.m_pAtomics ),
   m_nMeasureSize(0),
-  m_initialized(false),
+  m_bIsInitialized(false),
   m_pAllocMemFunctor( oHistory.m_pAllocMemFunctor ),
   m_pFreeMemFunctor( oHistory.m_pFreeMemFunctor )
 {
@@ -291,7 +308,7 @@ VistaMeasureHistory::VistaMeasureHistory( const VistaMeasureHistory& oHistory, c
 VistaMeasureHistory::~VistaMeasureHistory()
 {
 	// if a free functor is given, clean up the existing history
-	if( m_pFreeMemFunctor && m_initialized )
+	if( m_pFreeMemFunctor && m_bIsInitialized )
 	{
 		for( unsigned int i = 0; i < ( m_nClientReadSize + m_nDriverWriteSize); ++i )
 		{
@@ -302,30 +319,6 @@ VistaMeasureHistory::~VistaMeasureHistory()
 }
 
 
-const VistaSensorMeasure* VistaMeasureHistory::GetMeasure( const VistaType::uint32 nReadHead ) const
-{
-	if( nReadHead == ~0u )
-		return NULL;
-
-	// return the most current when swap was called
-	Buffer::size_type nPos = nReadHead;
-	if( nPos == ~0u )
-		return NULL;
-	return &(*m_rbHistory.index(nPos));
-}
-
-
-const VistaSensorMeasure *VistaMeasureHistory::GetPast( unsigned int nNum, const VistaSensorReadState &, const VistaType::uint32 nReadHead ) const
-{
-	if( nReadHead == ~0u )
-		return GetCurrentPast( nNum );
-	else	
-	{
-		Buffer::const_iterator itHead = m_rbHistory.index( nReadHead );
-		return &(itHead - nNum);
-	}
-}
-
 VistaType::uint32 VistaMeasureHistory::GetDriverWriteSize() const
 {
 	return m_nDriverWriteSize;
@@ -344,7 +337,7 @@ VistaMeasureHistory::Buffer & VistaMeasureHistory::GetWriteBuffer()
 VistaType::uint32 VistaMeasureHistory::GetMeasureCount() const
 {
 	const VistaSensorMeasure* pMeasure = GetMostCurrent();
-	if( pMeasure == NULL )
+	if( pMeasure->GetIsValid() == false )
 		return 0;
 	else
 		return pMeasure->m_nMeasureIdx + 1;
@@ -353,7 +346,7 @@ VistaType::uint32 VistaMeasureHistory::GetMeasureCount() const
 VistaType::microtime VistaMeasureHistory::GetUpdateTimeStamp() const
 {
 	const VistaSensorMeasure* pMeasure = GetMostCurrent();
-	if( pMeasure == NULL )
+	if( pMeasure->GetIsValid() == false )
 		return 0;
 	else
 		return pMeasure->m_nMeasureTs;
@@ -390,7 +383,7 @@ bool VistaMeasureHistory::Resize( unsigned int nClientReadSize, unsigned int nDr
 	}
 
 	// if a free functor is given, clean up the existing history
-	if( m_pFreeMemFunctor && m_initialized )
+	if( m_pFreeMemFunctor && m_bIsInitialized )
 	{
 		for( unsigned int i = 0; i < ( m_nClientReadSize + m_nDriverWriteSize); ++i )
 		{
@@ -403,12 +396,12 @@ bool VistaMeasureHistory::Resize( unsigned int nClientReadSize, unsigned int nDr
 
 	for( unsigned int n = 0; n < nNewSize; ++n )
 	{
-		VistaSensorMeasure m( 0, 0, nMeasureSize );
+		VistaSensorMeasure m( ~0u, 0, nMeasureSize );
 		m_rbHistory.Add( m );
 		if( m_pAllocMemFunctor )
 		{
 			(*m_pAllocMemFunctor)( *m_rbHistory.index(n) );
-			m_initialized = true; // flip to steady true
+			m_bIsInitialized = true; // flip to steady true
 		}
 	}
 
@@ -828,20 +821,6 @@ VistaType::microtime VistaDeviceSensor::GetUpdateTimeStamp() const
 	return m_rbSensorHistory.GetUpdateTimeStamp();
 }
 
-bool VistaDeviceSensor::SetUpdateTimeStamp(VistaType::microtime nTs)
-{
-	// @todo: atomically setting a double leads to problems under special circumstances
-	// (more precisely, gcc+linux with -03 seems to screw up the modification when using
-	// semaphore-locked access - the update timestamp is sometimes undefined (mostly 0) afterwards
-
-	//assert( sizeof(VistaType::microtime) == sizeof(VistaType::uint64) );
-	// assumption: sizeof(microtime) == sizeof(double) == sizeof(uint64)
-	// copy value of nTs bytewise
-	//m_pAtomics->AtomicSet64( &m_rbSensorHistory.m_nUpdateTs, *((VistaType::uint64*)&nTs) );
-	//m_rbSensorHistory.m_nUpdateTs = nTs;
-	return true;
-}
-
 unsigned int VistaDeviceSensor::GetMeasureCount() const
 {
 	// protected read of measure count
@@ -861,14 +840,6 @@ bool VistaDeviceSensor::AddMeasure(const VistaSensorMeasure &oMeasure)
 	return true;
 }
 
-bool VistaDeviceSensor::ActivateMeasures( VistaSensorReadState &stateRecord )
-{
-	if( m_rbSensorHistory.GetUpdateTimeStamp() == 0 ) // check for (first) new data
-		return false;
-
-	return stateRecord.SetToLatestSample();
-}
-
 bool VistaDeviceSensor::AdvanceMeasure()
 {
 	VistaMeasureHistory::Buffer& oBuffer = m_rbSensorHistory.GetWriteBuffer();
@@ -907,10 +878,7 @@ bool VistaDeviceSensor::AdvanceMeasure()
 	// be removed in the future.
 
 	// so, fetch the current slot
-	VistaMeasureHistory::Buffer::iterator it(
-					oBuffer.index( // get the index
-							oBuffer.pred( // of the predecessor
-									oBuffer.GetCurrentVal()))); // of the current slot being written
+	VistaMeasureHistory::Buffer::iterator it( oBuffer.index( m_rbSensorHistory.GetCurrentReadHead() ) ); // of the current slot being written
 
 
 	// write swap-time as the difference to post / pre
@@ -1027,12 +995,12 @@ IVistaDeSerializer &operator>>(IVistaDeSerializer &oDeSer,
 #if defined(DEBUG)
 	if( oMeasure.m_nEndianess != VistaSerializingToolset::GetPlatformEndianess() )
 	{
-		vstr::warnp() << "[VistaDeSerializer]: Endianess mismatch" << std::endl;
+		vstr::warnp() << "[VistaSensorMeasure]: Endianess mismatch during deserialization" << std::endl;
 	}
 
 	if( oMeasure.m_nBusWidth != VistaSerializingToolset::GetPlatformBusWidth() )
 	{
-		vstr::warnp() << "[VistaDeSerializer]: BusWidth mismatch" << std::endl;
+		vstr::warnp() << "[VistaSensorMeasure]: BusWidth mismatch during deserialization" << std::endl;
 	}
 #endif
 
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/VistaDeviceSensor.h b/VistaCoreLibs/VistaDeviceDriversBase/VistaDeviceSensor.h
index 5ec4259b795a36a2535f371e21ca5c50047b87b5..d323ab3a9279bc10bbd4b7b1e7e5f46380b666a7 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/VistaDeviceSensor.h
+++ b/VistaCoreLibs/VistaDeviceDriversBase/VistaDeviceSensor.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADEVICESENSOR_H
 #define _VISTADEVICESENSOR_H
@@ -59,8 +59,6 @@ class IVistaDriverCreationMethod;
 class VistaWindowAverageTimer;
 class VistaAverageTimer;
 
-class VistaSensorReadState;
-
 /*============================================================================*/
 /* CLASS DEFINITIONS                                                          */
 /*============================================================================*/
@@ -78,7 +76,7 @@ class VISTADEVICEDRIVERSAPI VistaSensorMeasure
 {
 public:
 	VistaSensorMeasure()
-		: m_nMeasureIdx(0)
+		: m_nMeasureIdx(~0u)
 		, m_nMeasureTs(0)
 		, m_nSwapTime(0)
 		, m_nDeliverTs(0)
@@ -101,6 +99,14 @@ public:
 		, m_nBusWidth( sizeof(void*) * 8 )
 	{}
 
+	/**
+	 * returns true if it is a valid measure, i.e. sensor data has been captured
+	 */
+	bool GetIsValid() const
+	{
+		return ( m_nMeasureIdx != ~0u );
+	}
+
 	VistaType::uint32        m_nMeasureIdx;
 	VistaType::microtime     m_nMeasureTs;
 	VistaType::microtime     m_nSwapTime;
@@ -181,9 +187,15 @@ public:
 	 * get a const-pointer to the sample that was recently written.
 	 * Depending on your desire, this is the API to use in order to
 	 * implement a LIFO access to the history buffer. This method uses
-	 * this histories's write head to detect the last written sample to
+	 * this history's write head to detect the last written sample to
 	 * the history.
 	 * @see GetMostCurrent()
+	 * 
+	 * @return A (non-NULL) measure in the history.
+	 *         Note that it is not guaranteed that this is a meaningful measure,
+	 *         it is just present in the history. Use its GetIsValid routine to 
+	 *         check if valid sensor data has been written, and use its time stamp
+	 *         to check for wrap-arounds due to limited history size
 	 */
 	const VistaSensorMeasure* GetMeasure( const VistaType::uint32 nReadHead ) const;
 
@@ -193,12 +205,18 @@ public:
 	 * different to the GetCurrentRead(), as the history's read head
 	 * is updated a bit after the driver write head is moved.
 	 * @see GetCurrentRead()
+	 * 
+	 * @return A (non-NULL) measure in the history.
+	 *         Note that it is not guaranteed that this is a meaningful measure,
+	 *         it is just present in the history. Use its GetIsValid routine to 
+	 *         check if valid sensor data has been written, and use its time stamp
+	 *         to check for wrap-arounds due to limited history size
 	 */
-	const VistaSensorMeasure *GetMostCurrent() const;
+	const VistaSensorMeasure* GetMostCurrent() const;
 
 	/**
 	 * Gets an old (''past'') sample from the history, dependent on a relative
-	 * index as given in the arguments. GetPast(0) == GetCurrentRead().
+	 * index as given in the arguments. GetPast(0, nReadHead) == GetMeasure(nReadHead).
 	 * The index can be an arbitrary index (it is mod'ded in this routine),
 	 * but should not be larger than the number of read-only samples in the history.
 	 * This number is determined on the amount of samples that can be read during
@@ -208,34 +226,24 @@ public:
 	 * to possibly corrupted data.
 	 *
 	 * @param nNum the offset back in time starting at last value (nNum = 0)
-	 * @param nCurRdPos ~0 means that the current write head position is taken
+	 * @param nReadHead ~0 means that the current write head position is taken
 	 *        as a base (default), otherwise nNum is relative to the nCurRdPos
 	 *        which has to be within [0..historyLength)
 	 *
-	 * @return NULL in case no data was ever swapped into visibility or taken
-	 *         (i.e.: no data available), a read position in the history otherwise.
+	 * @return A (non-NULL) measure in the history.
 	 *         Note that it is not guaranteed that this is a meaningful measure,
-	 *         it is just present in the history. Test its fields (timestamp) to
-	 *         be sure the data makes sense to you.
-	 */
-	const VistaSensorMeasure *GetPast(unsigned int nNum, const VistaSensorReadState &, VistaType::uint32 nCurRdPos = ~0 ) const;
-
-	/**
-	 * return the current read-safe position of the latest readable container in
-	 * this history.
-	 * @return a usable index for GetPast() or the like, or ~0 for an invalid slot.
-	           This can happen when no data was yet posted to this history.
+	 *         it is just present in the history. Use its GetIsValid routine to 
+	 *         check if valid sensor data has been written, and use its time stamp
+	 *         to check for wrap-arounds due to limited history size
 	 */
-	VistaType::uint32 GetCurrentReadPosition(const VistaSensorReadState &) const;
-
+	const VistaSensorMeasure* GetPast( unsigned int nNum, VistaType::uint32 nReadHead ) const;
+	
 	/**
 	 * Same as GetPast() but used the most current as a sample to start with.
 	 * @see GetPast()
 	 * @see GetMostCurrent()
 	 */
-	const VistaSensorMeasure *GetCurrentPast(unsigned int nNum) const;
-
-	const VistaSensorMeasure *GetCurrentRead( const VistaSensorReadState &read_state ) const { return GetPast(0, read_state); }
+	const VistaSensorMeasure* GetCurrentPast( unsigned int nNum ) const;
 
 	/**
 	 * This API is for debug purposes (e.g. logging of the complete buffer),
@@ -263,7 +271,7 @@ public:
 	VistaType::uint32                   m_nClientReadSize;
 	unsigned int						m_nMeasureSize;
 
-	bool                                    m_initialized;
+	bool                                    m_bIsInitialized;
 	IVistaDeviceDriver::AllocMemoryFunctor*	m_pAllocMemFunctor;
 	IVistaDeviceDriver::ClaimMemoryFunctor*	m_pFreeMemFunctor;
 	VistaAtomics                        *m_pAtomics; /**< private inline instance in module */
@@ -286,38 +294,6 @@ VISTADEVICEDRIVERSAPI IVistaSerializer   &operator<<(IVistaSerializer &oSer,
 VISTADEVICEDRIVERSAPI IVistaDeSerializer &operator>>(IVistaDeSerializer &oDeSer,
 							   VistaMeasureHistory &oHist);
 
-////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////
-
-class VISTADEVICEDRIVERSAPI ResolveMeasureFunctor : public std::unary_function<void,VistaSensorMeasure*>
-{
-public:
-	virtual ~ResolveMeasureFunctor() {}
-	virtual const VistaSensorMeasure *operator()( void ) const = 0;
-};
-
-class VISTADEVICEDRIVERSAPI SimpleHistoryGet : public ResolveMeasureFunctor
-{
-public:
-	typedef const VistaSensorMeasure *(VistaMeasureHistory::*func)( const VistaSensorReadState & ) const;
-
-	SimpleHistoryGet(const VistaMeasureHistory &hist, func f, const VistaSensorReadState &read_state )
-	: m_f(f)
-	, m_o(hist)
-	, m_read_state( read_state )
-	{}
-
-	virtual const VistaSensorMeasure *operator()( void ) const
-	{
-		return (m_o.*m_f)( m_read_state );
-	}
-
-	func m_f;
-	const VistaMeasureHistory &m_o;
-	const VistaSensorReadState &m_read_state;
-};
-
-
 /**
  * The transcode devices an access point to the individual sensor's values
  * based on the Reflectionable API from the ViSTA Aspects.
@@ -427,7 +403,7 @@ public:
 		 */
 		const std::type_info &GetReturnType() const { return typeid( T ); }
 
-		virtual size_t GetReturnSize() const { return sizeof( T ); }
+		virtual std::size_t GetReturnSize() const { return sizeof( T ); }
 	};
 
 	/**
@@ -740,20 +716,6 @@ public:
 	 */
 	void SetSensorName( const std::string &strName );
 
-	// ##############################################################
-	// INTERMEDIATE LAYER API -- clients should not use this,
-	// unless they know what they are doing.
-	// ##############################################################
-	/**
-	 * Fixates the current read slot to match with the current
-	 * write head (-1). Call this once per frame to have a stable
-	 * view on the sensor data. If this API is not called, there will
-	 * never be outwardly visible new data on this sensor (e.g., all
-	 * "normal" tries to read data from the history will fail).
-	 * @see GetDataCount()
-	 * @return true if there is new data (i.e.: MEASUREINDEX changed)
-	 */
-	bool         ActivateMeasures( VistaSensorReadState &stateRecord );
 
 	// ##############################################################
 	// DRIVER API: CLIENTS SHOULD NOT USE THE FOLLOWING API
@@ -800,15 +762,9 @@ public:
 	 * expert API, so use it with care, especially, do not assume
 	 * any information contained with the time-stamp, especially not
 	 * that you have read it as an integral value.
-	 * @see SetUpdateTimeStamp()
 	 */
 	VistaType::microtime    GetUpdateTimeStamp() const;
 
-	/**
-	 * Public API for non-public use. Ignore it unless you are a driver.
-	 */
-	bool         SetUpdateTimeStamp(VistaType::microtime nTs);
-
 
 	/**
 	 * Returns the current "measure-index", this is a property
@@ -852,34 +808,26 @@ public:
 	}
 
 	template<class T>
-	T GetValue(    const std::string &propName,
-			       const ResolveMeasureFunctor &f  ) const
+	T GetValue( const std::string& sPropName, const VistaSensorMeasure* pMeasure ) const
 	{
-		IVistaMeasureTranscode::TTranscodeValueGet<T> *p
-		   = GetMeasureProperty< IVistaMeasureTranscode::TTranscodeValueGet<T> >( propName );
-		if(p)
+		if( pMeasure == NULL )
 		{
-			const VistaSensorMeasure *m = f();
-			if(!m)
-				throw std::exception();
-
-			T val;
-			p->GetValue( m, val );
-			return val;
+			VISTA_THROW( "VistaSensorMeasure:Get() - received no measure", -1 );
+		}
+		IVistaMeasureTranscode::TTranscodeValueGet<T>* pGet 
+			= GetMeasureProperty< IVistaMeasureTranscode::TTranscodeValueGet<T> >( sPropName );
+		if( pGet == NULL )
+		{
+			VISTA_THROW( "VistaSensorMeasure:Get() - could not find requested getter", -1 );
 		}
-		throw std::exception();
-	}
 
-	template<class T>
-	T GetLastValue( const std::string &propName, const VistaSensorReadState &readState  ) const
-	{
-		return GetValue<T>( propName, SimpleHistoryGet( GetMeasures(), &VistaMeasureHistory::GetCurrentRead, readState ) );
+		return pGet->GetValue( pMeasure );
 	}
 
 	template<class T>
-	T GetMostCurrentValue( const std::string &propName ) const
+	T GetMostCurrentValue( const std::string& sPropName ) const
 	{
-		return GetValue<T>( propName, SimpleHistoryGet( GetMeasures(), &VistaMeasureHistory::GetMostCurrent ) );
+		return GetValue<T>( sPropName, GetMeasures().GetMostCurrent() );
 	}
 
 	/**
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverMain.cpp b/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverMain.cpp
index c4fa5cc7ff38938e0453995267edba47fd84d859..8ef3c53027e0f52a14526c4d0f0c93041e5133ef 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverMain.cpp
+++ b/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverMain.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "Drivers/VistaKeyboardDriver.h"
 #include "Drivers/VistaMouseDriver.h"
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverManager.cpp b/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverManager.cpp
index 440403ab93d0e2a30b3154448352f5c280558b64..83d7be45104788d04ed5508bc5e8911deeb12a8e 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverManager.cpp
+++ b/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverManager.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDriverManager.h"
 #include <VistaTools/VistaEnvironment.h>
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverManager.h b/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverManager.h
index ff3039f7273ca88215ea2c5f514c703529c1513a..b432a9a9d621d97659d446c8477dc2df90f9848b 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverManager.h
+++ b/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverManager.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef __VISTADRIVERMANAGER_H
 #define __VISTADRIVERMANAGER_H
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverMap.cpp b/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverMap.cpp
index 3d7250dd99b702bfb357a12cce2e66ed1a3e141c..b74291f5fb512469029ccabc02838cd8a54a930d 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverMap.cpp
+++ b/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverMap.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDriverMap.h"
 #include "VistaDeviceDriver.h"
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverMap.h b/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverMap.h
index b2cef1ad320f91d34831326e0b01adf28776be6e..669b5d50f7ddb217950aae3e8e61f94c7fe42ee5 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverMap.h
+++ b/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverMap.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADRIVERMAP_H
 #define _VISTADRIVERMAP_H
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverPlugDev.h b/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverPlugDev.h
index 34e20a01ebabdbe834d676bc883beb9f9767466a..cf3b617f69bf233f6346c02955e3a5fc5b5478e5 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverPlugDev.h
+++ b/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverPlugDev.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADRIVERPLUGDEV_H
 #define _VISTADRIVERPLUGDEV_H
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverUtils.cpp b/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverUtils.cpp
index fc1eb09da42b8946e07192c826dc532a7e878dcf..08faefbccbce1031c680e868dcf2a2bcbe08d56f 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverUtils.cpp
+++ b/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverUtils.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDriverUtils.h"
 
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverUtils.h b/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverUtils.h
index bc8fea28f61bff233e4cfec1be5bfe7f2e099a2e..4ed372af9bcea81143376484cb4b1ab48c9b127f 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverUtils.h
+++ b/VistaCoreLibs/VistaDeviceDriversBase/VistaDriverUtils.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADRIVERUTILS_H
 #define _VISTADRIVERUTILS_H
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/VistaSensorReadState.cpp b/VistaCoreLibs/VistaDeviceDriversBase/VistaSensorReadState.cpp
index 6f3293f613002d70fec87f3bb6a1e2836a2d7043..07c24e053b0083b0874226f2034cc1db3abffe4e 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/VistaSensorReadState.cpp
+++ b/VistaCoreLibs/VistaDeviceDriversBase/VistaSensorReadState.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaSensorReadState.h"
 #include <VistaBase/VistaBaseTypes.h>
@@ -124,7 +124,7 @@ const VistaSensorMeasure* VistaSensorReadState::GetCurrentMeasure() const
 
 const VistaSensorMeasure* VistaSensorReadState::GetPastMeasure( int nStepBack ) const
 {
-	return m_pHistory->GetPast( nStepBack, *this, m_nSnapshotReadHead );
+	return m_pHistory->GetPast( nStepBack, m_nSnapshotReadHead );
 }
 
 VistaDeviceSensor* VistaSensorReadState::GetSensor() const
@@ -153,15 +153,19 @@ bool VistaSensorReadState::SetToLatestSample()
 	if( GetIsValid() == false )
 		return false;
 
-	int nCurrentReadHead               = m_pHistory->GetCurrentReadHead();
-	const VistaSensorMeasure* pMeasure = m_pSensor->GetMeasures().GetMeasure( nCurrentReadHead );
+	VistaType::uint32 nMeasureCount = m_pHistory->GetMeasureCount();
+	if( nMeasureCount == 0 )
+		return false; // no measures yet -> no new measures
 
-	if( pMeasure->m_nMeasureIdx == m_nCurrentMeasureCount )
+	if( nMeasureCount <= m_nCurrentMeasureCount )
 		return false; // no new measure available
 
+	int nCurrentReadHead               = m_pHistory->GetCurrentReadHead();
+	const VistaSensorMeasure* pMeasure = m_pSensor->GetMeasures().GetMeasure( nCurrentReadHead );	
+
 	++m_nActivationCount;
 	m_nSnapshotReadHead    = nCurrentReadHead;
-	m_nCurrentMeasureCount = pMeasure->m_nMeasureIdx;
+	m_nCurrentMeasureCount = nMeasureCount;
 	m_nLastUpdateTs        = pMeasure->m_nMeasureTs;
 	return true;
 }
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/VistaSensorReadState.h b/VistaCoreLibs/VistaDeviceDriversBase/VistaSensorReadState.h
index 0eee73f64b42411df7b0f88deca79071b6608b71..c40a38340564406db9f054430fa681062af96f69 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/VistaSensorReadState.h
+++ b/VistaCoreLibs/VistaDeviceDriversBase/VistaSensorReadState.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASENSORSTATE_H_
 #define _VISTASENSORSTATE_H_
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/VistaSensorReader.cpp b/VistaCoreLibs/VistaDeviceDriversBase/VistaSensorReader.cpp
index 68daad89b9d13206839980ceed3a3563e420498c..123c98a23725d14bb71e106abc1ce115cc21a273 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/VistaSensorReader.cpp
+++ b/VistaCoreLibs/VistaDeviceDriversBase/VistaSensorReader.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaSensorReader.h" 
 
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/VistaSensorReader.h b/VistaCoreLibs/VistaDeviceDriversBase/VistaSensorReader.h
index 0476884683b315c2e2b1ea5c5aa743fddbc591f7..167753c46930993ff9c2f41fb450b3d77af74457 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/VistaSensorReader.h
+++ b/VistaCoreLibs/VistaDeviceDriversBase/VistaSensorReader.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASENSORREADER_H_
 #define _VISTASENSORREADER_H_
diff --git a/VistaCoreLibs/VistaDeviceDriversBase/_SourceFiles.cmake b/VistaCoreLibs/VistaDeviceDriversBase/_SourceFiles.cmake
index f20408f67e64d653523fac865a042fd3ff3b1e4d..e9d41ac35152e3fe97494fd2aad3038511b04a9e 100644
--- a/VistaCoreLibs/VistaDeviceDriversBase/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaDeviceDriversBase/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaAsyncEventObserver.cpp b/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaAsyncEventObserver.cpp
index 1388c79a4e4fa0bf0ad22e4e447038793e4f9a7c..b6a06a8a2fcb54372b667eeb0dd1a49cfa91c8c2 100644
--- a/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaAsyncEventObserver.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaAsyncEventObserver.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifdef WIN32
 #include <winsock2.h> // should be included *before* windows.h
diff --git a/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaAsyncEventObserver.h b/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaAsyncEventObserver.h
index 85d871906a02f9b0f045d24b9cedfbda426b3a1d..3eba828fb863be2d8943200796f81103840388d1 100644
--- a/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaAsyncEventObserver.h
+++ b/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaAsyncEventObserver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAASYNCEVENTOBSERVER_H
 #define _VISTAASYNCEVENTOBSERVER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOHandleBasedMultiplexer.cpp b/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOHandleBasedMultiplexer.cpp
index 465d5ce9bd2d6afae1138faa9a058aebf87d57b2..69a00d96c0782c29b41b8fa7f839b3f4793bb37c 100644
--- a/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOHandleBasedMultiplexer.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOHandleBasedMultiplexer.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaIOHandleBasedMultiplexer.h" 
 #include <VistaInterProcComm/Concurrency/VistaMutex.h>
diff --git a/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOHandleBasedMultiplexer.h b/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOHandleBasedMultiplexer.h
index 3a972c899ed31c240219eac212645b6dea7c82d4..af978e1b85b0d74be9935b5bfcf9826c61df4f8f 100644
--- a/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOHandleBasedMultiplexer.h
+++ b/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOHandleBasedMultiplexer.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAIOHANDLEBASEDMULTIPLEXER_H
 #define _VISTAIOHANDLEBASEDMULTIPLEXER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOMultiplexer.cpp b/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOMultiplexer.cpp
index d35d7bb242f2427636cd89eb92c04794356e765e..920f9aace1ae66fbb80e0b830221cd9c440f2dfa 100644
--- a/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOMultiplexer.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOMultiplexer.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaIOMultiplexer.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOMultiplexer.h b/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOMultiplexer.h
index 625d702f0153fcab2d16759ae5d738b72e970390..ac03d5f84b0c0ea8ea0b6e4716b3163a2bff89f3 100644
--- a/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOMultiplexer.h
+++ b/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOMultiplexer.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAIOMULTIPLEXER_H
 #define _VISTAIOMULTIPLEXER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOMultiplexerIP.cpp b/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOMultiplexerIP.cpp
index a8bbef26533e649355ce3c929413becb69fe8ea1..721ca57373eec79d73a1012cfaa8be42f9de787b 100644
--- a/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOMultiplexerIP.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOMultiplexerIP.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifdef WIN32
 #include <winsock2.h>
diff --git a/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOMultiplexerIP.h b/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOMultiplexerIP.h
index 8508eb0113f269fec53e4f7a5582db0c06113cc1..0a8a2023c86afadb7392b703c5e88e42c265dd21 100644
--- a/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOMultiplexerIP.h
+++ b/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOMultiplexerIP.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAIOMULTIPLEXERIP_H
 #define _VISTAIOMULTIPLEXERIP_H
diff --git a/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIORequest.cpp b/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIORequest.cpp
index bdbef52d9bf917091e04b82f3e62e6f6f5829674..b50a1405120968ace2b07e04e87d4e2d7ea6c15d 100644
--- a/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIORequest.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIORequest.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaIORequest.h"
 #include "VistaIOScheduler.h"
diff --git a/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIORequest.h b/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIORequest.h
index 33027107f92f691a6c44e23513b6f4f22002d9c6..7cb9433d38ece86fc833f24e14a9b4705133b2eb 100644
--- a/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIORequest.h
+++ b/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIORequest.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAIOREQUEST_H
 #define _VISTAIOREQUEST_H
diff --git a/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOScheduler.cpp b/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOScheduler.cpp
index 0bec64e2af106c0a7dad451ca387f4181cbea50c..99aaca33bb8522b179a01a880566836b105bb417 100644
--- a/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOScheduler.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOScheduler.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaIOScheduler.h"
 #include "VistaIORequest.h"
diff --git a/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOScheduler.h b/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOScheduler.h
index 2b6f0e321956ccd372571c8b140eaa1afd952df2..db3434effe8a23c6ff1d19dd7c0a4aaa854786ed 100644
--- a/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOScheduler.h
+++ b/VistaCoreLibs/VistaInterProcComm/AsyncIO/VistaIOScheduler.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAIOSCHEDULER_H
 #define _VISTAIOSCHEDULER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/AsyncIO/_SourceFiles.cmake b/VistaCoreLibs/VistaInterProcComm/AsyncIO/_SourceFiles.cmake
index 0c49480df2796ebe106da22e7d379a46c2eb4467..a07c487ec2f4c21e5d9afd77344a5d65ec3837f7 100644
--- a/VistaCoreLibs/VistaInterProcComm/AsyncIO/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaInterProcComm/AsyncIO/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "./AsyncIO" )
 set( RelativeSourceGroup "Source Files\\AsyncIO" )
diff --git a/VistaCoreLibs/VistaInterProcComm/CMakeLists.txt b/VistaCoreLibs/VistaInterProcComm/CMakeLists.txt
index 8b5be7982bc14cfca3a633a905caf2b01ab057c3..2ddeecdabc073e94e8bfbff6b25e396cba98a62d 100644
--- a/VistaCoreLibs/VistaInterProcComm/CMakeLists.txt
+++ b/VistaCoreLibs/VistaInterProcComm/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id$
+
 
 vista_adopt_version( VistaInterProcComm VistaCoreLibs )
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaBroadcastClusterBarrier.cpp b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaBroadcastClusterBarrier.cpp
index fbdef582cbb350b898911c1dce1ad6cfc5a349e4..82b83a8a6f8583c10010f9cc77cade58682e79e3 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaBroadcastClusterBarrier.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaBroadcastClusterBarrier.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaBroadcastClusterBarrier.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaBroadcastClusterBarrier.h b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaBroadcastClusterBarrier.h
index 727039ad00854b1f8193d23a4359149669286c51..740c90b8458ff7ed1ee609f03de659c97556aaf3 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaBroadcastClusterBarrier.h
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaBroadcastClusterBarrier.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTABROADCASTCLUSTERBARRIER_H
 #define _VISTABROADCASTCLUSTERBARRIER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaBroadcastClusterDataSync.cpp b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaBroadcastClusterDataSync.cpp
index e7f5d64bdc8f4b202e1e6638ae683ea40332315c..8738cd6134b16844316e6800a169413dc2e3c65b 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaBroadcastClusterDataSync.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaBroadcastClusterDataSync.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaBroadcastClusterDataSync.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaBroadcastClusterDataSync.h b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaBroadcastClusterDataSync.h
index af85e935fe249e858effa4e8ce8ef821ce3c0955..f5bd3b04a169b45461034e3dea3f54e0a1ef10ea 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaBroadcastClusterDataSync.h
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaBroadcastClusterDataSync.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTABROADCASTCLUSTERSYNC_H
 #define _VISTABROADCASTCLUSTERSYNC_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaClusterBarrierIPBase.cpp b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaClusterBarrierIPBase.cpp
index 074de9437e55036d459c7a990321faa244a7516d..00df8e1caf70936345af759a6a2f8b999af6ba77 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaClusterBarrierIPBase.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaClusterBarrierIPBase.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaClusterBarrierIPBase.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaClusterBarrierIPBase.h b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaClusterBarrierIPBase.h
index 7607069de8f15a1c3a81dfe5ab66bd3c72946d92..e2fada4a3aa677418a12a84ab943403b0734b4d4 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaClusterBarrierIPBase.h
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaClusterBarrierIPBase.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTACLUSTERBARRIERIPBASE_H
 #define _VISTACLUSTERBARRIERIPBASE_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaClusterBytebufferDataSyncBase.cpp b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaClusterBytebufferDataSyncBase.cpp
index 26ada327c2e9a1086dc70cbf763bf4ade89ddef0..aa60c6cca83565d324a8c2de3c2679dfa6655d84 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaClusterBytebufferDataSyncBase.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaClusterBytebufferDataSyncBase.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaClusterBytebufferDataSyncBase.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaClusterBytebufferDataSyncBase.h b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaClusterBytebufferDataSyncBase.h
index 31688dd14722800bcd7725b679d5b468a01230b3..56fc0a35a80f2d9a2c8d687b2e5cbe954da93b4c 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaClusterBytebufferDataSyncBase.h
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaClusterBytebufferDataSyncBase.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTACLUSTERBYTEBUFFERDATASYNCBASE_H
 #define _VISTACLUSTERBYTEBUFFERDATASYNCBASE_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaDummyClusterBarrier.cpp b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaDummyClusterBarrier.cpp
index b884f96230540ed5c8a2216b763d3cb8d2843cfb..fe96ea8cc0acc02b7243ddb881dfc2f630720587 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaDummyClusterBarrier.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaDummyClusterBarrier.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDummyClusterBarrier.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaDummyClusterBarrier.h b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaDummyClusterBarrier.h
index 0ff7b125d4aafcb3feb4be2ed0cfac8fa99ae4fd..dbef333de09e9925aee876927db8f53005b38860 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaDummyClusterBarrier.h
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaDummyClusterBarrier.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADUMMYCLUSTERBARRIER_H
 #define _VISTADUMMYCLUSTERBARRIER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaDummyClusterDataCollect.cpp b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaDummyClusterDataCollect.cpp
index 2363e73d9300e345b7258575582b5e26194e6c05..88362ca9bd12773c7b0ebbb82e49fbcbadc8a33a 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaDummyClusterDataCollect.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaDummyClusterDataCollect.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDummyClusterDataCollect.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaDummyClusterDataCollect.h b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaDummyClusterDataCollect.h
index 0295ad78c5b0f34261b2e4e74bd9898f7ef5d299..a941bb85ba6af1fd7807fbb7f4ad8b96d6b4c991 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaDummyClusterDataCollect.h
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaDummyClusterDataCollect.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADUMMYCLUSTERCOLLECT_H
 #define _VISTADUMMYCLUSTERCOLLECT_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaDummyClusterDataSync.cpp b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaDummyClusterDataSync.cpp
index cb3c33da3737baa7c2c4d22e35738a36e5318d0c..c1b3195dfb67967b57cd64f3480258db339e1771 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaDummyClusterDataSync.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaDummyClusterDataSync.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDummyClusterDataSync.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaDummyClusterDataSync.h b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaDummyClusterDataSync.h
index 66ba6c1200b9bd522bc707931d2fba615f9f85eb..5875a5299836d57a264e5465876db04e55500d56 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaDummyClusterDataSync.h
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaDummyClusterDataSync.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADUMMYCLUSTERSYNC_H
 #define _VISTADUMMYCLUSTERSYNC_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaInterProcClusterBarrier.cpp b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaInterProcClusterBarrier.cpp
index 9b3b1e131425e576f1bdcc2600cb9ac4a8b3dee3..396d3057dee76149b1b8f3e03891abee6e7173a8 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaInterProcClusterBarrier.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaInterProcClusterBarrier.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaInterProcClusterBarrier.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaInterProcClusterBarrier.h b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaInterProcClusterBarrier.h
index 7edc64d274ae9312e6d39e5637d9b20226ab9c3b..1134b49080663799f778d8068a58c28b912be520 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaInterProcClusterBarrier.h
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaInterProcClusterBarrier.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAINTERPROCCLUSTERBARRIER_H
 #define _VISTAINTERPROCCLUSTERBARRIER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaInterProcClusterDataSync.cpp b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaInterProcClusterDataSync.cpp
index d121b1d476058c169b96d421c5458a3bcaa0c2d1..c2043c9a3db085f961146e1457540b98dc88a1eb 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaInterProcClusterDataSync.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaInterProcClusterDataSync.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaInterProcClusterDataSync.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaInterProcClusterDataSync.h b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaInterProcClusterDataSync.h
index e876971dfe41fcd991fba74e6c2a0476b3048771..2f5210d69ed98c706ce6f4b8edd7377abc26bbb9 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaInterProcClusterDataSync.h
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaInterProcClusterDataSync.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAINTERPROCCLUSTERDATASYNC_H
 #define _VISTAINTERPROCCLUSTERDATASYNC_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaMulticastClusterBarrier.cpp b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaMulticastClusterBarrier.cpp
index bb68814f8b0fd875bd7f11a6c0b6ffbec6a9f7ba..e779dedbb1414c7f8a7fe3d6009fdbcd1104adbb 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaMulticastClusterBarrier.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaMulticastClusterBarrier.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaMulticastClusterBarrier.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaMulticastClusterBarrier.h b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaMulticastClusterBarrier.h
index 629cba0b419dc9a25a0e9a5f75141a8fad5ed740..c1336d49cdae8ad48983912f9d2217deab6b78c5 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaMulticastClusterBarrier.h
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaMulticastClusterBarrier.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAMULTICASTCLUSTERBARRIER_H
 #define _VISTAMULTICASTCLUSTERBARRIER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaRecordReplayClusterDataSync.cpp b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaRecordReplayClusterDataSync.cpp
index 696831622466916d7b7727b3ff4572cb7f465cc8..a4754e0078818814a0d23ddf1e019af7450857f8 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaRecordReplayClusterDataSync.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaRecordReplayClusterDataSync.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaFiledumpClusterDataSync.cpp 30484 2012-06-05 15:36:07Z dr165799 $
+
 
 #include "VistaRecordReplayClusterDataSync.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaRecordReplayClusterDataSync.h b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaRecordReplayClusterDataSync.h
index 2610911af09e8c74d843b3d2f4182a3d43a07751..f35d8cb67f0abecd79615bcf8a90795e6cceaf16 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaRecordReplayClusterDataSync.h
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaRecordReplayClusterDataSync.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaFiledumpClusterDataSync.h 30018 2012-04-24 10:51:08Z dr165799 $
+
 
 #ifndef _VISTARECORDREPLAYCLUSTERSYNC_H
 #define _VISTARECORDREPLAYCLUSTERSYNC_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaTCPIPClusterBarrier.cpp b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaTCPIPClusterBarrier.cpp
index 3b5dc7a8431846c5929ddc44e81605d19e971b3d..48cc60bf797a8e3cc446a757d0b94f6b35453b0e 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaTCPIPClusterBarrier.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaTCPIPClusterBarrier.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaTCPIPClusterBarrier.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaTCPIPClusterBarrier.h b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaTCPIPClusterBarrier.h
index 38a4042356e0682db7f7d431ee7958cf6bffdb38..8747e8b63a3d5a8dfeb1ab6560f8424090a8bfc2 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaTCPIPClusterBarrier.h
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaTCPIPClusterBarrier.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATCPIPCLUSTERBARRIER_H
 #define _VISTATCPIPCLUSTERBARRIER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaTCPIPClusterDataCollect.cpp b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaTCPIPClusterDataCollect.cpp
index b943e6a132e2cd70e92e341e730d75ee5e87d330..3f54d243ee883b4c0411e61c41bb498ed93065e2 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaTCPIPClusterDataCollect.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaTCPIPClusterDataCollect.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaTCPIPClusterDataCollect.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaTCPIPClusterDataCollect.h b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaTCPIPClusterDataCollect.h
index b040e83dd83df6b6ef2c314b27d8cbf199d1aad1..dddf8cf368b8ae7b245774af462be7bba20c2938 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaTCPIPClusterDataCollect.h
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaTCPIPClusterDataCollect.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATCPIPCLUSTERCOLLECT_H
 #define _VISTATCPIPCLUSTERCOLLECT_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaTCPIPClusterDataSync.cpp b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaTCPIPClusterDataSync.cpp
index 94371ce8e00c659a05524255da9f0c00d0b2bc21..320251144f2f27b2a56cc046086dc86f08bb841a 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaTCPIPClusterDataSync.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaTCPIPClusterDataSync.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaTCPIPClusterDataSync.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaTCPIPClusterDataSync.h b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaTCPIPClusterDataSync.h
index 7027f9920a2a5beaaf0dc4c95941d84f3eafe865..37e44670af2dc5e85553b52014deb388c36cf058 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaTCPIPClusterDataSync.h
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/VistaTCPIPClusterDataSync.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATCPIPCLUSTERSYNC_H
 #define _VISTATCPIPCLUSTERSYNC_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/_SourceFiles.cmake b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/_SourceFiles.cmake
index aa8bc2f7d7a292492db7abc0728dbb335d9e0849..1b70da2a9a4829539728544068343c98d313d187 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/Imps/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "./Cluster/Imps" )
 set( RelativeSourceGroup "Source Files\\Cluster\\Imps" )
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterBarrier.cpp b/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterBarrier.cpp
index a65b0b2b0318b19c632d717be656d07dc14f0c4a..903db069f601b38132e10054a780ef3579672486 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterBarrier.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterBarrier.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaClusterBarrier.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterBarrier.h b/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterBarrier.h
index a6cba44f5655b02f22ca24c6bfbf3430d5ac3d85..f5ef3f30ad6240a076d5b3c4625d496037f7dbbc 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterBarrier.h
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterBarrier.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTACLUSTERBARRIER_H
 #define _VISTACLUSTERBARRIER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterDataCollect.cpp b/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterDataCollect.cpp
index 8e881fcf0d2824137918c0b37b23b5d956b80e23..88c84b685b30def58040b6662ae8ba7d8a58f001 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterDataCollect.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterDataCollect.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaClusterDataCollect.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterDataCollect.h b/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterDataCollect.h
index e57c173fec9b80c52617f96060b9db34a9b2f0ad..e606666902bc65f5eef1e4fef88dc8f72084fcdb 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterDataCollect.h
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterDataCollect.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTANETWORKCOLLECT_H
 #define _VISTANETWORKCOLLECT_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterDataSync.cpp b/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterDataSync.cpp
index 10c10e62e36a9d4ffc230844c007a12d399e5441..47ce05581f31d5c206e4ac3254bb58985e0e9b4a 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterDataSync.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterDataSync.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaInterProcComm/Cluster/VistaClusterDataSync.h>
 #include <VistaBase/VistaTimeUtils.h>
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterDataSync.h b/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterDataSync.h
index 44d82208f45812f6a6260de9b429b1990fdb726d..47c7442f2ad6caf430ed03ee66cbb7fe07219c1d 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterDataSync.h
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterDataSync.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTANETWORKSYNC_H
 #define _VISTANETWORKSYNC_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterSyncEntity.cpp b/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterSyncEntity.cpp
index f7cdffea52f65d27a5a62fa6a1e031d5f4da7719..6e4c7fac8c5d8ce35e9c60e5346a932a49cb72ba 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterSyncEntity.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterSyncEntity.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaClusterSyncEntity.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterSyncEntity.h b/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterSyncEntity.h
index b2e58e81778a8e3b95f81ec463ff5de579adc69b..2d8c27cb56c32ee00a3a3bf586bcf64036697594 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterSyncEntity.h
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/VistaClusterSyncEntity.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTACLUSTERSYNCENTITY_H
 #define _VISTACLUSTERSYNCENTITY_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Cluster/_SourceFiles.cmake b/VistaCoreLibs/VistaInterProcComm/Cluster/_SourceFiles.cmake
index c39060a77e3fd059c948ce6804c8391af4023a51..da47a24a3f559551526d69d01b8e028d0b5850b4 100644
--- a/VistaCoreLibs/VistaInterProcComm/Cluster/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaInterProcComm/Cluster/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "./Cluster" )
 set( RelativeSourceGroup "Source Files\\Cluster" )
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaMutexImp.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaMutexImp.cpp
index ee125f7255096776808b7238975ca09dba284439..d5c7240a07fd6939d6a1b6634b4f4c5e5834332d 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaMutexImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaMutexImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaInterProcComm/Concurrency/VistaIpcThreadModel.h>
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaMutexImp.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaMutexImp.h
index 556625ee13f35bb083014246128d8fc928267e44..6e3a1c59396518ccb230ffc4a23cc7530292b31f 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaMutexImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaMutexImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAMUTEXIMP_H
 #define _VISTAMUTEXIMP_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixProcessEventImp.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixProcessEventImp.cpp
index 4273b6efca0cacb62a30cd46a1e513e4f819395c..51b4478e23254accf822bf817c9ee786dc1c6ad4 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixProcessEventImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixProcessEventImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaInterProcComm/Concurrency/VistaIpcThreadModel.h>
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixProcessEventImp.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixProcessEventImp.h
index 38a7b1f477a00464148d755079900bf7cfa39559..0b0275efd735ce90a2be4c6cdd25616fbb2fdde4 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixProcessEventImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixProcessEventImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if !defined(VISTA_THREADING_WIN32)
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixProcessImp.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixProcessImp.cpp
index 193eb4e0e9a2def1f2f2fcc10e7e05e4024aa204..6f2f9e2491621dca0297a4c73c1f17eef9a81b7c 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixProcessImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixProcessImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaInterProcComm/Concurrency/VistaIpcThreadModel.h>
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixProcessImp.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixProcessImp.h
index d8ac400e5b5ff549af8f7fba63b0c0c63a41a6ca..af0779320181d199af7de32fad653743ced624bd 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixProcessImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixProcessImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(VISTA_THREADING_SPROC) || defined(VISTA_THREADING_POSIX)
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixSemaphoreImp.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixSemaphoreImp.cpp
index ac4f8ab8c866d0baa326fbb83bd048924875438a..775cf2fcbe5959b6118d602146307ce138064000 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixSemaphoreImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixSemaphoreImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaInterProcComm/Concurrency/VistaIpcThreadModel.h> 
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixSemaphoreImp.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixSemaphoreImp.h
index d03bf1970bd4c209bd1369b0caf1ab7a0334d7db..01a6304008d1c9672ab4f5146d1d857a16cda7c0 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixSemaphoreImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixSemaphoreImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(VISTA_THREADING_POSIX)
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixThreadEventImp.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixThreadEventImp.cpp
index 9616748ec3faa7ee542a7b4384c21534a5b116b2..e1221b3410f242b734128e53085325b7350313be 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixThreadEventImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixThreadEventImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <cerrno>
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixThreadEventImp.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixThreadEventImp.h
index 6f8036309b875a0a3b8fd5c9198d11217779e90f..f0c4d31cbd720466cce4ed2467c616d2cde833f9 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixThreadEventImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPosixThreadEventImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if !defined(VISTA_THREADING_WIN32)
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPriorityImp.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPriorityImp.cpp
index dc2a024ae59664c11c791af0a9e08a020e1fad38..9d8474bc3fed264f8850bcb9a69c700b8b2d75ba 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPriorityImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPriorityImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaInterProcComm/Concurrency/VistaIpcThreadModel.h>
 #include "VistaPriorityImp.h"
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPriorityImp.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPriorityImp.h
index 4babad0f8d7db9c0eca04d5a552ff94a68c01e6e..f42d7adb720535751e4c74b8eb65c8d00d48baa9 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPriorityImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPriorityImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAPRIORITYIMP_H
 #define _VISTAPRIORITYIMP_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaProcessEventImp.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaProcessEventImp.cpp
index 6dfce6eb3a69c02d6fdb3143be3ca60c2b8a0fc5..d0a311119c594d0860d78352db612bf9a36b5f58 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaProcessEventImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaProcessEventImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaInterProcComm/Concurrency/VistaIpcThreadModel.h>
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaProcessEventImp.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaProcessEventImp.h
index 3a3cf9c11dcd0f672aa923102a8f347b72d8c9a9..9ba305156ab61b369367c73759c620bca1591c61 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaProcessEventImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaProcessEventImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAPROCESSEVENTIMP_H
 #define _VISTAPROCESSEVENTIMP_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaProcessImp.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaProcessImp.cpp
index 8f562c062cc462fed18a521dc4a36baaaffcf1ad..d26efec78bb082bbae2f738020c28e3f412c7f2f 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaProcessImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaProcessImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaInterProcComm/Concurrency/VistaIpcThreadModel.h>
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaProcessImp.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaProcessImp.h
index 63876bfbbb444fcce4de3d6ee9b231765fbcde73..d5571f758ce27e8c4306697976d9f90ee6650bea 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaProcessImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaProcessImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAPROCESSIMP_H
 #define _VISTAPROCESSIMP_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadReaderWriterLockImp.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadReaderWriterLockImp.cpp
index c3c788243ef63f785cff62bbb3977f61042e668b..d2962f334c762ecb22975e13a81a70a1d8bde574 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadReaderWriterLockImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadReaderWriterLockImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaInterProcComm/Concurrency/VistaIpcThreadModel.h>
 #if defined(VISTA_THREADING_POSIX) && defined(_USE_PTHREAD_RWLOCK)
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadReaderWriterLockImp.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadReaderWriterLockImp.h
index 181bb324ab58d6ae8d19aa2f87e9884e4c007bed..b62c425546d2fe46f17ad266cab89f5f0766a2e2 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadReaderWriterLockImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadReaderWriterLockImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(VISTA_THREADING_POSIX) && defined(_USE_PTHREAD_RWLOCK)
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadThreadEventImp.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadThreadEventImp.cpp
index 0ff5ae10c054828a4672a9a86705cca61a131cfa..120f9e4a06af59df513833bc9714d35530183309 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadThreadEventImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadThreadEventImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaInterProcComm/Concurrency/VistaIpcThreadModel.h>
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadThreadEventImp.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadThreadEventImp.h
index 13f52e86917ad27b360672a799f5ba7672088045..3742e7c4b9007ed16a75c3039134a48ead35f3dd 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadThreadEventImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadThreadEventImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(VISTA_THREADING_POSIX)
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsMutexImp.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsMutexImp.cpp
index 45502ecf5d52f7edf901aeb378e79bcca29ebfd6..12f734da3ed072b4f63e25a9f8c6b14c448712d1 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsMutexImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsMutexImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if !defined(_POSIX_C_SOURCE)
 #define _POSIX_C_SOURCE 199506L
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsMutexImp.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsMutexImp.h
index e697b0e40cc5ae96c2bdf2513d2ed561c2276f11..b30a62422d4a6a8dcdb7b14653ebf8201a3e4108 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsMutexImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsMutexImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(VISTA_THREADING_POSIX)
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsPriorityImp.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsPriorityImp.cpp
index 26576138c691f79f03241bca32b57a02e33dc861..95c4b5fff569d88eb6dfb45f3d99348415682670 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsPriorityImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsPriorityImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaInterProcComm/Concurrency/VistaIpcThreadModel.h>
 #if defined(VISTA_THREADING_POSIX)
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsPriorityImp.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsPriorityImp.h
index f1027ea845013b657d7adb8956411d7568defa60..1b4b76906a5d9ccb6badc3e51c79b6c9ffb1de62 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsPriorityImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsPriorityImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(VISTA_THREADING_POSIX)
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsThreadConditionImp.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsThreadConditionImp.cpp
index a35da8cfd7bb19626dcc722b3a07d4ba3c993f42..1441a222457ee9b5fdfdeebdda7c587d002a8e3f 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsThreadConditionImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsThreadConditionImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <cerrno>
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsThreadConditionImp.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsThreadConditionImp.h
index b598590e89692d9ee2a17012a27248f5238e07ee..8bed25ec07112545b6c41463b0b590b5358fa9ee 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsThreadConditionImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsThreadConditionImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAPTHREADSTHREADCONDITIONIMP_H
 #define _VISTAPTHREADSTHREADCONDITIONIMP_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsThreadImp.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsThreadImp.cpp
index 5b81e39964fe23a6a3198a6c8ddef39589d30b29..95d8d1cce0911c0f90c551265c2aff1ac64badd6 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsThreadImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsThreadImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaInterProcComm/Concurrency/VistaIpcThreadModel.h>
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsThreadImp.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsThreadImp.h
index 29858ffe4d1269e52ac82497c87b6dd8ab267458..5c8e1b60dfdc766f5f4a54521f34bc1a7fefc855 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsThreadImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaPthreadsThreadImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(VISTA_THREADING_POSIX)
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaReaderWriterLockImp.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaReaderWriterLockImp.cpp
index 03bed8ff75a0ddfb1024d94f97d145e94aa59ca3..423c7cffdb1ed38b808ba1782c0634eefde07bfe 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaReaderWriterLockImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaReaderWriterLockImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaReaderWriterLockImp.h" 
 #include "../VistaMutex.h"
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaReaderWriterLockImp.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaReaderWriterLockImp.h
index 7dfc4b19c11793a20d9eeac37ed674dc68e8be18..6abcfe5ee3a388975d7a27577267e4fb66a079f5 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaReaderWriterLockImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaReaderWriterLockImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAREADERWRITERLOCKIMP_H
 #define _VISTAREADERWRITERLOCKIMP_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaSemaphoreImp.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaSemaphoreImp.cpp
index eb6ae9c9e7889584feb881875a52eb7c6809f373..1ec55789e2b5ccbfb4a5fd28a6fd4853ab9f7220 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaSemaphoreImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaSemaphoreImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaInterProcComm/Concurrency/VistaIpcThreadModel.h>
 #include "VistaSemaphoreImp.h"
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaSemaphoreImp.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaSemaphoreImp.h
index 37eeb4358786a8aa363e12a1393a309901690806..aae4dab8e6a5e5b8572a8d3f9b06de3196a97421 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaSemaphoreImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaSemaphoreImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASEMAPHOREIMP_H
 #define _VISTASEMAPHOREIMP_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaThreadConditionImp.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaThreadConditionImp.cpp
index cee366cd8da5c0d2282f2410b3e3853c7c9dbd98..2d7f47a155ab4cde8f68e6b5745991e1410f3106 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaThreadConditionImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaThreadConditionImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaInterProcComm/Concurrency/VistaIpcThreadModel.h>
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaThreadConditionImp.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaThreadConditionImp.h
index bd69c334f0bcc0b0bb072c9daea1aad118c11184..b4a33291fb2020e0bd2c899380637e2a0befb8e8 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaThreadConditionImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaThreadConditionImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATHREADCONDITIONIMP_H
 #define _VISTATHREADCONDITIONIMP_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaThreadEventImp.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaThreadEventImp.cpp
index b082ef5985794285cafe3da96b31bf4aaafa52a0..9166de2d27dd21f9c04dc86ca4d17cc124b330dc 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaThreadEventImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaThreadEventImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaInterProcComm/Concurrency/VistaIpcThreadModel.h>
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaThreadEventImp.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaThreadEventImp.h
index be9cb688845c88e41eb9b389eaa8ea5cd56a7fb7..3b2b394d1b12cf2ae8403f1dc2a68b7f47a23c35 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaThreadEventImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaThreadEventImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATHREADEVENTIMP_H
 #define _VISTATHREADEVENTIMP_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaThreadImp.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaThreadImp.cpp
index 42729807ffc39051e95f71f60b92a347a3ca781d..8042f8d9399291c0220ecc01610a458ba1d39d6c 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaThreadImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaThreadImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaThreadImp.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaThreadImp.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaThreadImp.h
index 2ff4c0acaddb606b6cc3824791091c90d8046cd7..2dc395148a231c25ff1e06aed48062d15205f232 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaThreadImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaThreadImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATHREADIMP_H
 #define _VISTATHREADIMP_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32MutexImp.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32MutexImp.cpp
index f187b46ad2c7bb2c8e85146873556f58805336f0..99f9e76a42a03740f43c87dabdefac2b78d1f1a1 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32MutexImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32MutexImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaInterProcComm/Concurrency/VistaIpcThreadModel.h>
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32MutexImp.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32MutexImp.h
index 8572db4aa43d86965f09b1a894a2d1580c22ccbb..f21224cae9dda7e24377d0a60323928c8d7cddbb 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32MutexImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32MutexImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(VISTA_THREADING_WIN32)
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32PriorityImp.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32PriorityImp.cpp
index f95d169eefd55bb9be0ba1e09b45e4baf9ffc885..4359b7d8fd91b911c94aaa9544bc3e07f0df0335 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32PriorityImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32PriorityImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaInterProcComm/Concurrency/VistaIpcThreadModel.h>
 #if defined(VISTA_THREADING_WIN32)
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32PriorityImp.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32PriorityImp.h
index cd62a4c3c1bb37eb33fb78e3fea1fbeeceadeb16..f138edcaf87c304ad8e67c0936cb5a2fb0be2c8b 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32PriorityImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32PriorityImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(VISTA_THREADING_WIN32)
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ProcessEventImp.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ProcessEventImp.cpp
index b60014fd526b85f5651b464fb77ba2745b179568..c3a47737943bee3410ea89580334bc1d118b941c 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ProcessEventImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ProcessEventImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaInterProcComm/Concurrency/VistaIpcThreadModel.h>
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ProcessEventImp.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ProcessEventImp.h
index c317bbddc6db790bbc2d8c7a5a138ba28a1afba7..5bf9d4b16aacfbb6c578955181cca10ef492390a 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ProcessEventImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ProcessEventImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(VISTA_THREADING_WIN32)
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ProcessImp.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ProcessImp.cpp
index 336030d87f8cf5f4c9632cce72eff08825fc2235..52219b4c50d0fe7196136afc305d82a1b423c64a 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ProcessImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ProcessImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 #include <string>
 using namespace std;
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ProcessImp.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ProcessImp.h
index d1634531b39f5212b08ab2ea2539f4093242ea77..077f6e8330d3befc9958b5556f6c070e2835560c 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ProcessImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ProcessImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(VISTA_THREADING_WIN32)
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32SemaphoreImp.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32SemaphoreImp.cpp
index 4807e7ac7f5757ebc594d3afe450ff197631f7be..5c37981e4457967e7ece09e7e5b887b21921e7c9 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32SemaphoreImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32SemaphoreImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaInterProcComm/Concurrency/VistaIpcThreadModel.h>
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32SemaphoreImp.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32SemaphoreImp.h
index cb3c7a485be01d1d5efd99617607ea75a1a0d887..8f6b111f1b3b1edac3167f79fb68e1918be2dd0c 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32SemaphoreImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32SemaphoreImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(VISTA_THREADING_WIN32)
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ThreadConditionImp.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ThreadConditionImp.cpp
index 6e4c0ba933629e25813faa6a6e01ce50856b25b5..303affab96ae67b46765b36191df8679fe052a16 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ThreadConditionImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ThreadConditionImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(WIN32)
 #include <VistaInterProcComm/Concurrency/VistaIpcThreadModel.h>
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ThreadConditionImp.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ThreadConditionImp.h
index 10ad45124735b319476a7413e4e9e7a0e948208c..c9195f147d673e868139078ed5a62d6b92e151e9 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ThreadConditionImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ThreadConditionImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(WIN32)
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ThreadEventImp.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ThreadEventImp.cpp
index 635a7605b7f0eaa0dfadf69af739138f12c2f1bc..0de7735945a615bbf6fdb74f807731e0fbb3bf8f 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ThreadEventImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ThreadEventImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaInterProcComm/Concurrency/VistaIpcThreadModel.h>
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ThreadEventImp.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ThreadEventImp.h
index eed9ec6cc730fd1e98e91264bc1697043e732b16..f5beb36b214474b416857c12b069d0dcdf0d2feb 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ThreadEventImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ThreadEventImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(VISTA_THREADING_WIN32)
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ThreadImp.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ThreadImp.cpp
index 7bb64a8ac0c4961f09576d1934d2b7a341f41050..18920731903acda6264a274145017fb8d2a86142 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ThreadImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ThreadImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaInterProcComm/Concurrency/VistaIpcThreadModel.h>
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ThreadImp.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ThreadImp.h
index 8eeb1df6683c37b88dfe6270837cc163085365ab..974895c960f842c14c78111a5d6045fa73647a19 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ThreadImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/VistaWin32ThreadImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(VISTA_THREADING_WIN32)
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/_SourceFiles.cmake b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/_SourceFiles.cmake
index 0744bf5be13ec8ca24254b17d6968c5b0696af80..1b4af9de43ddef742ecc52d00791d70fefc182f5 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/Imp/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "./Concurrency/Imp" )
 set( RelativeSourceGroup "Source Files\\Concurrency\\Imp" )
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaBarrier.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaBarrier.cpp
index 1e7d6928de113024eca01add2ec629da868ecec5..0640f89415a568f2727b9dc4f235dedd12a48a34 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaBarrier.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaBarrier.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaBarrier.h" 
 #include "VistaThreadCondition.h"
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaBarrier.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaBarrier.h
index f589b5bdc56a894cd066e0f9f25b3710320fce8e..e45f1c9165df870773ee8de2cea72a97731899eb 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaBarrier.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaBarrier.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTABARRIER_H
 #define _VISTABARRIER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaDefSemaphoreImp.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaDefSemaphoreImp.cpp
index ec0501dc3ce9248d1cd4afa22091afe81d6959ec..39d5bdb1b997bcad2e9785dc517fd79b56276a91 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaDefSemaphoreImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaDefSemaphoreImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDefSemaphoreImp.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaDefSemaphoreImp.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaDefSemaphoreImp.h
index b4b63f58adb3817d9b53a3966f565d512fdc0e25..240daa9fd26a9658ff10de089e300c088cc2ab77 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaDefSemaphoreImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaDefSemaphoreImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADEFSEMAPHOREIMP_H
 #define _VISTADEFSEMAPHOREIMP_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaFork.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaFork.h
index 106248a53d7accc7f0d5a8bbfc92e234558102d1..0117b168037ee8229a389c65f4d6db1797c55cdb 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaFork.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaFork.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAFORK_H
 #define _VISTAFORK_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaIpcThreadModel.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaIpcThreadModel.h
index 1efc6b80083735bfc3f4353e020f211469151cf8..7ffb307f11b89b17e52dc0b1e05b9314e25ac5f8 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaIpcThreadModel.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaIpcThreadModel.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAIPCTHREADMODEL_H
 #define _VISTAIPCTHREADMODEL_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaMutex.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaMutex.cpp
index aac2dbe4a425ba73b1fe17ba85472de83994e6c2..cbc2091ced2b01806c8aee408f2bbb83edd67418 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaMutex.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaMutex.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 #include <string>
 using namespace std;
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaMutex.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaMutex.h
index 799977336d7b055c44e344e690d1b8ebdb06b26c..e25d76e2109b51616c725c40a02f80bb61e351cf 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaMutex.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaMutex.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAMUTEX_H
 #define _VISTAMUTEX_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaPriority.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaPriority.cpp
index 4736521504642d210eb3477815b41c1bb11323c8..26b76d31e07bffc75cbcae3bcc72e069017c1883 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaPriority.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaPriority.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaPriority.h"
 #include "Imp/VistaPriorityImp.h"
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaPriority.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaPriority.h
index 603b546b778786eadacc6947ab1c8647583488fb..c3d87314530033266017fe55aee327d592c33521 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaPriority.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaPriority.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAPRIORITY_H
 #define _VISTAPRIORITY_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaProcess.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaProcess.cpp
index a2b8a77082d2c1d1c1d60909a9d75dd5205056d9..ba90e4afcbea4bd576a0cad12b4bf776e3231766 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaProcess.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaProcess.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaProcess.h"
 #include "Imp/VistaProcessImp.h"
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaProcess.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaProcess.h
index b53508ac03356ae4171fc66a8404614cce70f0b2..18485e379f061202c603ea04532f649a00d8c0f1 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaProcess.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaProcess.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAPROCESS_H
 #define _VISTAPROCESS_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaProcessEvent.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaProcessEvent.cpp
index 449745f91d873ce78a882ee82694ba337c703739..e0ab82301d7276b1626153e0ead940275179d0c0 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaProcessEvent.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaProcessEvent.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaProcessEvent.h"
 #include "Imp/VistaProcessEventImp.h"
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaProcessEvent.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaProcessEvent.h
index 05330b12a79d371418549a66b2c542478c4a6369..9f75f3e435941ea5bc536db26e02f70a5fecd013 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaProcessEvent.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaProcessEvent.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAPROCESSEVENT_H
 #define _VISTAPROCESSEVENT_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaReaderWriterLock.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaReaderWriterLock.cpp
index ad515f86935243fbfd0e1be34c0a040c22781910..f85816011551fe2c6fcaca6848cbf91523aeb935 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaReaderWriterLock.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaReaderWriterLock.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaReaderWriterLock.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaReaderWriterLock.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaReaderWriterLock.h
index 46a42160b2a671ee24b1a75946e4b0d12243b359..37816c67d462a2b08c0cac54dc4325a6aaaf5cb8 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaReaderWriterLock.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaReaderWriterLock.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAREADERWRITERLOCK_H
 #define _VISTAREADERWRITERLOCK_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaSemaphore.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaSemaphore.cpp
index f6443d1937d2aa73cdbe05a2c3db31014e712cb2..9324045595151bedc18430d0cfbe84fd0b77af1a 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaSemaphore.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaSemaphore.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaSemaphore.h"
 #include "VistaDefSemaphoreImp.h"
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaSemaphore.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaSemaphore.h
index a105d07c923517639c9c12742dce4236caf12dd4..59dbe58262695c2c2ad1861c13f951ab20d949c4 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaSemaphore.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaSemaphore.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASEMAPHORE_H
 #define _VISTASEMAPHORE_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThread.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThread.cpp
index 62094009f86f2053bab7fdd1813bedf00eb76bc4..f4a7131c7b699769d731a53209b47172c7982391 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThread.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThread.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaThread.h"
 #include "Imp/VistaThreadImp.h"
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThread.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThread.h
index 9402cad165f48c074be10defacce1a95501d4500..c882db89d3e6e9723201f9123e2d1eb5fe5f4933 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThread.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThread.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATHREAD_H
 #define _VISTATHREAD_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadCondition.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadCondition.cpp
index 478a90a6e651768643dbaa3816980ea4fe2412a9..b4b618098b170b470a7cbea5f749a3e4f9c2c3c2 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadCondition.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadCondition.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaThreadCondition.h"
 #include "Imp/VistaThreadConditionImp.h"
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadCondition.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadCondition.h
index a7be65e4863498e22284524d4aa3e66adbff3506..533e3694393963f96893c2109c640d1cc63abb82 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadCondition.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadCondition.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATHREADCONDITION_H
 #define _VISTATHREADCONDITION_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadEvent.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadEvent.cpp
index 8c4bb63ccf7b3a2836bf2546f12916814289a017..1bd310c90f19768dba53a09b3de759aad80f39d8 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadEvent.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadEvent.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaThreadEvent.h"
 #include "Imp/VistaThreadEventImp.h"
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadEvent.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadEvent.h
index 0f3812b3d15e3cf5004a6a5a2a82853f341b1465..4284356e880413ad827c7016a9793caad7809637 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadEvent.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadEvent.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATHREADEVENT_H
 #define _VISTATHREADEVENT_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadFunction.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadFunction.h
index 4c864b03c62694004bf94695ce2065c260e9853a..34bd4dae7a768421ee99dd587b2796c5c0047def 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadFunction.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadFunction.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATHREADFUNCTION_H
 #define _VISTATHREADFUNCTION_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadLoop.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadLoop.cpp
index 7238cda3ed5d88ced856be211b0a97bcac4a9648..6256319708c7c2d8918a92039b552d19cc6bc551 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadLoop.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadLoop.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaThreadLoop.h"
 #include "VistaMutex.h"
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadLoop.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadLoop.h
index 256e03c33fd7fb4b0e62ac3f466414e92e90715f..c7901c1f8749b60be8beb8cdca65decb9a82e9af 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadLoop.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadLoop.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATHREADLOOP_H
 #define _VISTATHREADLOOP_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadPool.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadPool.cpp
index 25a7a3e24279504657a83c420e7be7a4491a522d..1e925622fc91110272fbbe61f79c70c2746546bd 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadPool.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadPool.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <cstdio>
 #include <cstdarg>
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadPool.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadPool.h
index e07f9f8952752c352eb552286b1e9e0eb91e4998..5ed5a5a4c5fddc116d3b003a0aca756c6c10ea4d 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadPool.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadPool.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATHREADPOOL_H
 #define _VISTATHREADPOOL_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadTask.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadTask.cpp
index 673143d20348dc87909eab281be086f5a52e727b..1846e978907ce5a5f12ee0591ac1c42657b24f07 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadTask.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadTask.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaThreadTask.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadTask.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadTask.h
index 0039719b98dbcbec93c12038d21ca87489d1fc52..34d85f5cb77d9006db12ec2b29bc5bfe58e10651 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadTask.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaThreadTask.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATHREADTASK_H
 #define _VISTATHREADTASK_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaTicker.cpp b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaTicker.cpp
index fcf3b4749fcd73ddad587ffb1cf3bba69d37f923..d2fd2594b09430a5da922d89c54773c615946c02 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaTicker.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaTicker.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 //#include "ITAStopwatch.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaTicker.h b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaTicker.h
index b847ed9e33ab2edc58437959d6b70bafe884bd02..ccd2e358b721ba31fd35a48c00cdac41c1ae940e 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaTicker.h
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/VistaTicker.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATICKER_H
 #define _VISTATICKER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Concurrency/_SourceFiles.cmake b/VistaCoreLibs/VistaInterProcComm/Concurrency/_SourceFiles.cmake
index dc5546b5138ea7ada8fa56bdd22b8b706b92ca6d..9d5b9fe59c247c53ab1391bd3fb825a1119f5f4a 100644
--- a/VistaCoreLibs/VistaInterProcComm/Concurrency/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaInterProcComm/Concurrency/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "./Concurrency" )
 set( RelativeSourceGroup "Source Files\\Concurrency" )
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaByteBufferDeSerializer.cpp b/VistaCoreLibs/VistaInterProcComm/Connections/VistaByteBufferDeSerializer.cpp
index c21f1bee48183ae81917841e68d279e3973dd3ae..c70fac1fe00fe4221f171d670d7ca3038a0e64d1 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaByteBufferDeSerializer.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaByteBufferDeSerializer.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <cstring>
 #include <cstdio>
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaByteBufferDeSerializer.h b/VistaCoreLibs/VistaInterProcComm/Connections/VistaByteBufferDeSerializer.h
index ac279c2696280c41d91d0c75db0bb3550f666be7..ce5d3ec4727e3f74de469d5de2c2cff933894371 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaByteBufferDeSerializer.h
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaByteBufferDeSerializer.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTABYTEBUFFERDESERIALIZER_H
 #define _VISTABYTEBUFFERDESERIALIZER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaByteBufferSerializer.cpp b/VistaCoreLibs/VistaInterProcComm/Connections/VistaByteBufferSerializer.cpp
index 71a3de154960ffb581c9b801b5a2422ecb5f342e..1a52110dac1d6b114ed7b5aa306aff75a43d2d74 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaByteBufferSerializer.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaByteBufferSerializer.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaByteBufferSerializer.h"
 #include <VistaAspects/VistaSerializable.h>
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaByteBufferSerializer.h b/VistaCoreLibs/VistaInterProcComm/Connections/VistaByteBufferSerializer.h
index 85a1c4fdf6795e0f83cc49a3f9c3b8d807a4f049..f6c597afd5c701f9f70453bc491f40b74969fd93 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaByteBufferSerializer.h
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaByteBufferSerializer.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTABYTEBUFFERSERIALIZER_H
 #define _VISTABYTEBUFFERSERIALIZER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaCSVDeSerializer.cpp b/VistaCoreLibs/VistaInterProcComm/Connections/VistaCSVDeSerializer.cpp
index 65ce8cd2970138c289409c0de883695af6a3928f..f66a29f432306da62f7b994ec7604ab433fca7d0 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaCSVDeSerializer.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaCSVDeSerializer.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaCSVDeSerializer.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaCSVDeSerializer.h b/VistaCoreLibs/VistaInterProcComm/Connections/VistaCSVDeSerializer.h
index 8e693aabc6b4658076df75b9e94343d1b3e0cc75..15e816d1d1e1ad26bb664e216333f934a882dbcb 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaCSVDeSerializer.h
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaCSVDeSerializer.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTACSVDESERIALIZER_H
 #define _VISTACSVDESERIALIZER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaCSVSerializer.cpp b/VistaCoreLibs/VistaInterProcComm/Connections/VistaCSVSerializer.cpp
index 241a76c062d3516f53f2a0e64ac05dc362d1cc37..432b941933b3c00a3702ca69779a0aeaf32ef110 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaCSVSerializer.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaCSVSerializer.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaCSVSerializer.h"
 #include <VistaAspects/VistaSerializable.h>
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaCSVSerializer.h b/VistaCoreLibs/VistaInterProcComm/Connections/VistaCSVSerializer.h
index d9ae3fe70102f77b1aa7d1976728700b98cd1d27..deea296102e753f8a01acf3f80937862cc5f3ee7 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaCSVSerializer.h
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaCSVSerializer.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTACSVSERIALIZER_H
 #define _VISTACSVSERIALIZER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnection.cpp b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnection.cpp
index 0e3873634bc3076b8427205634a1b4775d302deb..85d4bc53943598f00e043d058f88366a62d337c9 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnection.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnection.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaConnection.cpp 54863 2016-02-17 15:22:11Z dr165799 $
+
 
 #include "VistaConnection.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnection.h b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnection.h
index f49d9a361688c5a880216ea6afd773f8a6a36220..01262e21e196e5052b4848dc16de05d1b114fa37 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnection.h
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnection.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaConnection.h 54863 2016-02-17 15:22:11Z dr165799 $
+
 
 /*============================================================================*/
 /* VistaConnection is an abstact class which provides a generic interface    */
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionFile.cpp b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionFile.cpp
index 561d546a0d741f051bf5e4d0e58b10b58fbfde36..b823d03a604917dbe4f97a0ced269889700f9c7c 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionFile.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionFile.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(WIN32)
 #pragma warning( disable: 4996 )
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionFile.h b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionFile.h
index da58194454ebda9aa4014c7d450e41b8f59907c9..9fa7a926217661b33c137080cca153afc879afca 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionFile.h
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionFile.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTACONNECTIONFILE_H
 #define _VISTACONNECTIONFILE_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionFileTimed.cpp b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionFileTimed.cpp
index 03d9db3ed9b945860017acb1dddf3d0664130555..0005710419924722653042f48d28a647f232ae79 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionFileTimed.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionFileTimed.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaConnectionFileTimed.h"
 #include <string>
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionFileTimed.h b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionFileTimed.h
index 2f9946d54f0132a2fca66a3ef97a00c6e35b7e5b..dd4c95cfa82c0003b2bedf448aa866918e6da7d2 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionFileTimed.h
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionFileTimed.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTACONNECTIONFILETIMED_H
 #define _VISTACONNECTIONFILETIMED_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionIP.cpp b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionIP.cpp
index 64120dfe19b530dd65b7644145e94542c773f918..29889dbae434433ca21dcabb55c444928347f7de 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionIP.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionIP.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaConnectionIP.cpp 54863 2016-02-17 15:22:11Z dr165799 $
+
 
 #if defined(WIN32)
 #define _WINSOCKAPI_
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionIP.h b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionIP.h
index 9ddc02a007784d86fd3b900e4cbe97fed8038359..f0c829da3fc59821f858bbc8e2fc05bcc8bfc5e8 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionIP.h
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionIP.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaConnectionIP.h 54863 2016-02-17 15:22:11Z dr165799 $
+
 
 #ifndef _VISTACONNECTIONIP_H
 #define _VISTACONNECTIONIP_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionNamedPipe.cpp b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionNamedPipe.cpp
index ca8774f50d31e3824a7ab4a46139137f3d6c6466..484d763936e5e511fea9366d65ff77aa5398e0fc 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionNamedPipe.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionNamedPipe.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaConnectionNamedPipe.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionNamedPipe.h b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionNamedPipe.h
index 36d03aa161e3f26a85250068dc48e98923ee5460..d33f52061c7be80d9ef192f74a5df1b90b414e49 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionNamedPipe.h
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionNamedPipe.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTACONNECTIONNAMEDPIPE_H__
 #define _VISTACONNECTIONNAMEDPIPE_H__
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionPipe.cpp b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionPipe.cpp
index eeae37054a15299beea77ada9b5e9dffe3664020..9beed304b632eb5e2c81c2354a2c24c28b6fd8e7 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionPipe.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionPipe.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if !defined(WIN32)
 #include <poll.h>
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionPipe.h b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionPipe.h
index e05623ac528275aedbcdf99b08ef6637ed7e1750..6e8c11c11199e6df9848feb857ba4f12a450690e 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionPipe.h
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionPipe.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTACONNECTIONPIPE_H__
 #define _VISTACONNECTIONPIPE_H__
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionPulsed.cpp b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionPulsed.cpp
index 24d79d9ecc40badf54dd4ac5c62cb8b457317979..3c612dfaaa1d9389e20aaab4ee16f94d731d4be8 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionPulsed.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionPulsed.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaConnectionPulsed.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionPulsed.h b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionPulsed.h
index f67bd38fdd205fae0ee4c46074ba3661df94e40b..afb126e7a097d3432e8ad8e95be6195bc25e6c31 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionPulsed.h
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionPulsed.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTACONNECTIONPULSED_H_
 #define _VISTACONNECTIONPULSED_H_
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionSerial.cpp b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionSerial.cpp
index dd482485247b398d48512c8b4282e4563dea2455..2e75e01f21f8759393c114289a424af78bd6928e 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionSerial.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionSerial.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaConnectionSerial.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionSerial.h b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionSerial.h
index 1a4a2861c68ea5af4726cff46a0da090d93cd3c8..6f982f96209d5484380f60611ad9d1f21ddfbc1c 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionSerial.h
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaConnectionSerial.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTACONNECTIONSERIAL_H
 #define _VISTACONNECTIONSERIAL_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaMsg.cpp b/VistaCoreLibs/VistaInterProcComm/Connections/VistaMsg.cpp
index d36d4623a8d1b5c369a79f8f6bb17339982e39c8..5f949ca59e8822e35c12aa15996d7232001c8e14 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaMsg.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaMsg.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaMsg.h"
 #include <VistaBase/VistaExceptionBase.h>
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaMsg.h b/VistaCoreLibs/VistaInterProcComm/Connections/VistaMsg.h
index 4190a6ddcd7a96570056dea2e07fbc58cd4f0c26..dadf4b8b934b5f9135cda1c849a8ec01785becf5 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaMsg.h
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaMsg.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAMSG_H
 #define _VISTAMSG_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaMsgChannel.cpp b/VistaCoreLibs/VistaInterProcComm/Connections/VistaMsgChannel.cpp
index dba29f9b966894627e0e4a176babb6b1d05017e2..1d7fd34b6e1b7b70d5550a96fc20b5d8c1947acb 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaMsgChannel.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaMsgChannel.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <cstdio>
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaMsgChannel.h b/VistaCoreLibs/VistaInterProcComm/Connections/VistaMsgChannel.h
index 4b9e84a04f4d0e135a501e8b074a4a64cb5e7414..fc8cf0ea277618e4d13a9c37d8ab2051b21f88d5 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaMsgChannel.h
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaMsgChannel.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAMSGCHANNEL_H
 #define _VISTAMSGCHANNEL_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaProgressMessage.cpp b/VistaCoreLibs/VistaInterProcComm/Connections/VistaProgressMessage.cpp
index a9d4dd1ba810df79bf8a56123c34cbce747be0cf..9b090579cc625e0a09e6acff25da8172277f8d18 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaProgressMessage.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaProgressMessage.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 #include <string>
 using namespace std;
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/VistaProgressMessage.h b/VistaCoreLibs/VistaInterProcComm/Connections/VistaProgressMessage.h
index 0deb1a4bef603aace90c5320a87766a5ffd4db2a..479cb1403eb13b86e5d7e1dd038bedab09a88ca9 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/VistaProgressMessage.h
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/VistaProgressMessage.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAPROGRESSMESSAGE_H
 #define _VISTAPROGRESSMESSAGE_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Connections/_SourceFiles.cmake b/VistaCoreLibs/VistaInterProcComm/Connections/_SourceFiles.cmake
index 1e972d1ce78086ad6e586f57056d362bf2c9a314..076056243308e7e958c900197fcfa9162558b6a6 100644
--- a/VistaCoreLibs/VistaInterProcComm/Connections/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaInterProcComm/Connections/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "./Connections" )
 set( RelativeSourceGroup "Source Files\\Connections" )
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveComponent.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveComponent.cpp
index d11c0eb6eb6ee302865b22fbc5f9cadf7b63bdca..c37b5230c2771c142af94ba0f3b5e5d5d747857b 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveComponent.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveComponent.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveComponent.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveComponent.h
index a4b57e3afd8c2f0538d8f1a9079664b2d9a632e0..b86bd48dbd1c2c1762daed6cc383af751dd6c27a 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveComponent.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveComponent.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef IDLVISTAACTIVECOMPONENT_H
 #define IDLVISTAACTIVECOMPONENT_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveDataConsumer.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveDataConsumer.cpp
index 8c4a2e807f8790e97904cbd28cb379a8ae51ac14..2ea0336719f09205b48800fc9002dd3da23d01db 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveDataConsumer.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveDataConsumer.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveDataConsumer.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveDataConsumer.h
index f543ae056d4ca0477bbc9bd492dc74984a728623..0eca52e413c8a73428c27660fecbfdad8c066de8 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveDataConsumer.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveDataConsumer.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef DLVISTAACTIVEDATACONSUMER_H
 #define DLVISTAACTIVEDATACONSUMER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveDataProducer.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveDataProducer.cpp
index 559ab4d992523bca948bb9e217c4c907aac46e9a..00fb27cab6e53d7e6132e8a2899de71097e1154b 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveDataProducer.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveDataProducer.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveDataProducer.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveDataProducer.h
index 51f94ea61da5d0b3713734983ec723414f5e0f97..0b4b6b0382097f840319155e47a30e5b9094ab45 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveDataProducer.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveDataProducer.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef IDLVISTAACTIVEDATAPRODUCER_H
 #define IDLVISTAACTIVEDATAPRODUCER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveFilter.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveFilter.cpp
index a6ad7ca0c8cc64711375eaa18c54b09a1fb81871..1cc5f5130c5e933079964bfd0f2ceb8dbac2601e 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveFilter.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveFilter.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveFilter.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveFilter.h
index c5b3bf34e113948088716196c46ee7ad3e3f6209..bfc1bbe306bda6deebb9dd8df907ccf30ca6aeeb 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveFilter.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaActiveFilter.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef DLVISTAACTIVEFILTER_H
 #define DLVISTAACTIVEFILTER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDLVTypes.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDLVTypes.h
index 4278d8e66458096daabf9e068ece7fc8a48a96fd..96f901e1daa730a4d818d1b7fcf115df72bbbd22 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDLVTypes.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDLVTypes.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if !defined(DLVISTATYPES_H)
 #define DLVISTATYPES_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataConsumer.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataConsumer.cpp
index be22dbc32c5931aa128c49a34bde08c0a2805edc..596a0e86615371a2eba5b4b7b5946690c785b495 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataConsumer.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataConsumer.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataConsumer.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataConsumer.h
index 67fc568d9f5fd6b5ed9d853495c43444b9257d93..0ca36772b815870ff676560fe29d66979ba377cd 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataConsumer.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataConsumer.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef IDLVISTADATACONSUMER_H
 #define IDLVISTADATACONSUMER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataPacket.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataPacket.cpp
index b52b4473291701c02baaae35822dc85b4ad55fe3..08907f8884e44047e763a15e575136cb1bbb3336 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataPacket.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataPacket.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataPacket.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataPacket.h
index e941e82861ec087bbc828b6ffe776d9032715293..82c8fb62722f3fd6e6991a2e1cb9cf98d1d13cef 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataPacket.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataPacket.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef IDLVISTADATAPACKET_H
 #define IDLVISTADATAPACKET_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataProducer.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataProducer.cpp
index 286f80fe795f8a22b30c3950702180e0c93e9d7f..f9281926f5e6240c805169cf2ab3b15c1ba07634 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataProducer.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataProducer.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataProducer.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataProducer.h
index 3dedf26a522d75d90d77acce704ba2b65b065158..45e991ddfca4e5c633b1c7cbec44de167f717c1a 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataProducer.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataProducer.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef IDLVISTADATAPRODUCER_H
 #define IDLVISTADATAPRODUCER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataSink.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataSink.cpp
index edf23bc79c5900846b8b6bbd46c15ed3fbbf652e..d1443721147617d36d2663f695f2a2abadf2af45 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataSink.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataSink.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataSink.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataSink.h
index 9209bac254fbae0ec9a67f2ac8b6442f9ba14a76..8cdcf7ba4cdd72a39cbbcd80164a4b4c162bc515 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataSink.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataSink.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef DLVISTADATASINK_H
 #define DLVISTADATASINK_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataSource.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataSource.cpp
index 49327988bdfb107ca30ac7dfb8485b770ba05e72..56b030ac19b6a96a3ee77b822c4f127ecae0e208 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataSource.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataSource.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataSource.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataSource.h
index 0c80d036267623cb191d98b836ef2242248a31b8..307cbe334754a76c90bd7802825cbb31e9196fce 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataSource.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDataSource.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef DLVISTADATASOURCE_H
 #define DLVISTADATASOURCE_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDemux.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDemux.cpp
index 7c3927b069ef429dd0a773bb46bd1f8a205b2dce..5981af8e0272f242393d878ffd9519d78375123f 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDemux.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDemux.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDemux.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDemux.h
index 9eb2fcaa577a92792843ecb7f54765edeb53b9b9..d5307198ed286efe4c52b6c87c2b9079332154d0 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDemux.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaDemux.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _DLVISTADEMUX_H
 #define _DLVISTADEMUX_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaFilter.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaFilter.cpp
index 805d8c5e5dc5761be5e35b5b8266ebb36ccc309a..ce3bb7c1e08a510fd26ef127a25faf6af3f14d9c 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaFilter.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaFilter.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaFilter.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaFilter.h
index cc2866b8c59550e2e41887db7bfbe941efdaadbd..4ea63c5392bf34ca12410a0bb198f85201a7f22d 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaFilter.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaFilter.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef IDLVISTAFILTER_H
 #define IDLVISTAFILTER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaInPlaceFilter.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaInPlaceFilter.cpp
index 8ccec224b0f977a850cc0fea7b764156ceca7291..a3a56f06fd6b59102b635337a904297312ba3ff5 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaInPlaceFilter.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaInPlaceFilter.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaInPlaceFilter.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaInPlaceFilter.h
index 494bc0ec17445283cae0c473608cb4d3616cc018..bb5d16718719316d2a51083e06ed52db49a28db3 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaInPlaceFilter.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaInPlaceFilter.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef IDLVISTAINPLACEFILTER_H
 #define IDLVISTAINPLACEFILTER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaPacketQueue.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaPacketQueue.cpp
index cf008f3843697cbb663c4999666757d5de4d636f..04e3cc5eb1d64802027f14509a2ce75b90fe8240 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaPacketQueue.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaPacketQueue.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaPacketQueue.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaPacketQueue.h
index 8e472e2a9691fbed7b7bc1b4cdd2d6ff429d22d9..5ca2832c8adfe32b29b5939b8c3d854a6ed5c3c8 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaPacketQueue.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaPacketQueue.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef DLVISTAPACKETQUEUE_H
 #define DLVISTAPACKETQUEUE_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaPipe.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaPipe.cpp
index 75f86e6b28eee4ac1627e8d786731bef6650086a..c218e5c0899b561be8948980ffa02fd53c75f8b3 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaPipe.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaPipe.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaPipe.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaPipe.h
index 0b2786918779ab6be4fd16c498f7a7db893b7c96..3f1f5a6cf544f9b58dbab60c7b9b223c197f0210 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaPipe.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaPipe.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef IDLVISTAPIPE_H
 #define IDLVISTAPIPE_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaPipeComponent.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaPipeComponent.cpp
index 766230e438ce2a1c2f54f7b7c368cb3eff50b40a..6ffbdf36173e0a65fdf238e274e15b32d092aec6 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaPipeComponent.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaPipeComponent.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaPipeComponent.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaPipeComponent.h
index a032e41e3ee91b4a622809719303a16a1bcce383..bd6e0059292b099cd321ba8fdf7e873eed2d8dd7 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaPipeComponent.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaPipeComponent.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef IDLVISTAPIPECOMPONENT_H
 #define IDLVISTAPIPECOMPONENT_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaRTC.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaRTC.cpp
index 34439a53a2c10ecfc32e86002596812c36ba341e..4b9f631bac559bc643d325b94fe4b0f89d18fd63 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaRTC.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaRTC.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaRTC.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaRTC.h
index 0774a6da8727332c25c111e95e2b53139210846c..4675f1c33fd7be452d8f2057746809e2bada3a57 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaRTC.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaRTC.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef IDLVISTARTC_H
 #define IDLVISTARTC_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaRegistration.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaRegistration.cpp
index 954ac6c895ccc9fd4d078affe54ec3ebae61dc29..79791b7427af863b8b8ce791c9ae1f7d090a6446 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaRegistration.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaRegistration.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaRegistration.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaRegistration.h
index 59ba9c99698532bbb71bfa2f55a02c9c87fd8afe..3122f9bf479c9d5da3fe5d14ba3bdd4817c17195 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaRegistration.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaRegistration.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef IDLVISTAREGISTRATION_H
 #define IDLVISTAREGISTRATION_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaRoutingPipe.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaRoutingPipe.cpp
index 405e036047ad03c093867ecfade41d91ce4e3fff..afc73b73c54bc43abc541fee046b3e76f709e2d7 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaRoutingPipe.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaRoutingPipe.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaRoutingPipe.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaRoutingPipe.h
index 646c24c23737f97f3f2708a6ce2a805b1af978b2..4c81a3f2f22932c66373b65c8e8a2963cdba9705 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaRoutingPipe.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaRoutingPipe.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef IDLVISTAROUTINGPIPE_H
 #define IDLVISTAROUTINGPIPE_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaTeeFilter.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaTeeFilter.cpp
index feb91b47d4450b08188e9797e706182de8f51f9a..1a50cbc41e4c55d2f72b4d1de8c1b89ecb2ba05f 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaTeeFilter.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaTeeFilter.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaTeeFilter.h"
 #include "VistaPacketQueue.h"
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaTeeFilter.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaTeeFilter.h
index 67df0085937d2182882ecd61e4f5bad75a8146b8..6cc921af647e27297fe79d7c72824d8446bcc9bd 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaTeeFilter.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaTeeFilter.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef IDLVISTATEEFILTER_H
 #define IDLVISTATEEFILTER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaTimeStamp.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaTimeStamp.cpp
index b619182d5f0e399b5fe74b6d3a840fcb6130bdb4..aaf53a003250938afd4fe1f7a57c447513d59ce7 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaTimeStamp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaTimeStamp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaTimeStamp.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaTimeStamp.h
index bb13aabbec2d76fc9cfc29c88b73e9b9db6fad46..aace0701cf092cff7b5fa6acb37c33bece784cad 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaTimeStamp.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaTimeStamp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if !defined(DLVISTATIMESTAMP_H)
 #define DLVISTATIMESTAMP_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaTransformFilter.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaTransformFilter.cpp
index 58f60a8f533be7c1ec9858690a8c4477e2ec9e17..23504864cb705ba550a50db348706b2b317ec745 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaTransformFilter.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaTransformFilter.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaTransformFilter.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaTransformFilter.h
index 41f84f1ef573ca65ff70c4b6720276c8a0823cfe..1abcfddb3d4241b8b8445e77128f806588981b9f 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaTransformFilter.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/VistaTransformFilter.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef IDLVISTATRANSFORMFILTER_H
 #define IDLVISTATRANSFORMFILTER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/_SourceFiles.cmake b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/_SourceFiles.cmake
index 8d3531bef41e03424273509c6830a953dde1866b..b8ba566c0473cc2429a08ae5ec507a7181859601 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Base/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "./DataLaVista/Base" )
 set( RelativeSourceGroup "Source Files\\DataLaVista\\Base" )
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaByteBufferPacket.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaByteBufferPacket.cpp
index 05ac6268b6ffa346eb9aea52a6fc90f746a8e3a8..313a6d705e397b58a28f4b14513d45f52a064e4a 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaByteBufferPacket.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaByteBufferPacket.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaByteBufferPacket.h"
 #include <VistaAspects/VistaSerializer.h>
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaByteBufferPacket.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaByteBufferPacket.h
index 5ad9f4d5d9886488574faf13cd8e9ddec65c7334..b8b2c90ff43cfcfd8b8d1dee2ad1462c8d9dec2c 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaByteBufferPacket.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaByteBufferPacket.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef DLVISTABYTEBUFFERPACKET_H
 #define DLVISTABYTEBUFFERPACKET_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaDummyRTC.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaDummyRTC.h
index cc15a0547510254df34d49fb455fe6d3919bc419..5f0332e7a3f9760320cade05230de8c2d466e78d 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaDummyRTC.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaDummyRTC.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADUMMYRTC_H
 #define _VISTADUMMYRTC_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaFileRegistration.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaFileRegistration.cpp
index 71b590e971809df77d2c15b9a5a75b45cf245ffd..d46cadc9d56ff803d58fd9463e7199b529faf92a 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaFileRegistration.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaFileRegistration.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaFileRegistration.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaFileRegistration.h
index 96a9ea79ff417e71d1931a975eefcdc233886a8e..8681ed7ed53f1e17ccbd8d0597e74ecbc59abe5e 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaFileRegistration.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaFileRegistration.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef IDLVISTAFILEREGISTRATION_H
 #define IDLVISTAFILEREGISTRATION_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaFileWriter.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaFileWriter.cpp
index 2dd6e340031cae12573b94de211fe21c43ec12c1..0cb23beb43ceef5da61ab05b978093c1b08d1ddc 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaFileWriter.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaFileWriter.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaFileWriter.h"
 #include "VistaByteBufferPacket.h"
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaFileWriter.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaFileWriter.h
index 2c8aa0192c4494b61ff24602df672a7e8d8c8c67..dec21a82e96a1447684841593149d1c61422c412 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaFileWriter.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaFileWriter.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef DLVISTAFILEWRITER_H
 #define DLVISTAFILEWRITER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaHRTimerRTC.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaHRTimerRTC.cpp
index 5a39d3f7250b15408540d13de3178546125eb0ff..4c41e0440a31aa0be3cfff040f75a480e2ac8aaa 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaHRTimerRTC.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaHRTimerRTC.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaHRTimerRTC.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaHRTimerRTC.h
index f27dc0e5b07dfc8969c1ece485c4fb4d03bc9a3c..74b041c571a4c38795f02873d903c789cd92f212 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaHRTimerRTC.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaHRTimerRTC.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(_USE_HRRTC)
 
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaNetDataCollector.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaNetDataCollector.cpp
index b44c8061cd05437a8101d2da070e59aff3125458..be8d9d313affec84f5103335fc82c020d8169005 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaNetDataCollector.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaNetDataCollector.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaNetDataCollector.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaNetDataCollector.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaNetDataCollector.h
index 552688fc03258d353c59cfd21ef4cb05f1e8f60b..f395e6353c709e9c200decd759889fce6c2b5902 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaNetDataCollector.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaNetDataCollector.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADATACOLLECTOR_H
 #define _VISTADATACOLLECTOR_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaNetDataDispatcher.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaNetDataDispatcher.cpp
index 4e31edb2bd77691349ffba8f3ca4d9ba1c57a628..3c1029c78f5b6aa2fbf10f9ffca6b90c8ac18f61 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaNetDataDispatcher.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaNetDataDispatcher.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaNetDataDispatcher.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaNetDataDispatcher.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaNetDataDispatcher.h
index 7ae46f488fe69bfc03fe6fea7e826dfeaf8a0237..833883576f2276eb4bae690fe27c2336e62cb64e 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaNetDataDispatcher.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaNetDataDispatcher.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTANETDATADISPATCHER_H
 #define _VISTANETDATADISPATCHER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaPacketPump.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaPacketPump.cpp
index 2cdf258767e3a235ce6d587b65e322295a4382d7..0d9c10281049a1c71b53dabc7ee6022f40a6b96c 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaPacketPump.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaPacketPump.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaPacketPump.h"
 #include <VistaInterProcComm/Concurrency/VistaThreadLoop.h>
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaPacketPump.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaPacketPump.h
index d496d7cd887fc1a62b555fb9bede2946ddcdb767..a46a131a3cd1967c6e822a982b48b9b37d0bb4c2 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaPacketPump.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaPacketPump.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef IDLVISTAPACKETPUMP_H
 #define IDLVISTAPACKETPUMP_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaPentiumBasedRTC.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaPentiumBasedRTC.cpp
index d2de7532d5d016b401ca1cc7dcb947aa4bdaa444..f455a809589606ff510ed6b4f5f545d0b809db4b 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaPentiumBasedRTC.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaPentiumBasedRTC.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaPentiumBasedRTC.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaPentiumBasedRTC.h
index ddc7ef9b36c06667061a59d86c1e67189006e999..ff65a9646bda8700d8e33b4a579c8d7e54500e95 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaPentiumBasedRTC.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaPentiumBasedRTC.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(WIN32) || defined(LINUX) && !defined(ARM)
 #define DLV_IX86
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaProfilingFilter.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaProfilingFilter.cpp
index 96411b520d1b2c85332b6919d58e79234fc6b516..38843ce0642b09a8f9b8c32f6479c433868cc941 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaProfilingFilter.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaProfilingFilter.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaProfilingFilter.h"
 #include <VistaInterProcComm/DataLaVista/Base/VistaDataPacket.h>
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaProfilingFilter.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaProfilingFilter.h
index 5105f3174527cfabcb931bb4f1dc22ae21cbeeb5..1354faa899bb344690698494d4c82739d96187ca 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaProfilingFilter.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaProfilingFilter.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef DLVISTAPROFILINGFILTER_H
 #define DLVISTAPROFILINGFILTER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaRamQueuePipe.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaRamQueuePipe.cpp
index 85eea31803ec04576de687dd314e44ecadaef992..44c5e5cfe209e1b15eec12b16d0adb496572b4e0 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaRamQueuePipe.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaRamQueuePipe.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaRamQueuePipe.h"
 #include <VistaInterProcComm/DataLaVista/Base/VistaPacketQueue.h>
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaRamQueuePipe.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaRamQueuePipe.h
index a9da823271b57a7534a30d4329c4c373c02d31c1..8d8bc6242d0de18f416251001c4854ded9e914a1 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaRamQueuePipe.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaRamQueuePipe.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef DLVISTARAMQUEUEPIPE_H
 #define DLVISTARAMQUEUEPIPE_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaSerialTeeFilter.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaSerialTeeFilter.cpp
index 3a8cc8a10418832dce6393a6a39055f60f973cc9..3ca5ed10a04027021aeea94e92be36768610af41 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaSerialTeeFilter.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaSerialTeeFilter.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaSerialTeeFilter.h"
 #include <VistaInterProcComm/DataLaVista/Base/VistaPacketQueue.h>
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaSerialTeeFilter.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaSerialTeeFilter.h
index 5537c7dea77f35136f650ebd69f3e18005e9a3f7..2407fe4a516a743fea97338fe76dd2a082de93da 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaSerialTeeFilter.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaSerialTeeFilter.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef DLVISTASERIALTEEFILTER_H
 #define DLVISTASERIALTEEFILTER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaSlotPipe.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaSlotPipe.cpp
index 9ab6d620846f6c836def3caa5d247c9597e370b8..b9b4b7963c25619e28578f960b1b154515f4803d 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaSlotPipe.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaSlotPipe.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaSlotPipe.h"
 #include <VistaInterProcComm/DataLaVista/Base/VistaPacketQueue.h>
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaSlotPipe.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaSlotPipe.h
index e9757ebffe302e581506318696b5ed1689ca2ed1..08dcfab935b4354e752775c89bd9cdfd953db5cd 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaSlotPipe.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/VistaSlotPipe.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef DLVISTASLOTPIPE_H
 #define DLVISTASLOTPIPE_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/_SourceFiles.cmake b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/_SourceFiles.cmake
index 10552c2edf060c6bd017735f834ffc1809cdd0f9..91d3ea767763ddb1a6c37340c44ff1dcfe113490 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Common/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "./DataLaVista/Common" )
 set( RelativeSourceGroup "Source Files\\DataLaVista\\Common" )
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaCheckError.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaCheckError.cpp
index f87e0b3ee2dc00898e1177d8bdb41de94d85d9b9..4a3a1bef3ff5d8e8bdc5d9d597b894f93513f87b 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaCheckError.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaCheckError.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaCheckError.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaCheckError.h
index 81fb89484fb016c61e24b540191b808c5c26afac..f24f0d093e545693f645f1238512e03b71980df0 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaCheckError.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaCheckError.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef DLVISTACHECKERROR_H
 #define DLVISTACHECKERROR_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaNullError.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaNullError.cpp
index 0fb54fc889656555fccc111128e1fe28b302e536..ee101f18a82fdd2b1283aed533901fa05c45c308 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaNullError.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaNullError.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaNullError.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaNullError.h
index 4a0240301872f6fe3b74c1caef22494358079f56..5b355a340287aaae170322151e1d1ada147216a9 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaNullError.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaNullError.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef IDLVISTANULLERROR_H
 #define IDLVISTANULLERROR_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaPipeChecker.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaPipeChecker.cpp
index 9285955e0908b363eddf93274ee38be2384b4a20..6913c33166df3dc99262f7ca6fc64874bf92a6f5 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaPipeChecker.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaPipeChecker.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaPipeChecker.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaPipeChecker.h
index 776766522bdc61dc1776c97e27092df513d707c8..b4e641493942f38eedc14449bea7e1f1d751f863 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaPipeChecker.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaPipeChecker.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef IDLVISTAPIPECHECKER_H
 #define IDLVISTAPIPECHECKER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaPipeConstructionKit.cpp b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaPipeConstructionKit.cpp
index 8cab679fe2834ca72a4e09f6c4e2c7b23043e43f..035b147db4706679f641ba11ef686a6dd3889ea0 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaPipeConstructionKit.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaPipeConstructionKit.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaPipeConstructionKit.h b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaPipeConstructionKit.h
index 077df545c56fd69215b51266d01ec1e16b9a5726..3dd7da5819bc1e5d09d18e57c8c9289c1ace62e9 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaPipeConstructionKit.h
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/VistaPipeConstructionKit.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef IDLVISTAPIPECONSTRUCTIONKIT_H
 #define IDLVISTAPIPECONSTRUCTIONKIT_H
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/_SourceFiles.cmake b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/_SourceFiles.cmake
index 602e65204972fb0c438fc1717a39d9d997b50a86..45ff0a434e9d4ce6969716d6f5dee99dcc40fc94 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/Construct/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "./DataLaVista/Construct" )
 set( RelativeSourceGroup "Source Files\\DataLaVista\\Construct" )
diff --git a/VistaCoreLibs/VistaInterProcComm/DataLaVista/_SourceFiles.cmake b/VistaCoreLibs/VistaInterProcComm/DataLaVista/_SourceFiles.cmake
index 8d1a99a44aa182f97329efcbdbe66cf8c2c72f5b..2985ecbd2708fc7e181bf2565405b58019ae996b 100644
--- a/VistaCoreLibs/VistaInterProcComm/DataLaVista/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaInterProcComm/DataLaVista/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "./DataLaVista" )
 set( RelativeSourceGroup "Source Files\\DataLaVista" )
diff --git a/VistaCoreLibs/VistaInterProcComm/Hardware/Imp/VistaPosixSerialPortImp.cpp b/VistaCoreLibs/VistaInterProcComm/Hardware/Imp/VistaPosixSerialPortImp.cpp
index 2ffe2c191fe998fcbc4a7047516a5076658659fa..86cb5e0622ef79a1f6ad1a3784ebde4f20ae5cbc 100644
--- a/VistaCoreLibs/VistaInterProcComm/Hardware/Imp/VistaPosixSerialPortImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Hardware/Imp/VistaPosixSerialPortImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(LINUX) || defined(IRIX) || defined(HPUX) || defined(SUNOS) || defined(DARWIN)
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Hardware/Imp/VistaPosixSerialPortImp.h b/VistaCoreLibs/VistaInterProcComm/Hardware/Imp/VistaPosixSerialPortImp.h
index 437cce7536c877ff290c78bc3020362ce6c5b4e0..ba087a05b77a6b04cd5b83b3553d28bb7e8e806e 100644
--- a/VistaCoreLibs/VistaInterProcComm/Hardware/Imp/VistaPosixSerialPortImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Hardware/Imp/VistaPosixSerialPortImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(LINUX) || defined(IRIX) || defined(HPUX) || defined(SUNOS) || defined(DARWIN)
 #ifndef _VISTAPOSIXSERIALPORTIMP_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Hardware/Imp/VistaSerialPortImp.cpp b/VistaCoreLibs/VistaInterProcComm/Hardware/Imp/VistaSerialPortImp.cpp
index a3b2a65b4ef26eda03b9ba6b248be968023a9320..f24b97c49d69626cb79fedcbc2292fe9362f6c75 100644
--- a/VistaCoreLibs/VistaInterProcComm/Hardware/Imp/VistaSerialPortImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Hardware/Imp/VistaSerialPortImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaSerialPortImp.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Hardware/Imp/VistaSerialPortImp.h b/VistaCoreLibs/VistaInterProcComm/Hardware/Imp/VistaSerialPortImp.h
index 30ce171cbffbb26c4c12f3e9a558af05eaf5d5f9..4953a5d7a79513e63cdd763a9fe8bdc270791128 100644
--- a/VistaCoreLibs/VistaInterProcComm/Hardware/Imp/VistaSerialPortImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Hardware/Imp/VistaSerialPortImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASERIALPORTIMP_H
 #define _VISTASERIALPORTIMP_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Hardware/Imp/VistaWin32SerialPortImp.cpp b/VistaCoreLibs/VistaInterProcComm/Hardware/Imp/VistaWin32SerialPortImp.cpp
index 761c1daf7b8c57065fc2691267ea3a710eda0547..e3d2597867cfede4737eb217a621445d59aa41d6 100644
--- a/VistaCoreLibs/VistaInterProcComm/Hardware/Imp/VistaWin32SerialPortImp.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Hardware/Imp/VistaWin32SerialPortImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(WIN32)
 
diff --git a/VistaCoreLibs/VistaInterProcComm/Hardware/Imp/VistaWin32SerialPortImp.h b/VistaCoreLibs/VistaInterProcComm/Hardware/Imp/VistaWin32SerialPortImp.h
index c3c6c4de4e326fe73ea4b5d5309badd1a01b156c..4cb537a88bc7f09c109dd558a7abe53cc2a8829d 100644
--- a/VistaCoreLibs/VistaInterProcComm/Hardware/Imp/VistaWin32SerialPortImp.h
+++ b/VistaCoreLibs/VistaInterProcComm/Hardware/Imp/VistaWin32SerialPortImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(WIN32)
 #ifndef _VISTAWIN32SERIALPORTIMP_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Hardware/Imp/_SourceFiles.cmake b/VistaCoreLibs/VistaInterProcComm/Hardware/Imp/_SourceFiles.cmake
index e4380c149d6219c11f95ce7ec8b511f420cb51e9..4f41a5b689cea8b097100433f92fc022a65ffc4f 100644
--- a/VistaCoreLibs/VistaInterProcComm/Hardware/Imp/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaInterProcComm/Hardware/Imp/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "./Hardware/Imp" )
 set( RelativeSourceGroup "Source Files\\Hardware\\Imp" )
diff --git a/VistaCoreLibs/VistaInterProcComm/Hardware/VistaSerialPort.cpp b/VistaCoreLibs/VistaInterProcComm/Hardware/VistaSerialPort.cpp
index d18b63b075c044a82e180994a5decd3af61c3fb7..d9923a3ab66c0ad47d2459f45295673da1603f46 100644
--- a/VistaCoreLibs/VistaInterProcComm/Hardware/VistaSerialPort.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/Hardware/VistaSerialPort.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaSerialPort.h"
 #include "Imp/VistaSerialPortImp.h"
diff --git a/VistaCoreLibs/VistaInterProcComm/Hardware/VistaSerialPort.h b/VistaCoreLibs/VistaInterProcComm/Hardware/VistaSerialPort.h
index 889bc61d4e15929c22f9ca9560122ff95377dc41..4d2eee59e2ab3360f68ab58232bd5964aeba5451 100644
--- a/VistaCoreLibs/VistaInterProcComm/Hardware/VistaSerialPort.h
+++ b/VistaCoreLibs/VistaInterProcComm/Hardware/VistaSerialPort.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASERIALPORT_H
 #define _VISTASERIALPORT_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Hardware/VistaSerialPortStateDesc.h b/VistaCoreLibs/VistaInterProcComm/Hardware/VistaSerialPortStateDesc.h
index a21304581275a4b616017ac5930dd1717a4aa521..7e2b8a2f9c1837fa35b30386bc0106129fdc83df 100644
--- a/VistaCoreLibs/VistaInterProcComm/Hardware/VistaSerialPortStateDesc.h
+++ b/VistaCoreLibs/VistaInterProcComm/Hardware/VistaSerialPortStateDesc.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASERIALPORTSTATEDESC_H
 #define _VISTASERIALPORTSTATEDESC_H
diff --git a/VistaCoreLibs/VistaInterProcComm/Hardware/_SourceFiles.cmake b/VistaCoreLibs/VistaInterProcComm/Hardware/_SourceFiles.cmake
index 7d479e174fc25bbf0a0cffb350647b159c795b2d..abb8ddd7d5ef5a7ab34c4a02a99a0d08db27d930 100644
--- a/VistaCoreLibs/VistaInterProcComm/Hardware/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaInterProcComm/Hardware/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "./Hardware" )
 set( RelativeSourceGroup "Source Files\\Hardware" )
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaAcceptor.cpp b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaAcceptor.cpp
index b7d41e26c98e03e0ddffebe848595c72f2312134..d693e4af56ecbd6cd9d0e2cb8d0ff30963c64ee1 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaAcceptor.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaAcceptor.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaAcceptor.h"
 #include "VistaTCPServerSocket.h"
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaAcceptor.h b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaAcceptor.h
index 3b1f407fad5ab0f9f5b5a29847973dcf15f75bb6..dc40315a4e3e0fa69b92f793040f7b82013bc83b 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaAcceptor.h
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaAcceptor.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAACCEPTOR_H
 #define _VISTAACCEPTOR_H
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaIPAddress.cpp b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaIPAddress.cpp
index 2484c3588061cd84cfd2e5c3440ecc9eafa5a2cd..6804b3b7f60f6b5aaa34d4b461752e73a5db4160 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaIPAddress.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaIPAddress.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <cstdio>
 #include "VistaIPAddress.h"
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaIPAddress.h b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaIPAddress.h
index 73db0d290ac08f9a1b0ad58e44d007e6422af3ac..538a8d2ed895c4609bbd67bc0a1ee914850cd2ed 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaIPAddress.h
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaIPAddress.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAIPADDRESS_H
 #define _VISTAIPADDRESS_H
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaIPComm.cpp b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaIPComm.cpp
index c03c63097d8d0c2920dd675f7f23dafb95a76318..c251ce89c2cacd8413b7f10bfe8aa30ca620dec7 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaIPComm.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaIPComm.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaIPComm.h"
 #include <VistaInterProcComm/Concurrency/VistaMutex.h>
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaIPComm.h b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaIPComm.h
index a495fc8f999c904cb40a7843a7362d1a4aad40a4..89a25c153366ec0d2fb43cf1015c886c8e2dc652 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaIPComm.h
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaIPComm.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAIPCOMM_H
 #define _VISTAIPCOMM_H
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaMcastIPAddress.cpp b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaMcastIPAddress.cpp
index efac3df95c3c1546a5ba696ac28ef70f8341c9d8..dc7e0d8777a30b477a9bdb6007d5435d2f9122c1 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaMcastIPAddress.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaMcastIPAddress.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaMcastIPAddress.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaMcastIPAddress.h b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaMcastIPAddress.h
index 76e290fb4ae20bd140fdafb55cf589ef6beb1851..4cca70d70f9b3fd41d701b439194566a4454942f 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaMcastIPAddress.h
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaMcastIPAddress.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAMCASTIPADDRESS_H
 #define _VISTAMCASTIPADDRESS_H
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaMcastSocket.cpp b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaMcastSocket.cpp
index 9e0c335a63ade89468f745a0e9c8e0afee6cfe85..02a46e4e49aea75c64022265ba7f80cf04924d7e 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaMcastSocket.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaMcastSocket.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaMcastIPAddress.h"
 #include "VistaMcastSocketAddress.h"
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaMcastSocket.h b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaMcastSocket.h
index e45006cde796240f4a7489f435836135ad4d736e..c0fcf2143433393245549e0bbcf9626cda88c628 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaMcastSocket.h
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaMcastSocket.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAMCASTSOCKET_H
 #define _VISTAMCASTSOCKET_H
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaMcastSocketAddress.cpp b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaMcastSocketAddress.cpp
index 6df3fb7c76e0bd003ee6ee45efd5c6faa8ae5f6a..e67e03d406cce149974866d7ffe7c3b7d95ef6ea 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaMcastSocketAddress.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaMcastSocketAddress.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(WIN32)
 #include <winsock2.h>
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaMcastSocketAddress.h b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaMcastSocketAddress.h
index 33efb2401e45ddad275745b18a5abe2d3d48c7c8..4dcff6fa882eb68ff3463b8cac7e8fb8f59653b0 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaMcastSocketAddress.h
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaMcastSocketAddress.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAMCASTSOCKETADDRESS_H
 #define _VISTAMCASTSOCKETADDRESS_H
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaNetworkInfo.cpp b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaNetworkInfo.cpp
index 46288bea1992316ced46734363b5c867ca3e3778..f0927c8aae1f8d76c846bcac682a5fd1722085fe 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaNetworkInfo.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaNetworkInfo.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 //#ifndef WIN32
 //#include <sys/ioctl.h>
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaNetworkInfo.h b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaNetworkInfo.h
index 311a23672ac9119dc2288714b42d06b2e0167647..e6d342d8343ff2f0844d917c5e6dd9708ad428d8 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaNetworkInfo.h
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaNetworkInfo.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTANETWORKINFO_H
 #define _VISTANETWORKINFO_H
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaServiceIndicator.cpp b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaServiceIndicator.cpp
index af4a358b91aa09676ec358113f08b9c20cec92c7..a25fa4c4ddafd6d14246865d5caf7830a9670591 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaServiceIndicator.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaServiceIndicator.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaServiceIndicator.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaServiceIndicator.h b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaServiceIndicator.h
index 6601e608e82026d97de95bf6c858efc7ca0dfaaa..f6434a6e4660d7e7840b49c03d1b278a7e06d15a 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaServiceIndicator.h
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaServiceIndicator.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASERVICEINDICATOR_H
 #define _VISTASERVICEINDICATOR_H
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaSocket.cpp b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaSocket.cpp
index 3abf1dcdcfa178b7078072d10830416f4e4209f9..d05e64300dc97a3c19600dccf1180a6a9b671f3b 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaSocket.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaSocket.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaSocket.h"
 #include "VistaIPAddress.h"
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaSocket.h b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaSocket.h
index ef19da3264540e175a0e299f8f8930e5b818991b..d3f0a08a064dd819f4079774ae79567b9445edc4 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaSocket.h
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaSocket.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASOCKET_H
 #define _VISTASOCKET_H
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaSocketAddress.cpp b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaSocketAddress.cpp
index 287b90078d9307bf04c082d7b8ab9c037c2e51b5..28e350db425a9155b9a8759ab575e80a32a2f98e 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaSocketAddress.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaSocketAddress.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(WIN32)
 #define _WINSOCKAPI_
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaSocketAddress.h b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaSocketAddress.h
index 7d8a3e06bfb99620b60a6f7b2b35ca88bf686033..54a9ca83e5bdfb5c75c6a27c1975330476291ae6 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaSocketAddress.h
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaSocketAddress.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASOCKETADDRESS_H
 #define _VISTASOCKETADDRESS_H
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPClientSocket.cpp b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPClientSocket.cpp
index aa0aaa2529c37c90a760b52cc6723c6aa4acbf22..8fc1d5ed524e90befc56f9c07e9a8e95388ae869 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPClientSocket.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPClientSocket.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaTCPClientSocket.h"
 #include "VistaSocketAddress.h"
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPClientSocket.h b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPClientSocket.h
index 18001bc95911702eafbfb4965cefe557c026f837..485194dd2781775b61fa1241689787fc47158d66 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPClientSocket.h
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPClientSocket.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATCPCLIENTSOCKET_H
 #define _VISTATCPCLIENTSOCKET_H
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPServer.cpp b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPServer.cpp
index 71af409dd75c8e5f998903e63658ce5e3596e471..3a1b81437136152ba195abf1a16f4ab781a3dabf 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPServer.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPServer.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaTCPServer.h"
 #include "VistaTCPServerSocket.h"
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPServer.h b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPServer.h
index 7e8d93e57567e44bb60294d07a650834ef5ef0a2..ce735e5fea0e6dbd7798aac2abe1d12e110a340a 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPServer.h
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPServer.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATCPSERVER_H
 #define _VISTATCPSERVER_H
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPServerSocket.cpp b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPServerSocket.cpp
index 89c0854bd4119c334880462a274bd9d839bee7fe..e04104c723477a910e01832d32ce473b49a32589 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPServerSocket.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPServerSocket.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(WIN32)
 #include <winsock2.h>
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPServerSocket.h b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPServerSocket.h
index 110482c347e7a950fbfcaeed4a3d0eb081117de2..4c5f44d9ef24a7f8d3d506b107eb5e76a3439ac2 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPServerSocket.h
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPServerSocket.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATCPSERVERSOCKET_H
 #define _VISTATCPSERVERSOCKET_H
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPSocket.cpp b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPSocket.cpp
index 7db7cec467a9d536509d8fb4a507831b15cd0292..38a8c57e2e2a25a5f8f76daf6759cd74f8c87ec8 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPSocket.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPSocket.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(WIN32)
 	#include <winsock2.h>
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPSocket.h b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPSocket.h
index 29d395726a8888e806a5cdcd71627b8c12d721c5..e4a45002f27098488a27c6ae0bb134a2ea5ff0d5 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPSocket.h
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaTCPSocket.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATCPSOCKET_H
 #define _VISTATCPSOCKET_H
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaUDPSocket.cpp b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaUDPSocket.cpp
index 667c3199980e12ab2eafc3063854955f4a826b71..3d55a431e93721e485033a698b83fbf2c90170e2 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaUDPSocket.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaUDPSocket.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 #include <string>
 using namespace std;
 
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaUDPSocket.h b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaUDPSocket.h
index d7fa4f35f7293c642cf65923ca9e9e29e35553da..d0a1aa29d5e8a95aa114d571626a7d8a1fc4c58a 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaUDPSocket.h
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaUDPSocket.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAUDPSOCKET_H
 #define _VISTAUDPSOCKET_H
diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/_SourceFiles.cmake b/VistaCoreLibs/VistaInterProcComm/IPNet/_SourceFiles.cmake
index b56893447803a8a11a24a71dcb733c42a19bc899..250ee626a6e6dc1ec819e285aeda49a8d9240efb 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "./IPNet" )
 set( RelativeSourceGroup "Source Files\\IPNet" )
diff --git a/VistaCoreLibs/VistaInterProcComm/SharedMemory/VistaSharedMem.cpp b/VistaCoreLibs/VistaInterProcComm/SharedMemory/VistaSharedMem.cpp
index 91c320cfcd83956f38dd2c082af8a142a455d8b5..747902eaae71c3c07b17908bda947e79c394846a 100644
--- a/VistaCoreLibs/VistaInterProcComm/SharedMemory/VistaSharedMem.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/SharedMemory/VistaSharedMem.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaSharedMem.h"
 
diff --git a/VistaCoreLibs/VistaInterProcComm/SharedMemory/VistaSharedMem.h b/VistaCoreLibs/VistaInterProcComm/SharedMemory/VistaSharedMem.h
index 48b240df708c5666053098e3960573eaac231ba2..12c6dec74331b845300e617236bf339ee8af4cfa 100644
--- a/VistaCoreLibs/VistaInterProcComm/SharedMemory/VistaSharedMem.h
+++ b/VistaCoreLibs/VistaInterProcComm/SharedMemory/VistaSharedMem.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASHAREDMEM_H
 #define _VISTASHAREDMEM_H
diff --git a/VistaCoreLibs/VistaInterProcComm/SharedMemory/_SourceFiles.cmake b/VistaCoreLibs/VistaInterProcComm/SharedMemory/_SourceFiles.cmake
index 444964534e0cc8bfc08e0d2a5b08d0dc8095e504..4c6c4d5ab9c92b177e28ce05b433cdadc9ea9a06 100644
--- a/VistaCoreLibs/VistaInterProcComm/SharedMemory/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaInterProcComm/SharedMemory/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "./SharedMemory" )
 set( RelativeSourceGroup "Source Files\\SharedMemory" )
diff --git a/VistaCoreLibs/VistaInterProcComm/VistaInterProcCommConfig.h b/VistaCoreLibs/VistaInterProcComm/VistaInterProcCommConfig.h
index 295d776c69c4d9322138c490d86332a937db7611..afcafead2c589d8d046dc80bac4e6217855d6daf 100644
--- a/VistaCoreLibs/VistaInterProcComm/VistaInterProcCommConfig.h
+++ b/VistaCoreLibs/VistaInterProcComm/VistaInterProcCommConfig.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAINTERPROCCOMMCONFIG_H
 #define _VISTAINTERPROCCOMMCONFIG_H
diff --git a/VistaCoreLibs/VistaInterProcComm/_SourceFiles.cmake b/VistaCoreLibs/VistaInterProcComm/_SourceFiles.cmake
index 7c0171310757a5863baf0cf6b98d70c67dfe8ccb..fee0752c9df89f025af5325c8386f9980a492ce4 100644
--- a/VistaCoreLibs/VistaInterProcComm/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaInterProcComm/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaCoreLibs/VistaKernel/CMakeLists.txt b/VistaCoreLibs/VistaKernel/CMakeLists.txt
index 402c63a2725cc8b3797e08ce25bf65c364c78587..7f90700355bf6e876e1edb7263052d94d138f830 100644
--- a/VistaCoreLibs/VistaKernel/CMakeLists.txt
+++ b/VistaCoreLibs/VistaKernel/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id$
+
 
 vista_adopt_version( VistaKernel VistaCoreLibs )
 
diff --git a/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaGSyncSwapBarrier.cpp b/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaGSyncSwapBarrier.cpp
index 991ea883242632a647138d203b8d6c5706553325..8239c5e72499656d7c2a4ac86acd72154111eb64 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaGSyncSwapBarrier.cpp
+++ b/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaGSyncSwapBarrier.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <GL/glew.h>
 
diff --git a/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaGSyncSwapBarrier.h b/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaGSyncSwapBarrier.h
index 2668b6fad2f23ab361b3203fee713b7c9d87b8bb..2f3c64b38427425d8227e78cce1c44a19945e668 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaGSyncSwapBarrier.h
+++ b/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaGSyncSwapBarrier.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAGSYNCSWAPBARRIER_H
 #define _VISTAGSYNCSWAPBARRIER_H
diff --git a/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaMasterDataTunnel.cpp b/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaMasterDataTunnel.cpp
index eae0837b3ea2ff2b309abce4223519788e5411c9..b81f04cce566f9f785581e573f65c9fd93414bd7 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaMasterDataTunnel.cpp
+++ b/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaMasterDataTunnel.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaMasterDataTunnel.h"
 
diff --git a/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaMasterDataTunnel.h b/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaMasterDataTunnel.h
index a9c67666b8eace18f8b2845cd023dc5bf7b99f04..d3672a7a98df04d3691e6656b6281d3239f5729b 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaMasterDataTunnel.h
+++ b/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaMasterDataTunnel.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAMASTERDATATUNNEL_H
 #define _VISTAMASTERDATATUNNEL_H
diff --git a/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaMasterSlaveUtils.cpp b/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaMasterSlaveUtils.cpp
index 7f8ec0fdb69563e78eae102122050fe929732ff0..2fabec44fb18ec88f09fe79138e232f3c98104f2 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaMasterSlaveUtils.cpp
+++ b/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaMasterSlaveUtils.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaMasterSlaveUtils.h"
 
diff --git a/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaMasterSlaveUtils.h b/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaMasterSlaveUtils.h
index 98a792f6f88889fda6fd197f44f8170c50c6a37b..64ba424d563a2c84ad4b288c9f5c59c882d8cdcb 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaMasterSlaveUtils.h
+++ b/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaMasterSlaveUtils.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAMASTERSLAVEUTILS_H
 #define _VISTAMASTERSLAVEUTILS_H
diff --git a/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaSlaveDataTunnel.cpp b/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaSlaveDataTunnel.cpp
index 0a9023056d9e51592f01435463e5c2cb51a91f56..4bd3d41de9d76ba496a08c77dfd6c7c44c4404a3 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaSlaveDataTunnel.cpp
+++ b/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaSlaveDataTunnel.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaSlaveDataTunnel.h"
 
diff --git a/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaSlaveDataTunnel.h b/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaSlaveDataTunnel.h
index 71941134d69c845964982710d65c6849d5e549c2..e2c850d8f201e5e0bcf55ebd0b377dbec90da6cd 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaSlaveDataTunnel.h
+++ b/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaSlaveDataTunnel.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASLAVEDATATUNNEL_H
 #define _VISTASLAVEDATATUNNEL_H
diff --git a/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaStandaloneDataTunnel.cpp b/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaStandaloneDataTunnel.cpp
index ca9ee1c60bf153bf8053d4875988f9743b3485da..8b3d6261c9bd9ace9f37a6560e94807b5a703ff5 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaStandaloneDataTunnel.cpp
+++ b/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaStandaloneDataTunnel.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaStandaloneDataTunnel.h"
 
diff --git a/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaStandaloneDataTunnel.h b/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaStandaloneDataTunnel.h
index 475555aeba31c2d751eb464664653b246b2fd68f..73525a3c6f50f8025e7feb46bbe09416d78681ef 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaStandaloneDataTunnel.h
+++ b/VistaCoreLibs/VistaKernel/Cluster/Utils/VistaStandaloneDataTunnel.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASTANDALONEDATATUNNEL_H
 #define _VISTASTANDALONEDATATUNNEL_H
diff --git a/VistaCoreLibs/VistaKernel/Cluster/Utils/_SourceFiles.cmake b/VistaCoreLibs/VistaKernel/Cluster/Utils/_SourceFiles.cmake
index 9b8ad48f3d4bbcd74169eefd88ed083c557aeb80..bf278220eac1c31cf19565936653fef7fa62fe83 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/Utils/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaKernel/Cluster/Utils/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id:$
+
 
 set( RelativeDir "./Cluster/Utils" )
 set( RelativeSourceGroup "Source Files\\Cluster\\Utils" )
diff --git a/VistaCoreLibs/VistaKernel/Cluster/VistaClusterMaster.cpp b/VistaCoreLibs/VistaKernel/Cluster/VistaClusterMaster.cpp
index 7d15575ee6fd636af4322f42095f58fe579fbe7e..615d833091ab79d5aef0271c87777983c58420c1 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/VistaClusterMaster.cpp
+++ b/VistaCoreLibs/VistaKernel/Cluster/VistaClusterMaster.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaClusterMaster.h"
 
diff --git a/VistaCoreLibs/VistaKernel/Cluster/VistaClusterMaster.h b/VistaCoreLibs/VistaKernel/Cluster/VistaClusterMaster.h
index 3a4b5aff10e7f4bbeb4d69f3eaa666bedb828dd9..63e05d5475395c75a392673f5e92e87c204f9af7 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/VistaClusterMaster.h
+++ b/VistaCoreLibs/VistaKernel/Cluster/VistaClusterMaster.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTACLUSTERMASTER_H
 #define _VISTACLUSTERMASTER_H
diff --git a/VistaCoreLibs/VistaKernel/Cluster/VistaClusterMode.cpp b/VistaCoreLibs/VistaKernel/Cluster/VistaClusterMode.cpp
index a041255a0499b19599a30f7ea37b6c888f9468de..140eca0049e233bd8d4bd316fe1ff675c5fd67ce 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/VistaClusterMode.cpp
+++ b/VistaCoreLibs/VistaKernel/Cluster/VistaClusterMode.cpp
@@ -21,7 +21,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaClusterMode.h"
 
diff --git a/VistaCoreLibs/VistaKernel/Cluster/VistaClusterMode.h b/VistaCoreLibs/VistaKernel/Cluster/VistaClusterMode.h
index 50aa67975e43eb7545f5b14d0b0ba47f4797def4..70e4f0d3397d4976761bef6915c80ced2ceba6d5 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/VistaClusterMode.h
+++ b/VistaCoreLibs/VistaKernel/Cluster/VistaClusterMode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTACLUSTERMODE_H
 #define _VISTACLUSTERMODE_H
diff --git a/VistaCoreLibs/VistaKernel/Cluster/VistaClusterSlave.cpp b/VistaCoreLibs/VistaKernel/Cluster/VistaClusterSlave.cpp
index 1eebd23c3ab87318462c8183fab14ab94a5abe53..5f54cc337da439876878e70e9d38e4b72077e8f3 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/VistaClusterSlave.cpp
+++ b/VistaCoreLibs/VistaKernel/Cluster/VistaClusterSlave.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <GL/glew.h>
 
diff --git a/VistaCoreLibs/VistaKernel/Cluster/VistaClusterSlave.h b/VistaCoreLibs/VistaKernel/Cluster/VistaClusterSlave.h
index c7598ee6be9faf3cba267b07ba5376a33a83ab89..e2ab086f78bc61631997cd27be91daeb2ac361ba 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/VistaClusterSlave.h
+++ b/VistaCoreLibs/VistaKernel/Cluster/VistaClusterSlave.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTACLUSTERSLAVE_H
 #define _VISTACLUSTERSLAVE_H
diff --git a/VistaCoreLibs/VistaKernel/Cluster/VistaClusterStandalone.cpp b/VistaCoreLibs/VistaKernel/Cluster/VistaClusterStandalone.cpp
index 646f99cf7b4d8670b7b9098c39b7b3de7b2b775b..d413673163cc46226c28f6516a77671c1cf1c5fb 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/VistaClusterStandalone.cpp
+++ b/VistaCoreLibs/VistaKernel/Cluster/VistaClusterStandalone.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 #include "VistaClusterStandalone.h"
diff --git a/VistaCoreLibs/VistaKernel/Cluster/VistaClusterStandalone.h b/VistaCoreLibs/VistaKernel/Cluster/VistaClusterStandalone.h
index fd1bb22f4b9813b4f385329fe8edaca0b5ff24a9..eb18e244fb23e5eec9633909b05c2c48952b3312 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/VistaClusterStandalone.h
+++ b/VistaCoreLibs/VistaKernel/Cluster/VistaClusterStandalone.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTACLUSTERSTANDALONE_H
 #define _VISTACLUSTERSTANDALONE_H
diff --git a/VistaCoreLibs/VistaKernel/Cluster/VistaClusterSyncedTimerImp.cpp b/VistaCoreLibs/VistaKernel/Cluster/VistaClusterSyncedTimerImp.cpp
index 3a8c6ee4ab6af2609183200c179041fddb9934a9..5b7fd03c584144f5ab2177fc8c60e63248706c1a 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/VistaClusterSyncedTimerImp.cpp
+++ b/VistaCoreLibs/VistaKernel/Cluster/VistaClusterSyncedTimerImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaClusterSyncedTimerImp.h"
 
diff --git a/VistaCoreLibs/VistaKernel/Cluster/VistaClusterSyncedTimerImp.h b/VistaCoreLibs/VistaKernel/Cluster/VistaClusterSyncedTimerImp.h
index 5ee5c2036540c9c990bc182af4403ca7712e1ac9..6e17519547f19c5461bf4468ef8e87d1311a40a2 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/VistaClusterSyncedTimerImp.h
+++ b/VistaCoreLibs/VistaKernel/Cluster/VistaClusterSyncedTimerImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 #ifndef _VISTACLUSTERSYNCEDTIMERIMP_H
diff --git a/VistaCoreLibs/VistaKernel/Cluster/VistaDataTunnel.cpp b/VistaCoreLibs/VistaKernel/Cluster/VistaDataTunnel.cpp
index 873fee55bdd59e6122131917653bc976f6b851b8..6e0b219a1c30414fcce2472bf3cbe53e466606d5 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/VistaDataTunnel.cpp
+++ b/VistaCoreLibs/VistaKernel/Cluster/VistaDataTunnel.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDataTunnel.h"
 #include <VistaInterProcComm/DataLaVista/Base/VistaDataPacket.h>
diff --git a/VistaCoreLibs/VistaKernel/Cluster/VistaDataTunnel.h b/VistaCoreLibs/VistaKernel/Cluster/VistaDataTunnel.h
index 47f51e82d9bf8ec707ed7bdd61122214c3e9979d..ddeb833f7d9744134489df0e8ff9c8d1e62781b3 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/VistaDataTunnel.h
+++ b/VistaCoreLibs/VistaKernel/Cluster/VistaDataTunnel.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADATATUNNEL_H
 #define _VISTADATATUNNEL_H
diff --git a/VistaCoreLibs/VistaKernel/Cluster/VistaNewClusterMaster.cpp b/VistaCoreLibs/VistaKernel/Cluster/VistaNewClusterMaster.cpp
index 57553d8c3fc25e399d28f265e17c3310c3f329e0..4b6dc1abcddd191034219d4010c33e6802f2a73c 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/VistaNewClusterMaster.cpp
+++ b/VistaCoreLibs/VistaKernel/Cluster/VistaNewClusterMaster.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <GL/glew.h>
 
diff --git a/VistaCoreLibs/VistaKernel/Cluster/VistaNewClusterMaster.h b/VistaCoreLibs/VistaKernel/Cluster/VistaNewClusterMaster.h
index dd0720b44813ab48582d9be23dfda3b2baf56561..e958c52516c0bb0b70aa561773e6846737453c6f 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/VistaNewClusterMaster.h
+++ b/VistaCoreLibs/VistaKernel/Cluster/VistaNewClusterMaster.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTANEWCLUSTERMASTER_H
 #define _VISTANEWCLUSTERMASTER_H
diff --git a/VistaCoreLibs/VistaKernel/Cluster/VistaNewClusterSlave.cpp b/VistaCoreLibs/VistaKernel/Cluster/VistaNewClusterSlave.cpp
index af70a6c1dd74bd264d6806cbe1f1bc5b6ed106e8..d90d626eeb0b2c29105788533792485873291ac7 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/VistaNewClusterSlave.cpp
+++ b/VistaCoreLibs/VistaKernel/Cluster/VistaNewClusterSlave.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <GL/glew.h>
 
diff --git a/VistaCoreLibs/VistaKernel/Cluster/VistaNewClusterSlave.h b/VistaCoreLibs/VistaKernel/Cluster/VistaNewClusterSlave.h
index e54417318322d5332353b6f146a36610e05a3bc2..5108de33563e15a3fe53c1eafa1e6e51bbeebc5c 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/VistaNewClusterSlave.h
+++ b/VistaCoreLibs/VistaKernel/Cluster/VistaNewClusterSlave.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTANEWCLUSTERSLAVE_H
 #define _VISTANEWCLUSTERSLAVE_H
diff --git a/VistaCoreLibs/VistaKernel/Cluster/VistaReplaySlave.cpp b/VistaCoreLibs/VistaKernel/Cluster/VistaReplaySlave.cpp
index 590611f3f86a2f5ad211051e6f45cb6e7d327d09..5e673e76703e1bef3b214e4193ad1308daa8647c 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/VistaReplaySlave.cpp
+++ b/VistaCoreLibs/VistaKernel/Cluster/VistaReplaySlave.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaReplaySlave.cpp 31002 2012-07-04 15:56:31Z dr165799 $
+
 
 #include <GL/glew.h>
 
diff --git a/VistaCoreLibs/VistaKernel/Cluster/VistaReplaySlave.h b/VistaCoreLibs/VistaKernel/Cluster/VistaReplaySlave.h
index d9446fde433f4075a85ff008e7cb66ea71050a3d..4ae06da5e67a790df4946ba1e738ffdf16d27ce0 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/VistaReplaySlave.h
+++ b/VistaCoreLibs/VistaKernel/Cluster/VistaReplaySlave.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaReplaySlave.h 31002 2012-07-04 15:56:31Z dr165799 $
+
 
 #ifndef _VistaReplaySlave_H
 #define _VistaReplaySlave_H
diff --git a/VistaCoreLibs/VistaKernel/Cluster/ZeroMQExt/VistaZeroMQClusterBarrier.cpp b/VistaCoreLibs/VistaKernel/Cluster/ZeroMQExt/VistaZeroMQClusterBarrier.cpp
index d5c249356abe1aa9264bdc4ac66656c24f79d4ff..a86f6cf1cc3e23d88b6f712558c23e0ede79e626 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/ZeroMQExt/VistaZeroMQClusterBarrier.cpp
+++ b/VistaCoreLibs/VistaKernel/Cluster/ZeroMQExt/VistaZeroMQClusterBarrier.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaZeroMQClusterDataSync.cpp 43719 2014-08-19 16:41:15Z ps790413 $
+
 
 #include "VistaZeroMQClusterBarrier.h"
 
diff --git a/VistaCoreLibs/VistaKernel/Cluster/ZeroMQExt/VistaZeroMQClusterBarrier.h b/VistaCoreLibs/VistaKernel/Cluster/ZeroMQExt/VistaZeroMQClusterBarrier.h
index 03920b0728764d8ae9e341eaf5cfa107d406c234..1d4b37d0e5a773fed5ee3a505739d90ae7dfb0f5 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/ZeroMQExt/VistaZeroMQClusterBarrier.h
+++ b/VistaCoreLibs/VistaKernel/Cluster/ZeroMQExt/VistaZeroMQClusterBarrier.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaZeroMQClusterDataSync.h 40274 2014-01-29 09:59:23Z dr165799 $
+
 
 #ifndef _VISTAZEROMQCLUSTERBARRIER_H
 #define _VISTAZEROMQCLUSTERBARRIER_H
diff --git a/VistaCoreLibs/VistaKernel/Cluster/ZeroMQExt/VistaZeroMQClusterDataSync.cpp b/VistaCoreLibs/VistaKernel/Cluster/ZeroMQExt/VistaZeroMQClusterDataSync.cpp
index 507879f8b74447672677349277f5ff406a1a4f40..9de6b9564468cde63902a42d196f81930a38fbd3 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/ZeroMQExt/VistaZeroMQClusterDataSync.cpp
+++ b/VistaCoreLibs/VistaKernel/Cluster/ZeroMQExt/VistaZeroMQClusterDataSync.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaZeroMQClusterDataSync.h"
 
diff --git a/VistaCoreLibs/VistaKernel/Cluster/ZeroMQExt/VistaZeroMQClusterDataSync.h b/VistaCoreLibs/VistaKernel/Cluster/ZeroMQExt/VistaZeroMQClusterDataSync.h
index 5be71ef3f6c7f7b0cd2c35c2caf0ed8ecac2e6ef..7927a29a00812de19e090bc88781153627f88f07 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/ZeroMQExt/VistaZeroMQClusterDataSync.h
+++ b/VistaCoreLibs/VistaKernel/Cluster/ZeroMQExt/VistaZeroMQClusterDataSync.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAZEROMQCLUSTERDATASYNC_H
 #define _VISTAZEROMQCLUSTERDATASYNC_H
diff --git a/VistaCoreLibs/VistaKernel/Cluster/ZeroMQExt/VistaZeroMQCommon.cpp b/VistaCoreLibs/VistaKernel/Cluster/ZeroMQExt/VistaZeroMQCommon.cpp
index e7f441a6c16afc75e16f1ff2603ff49bd0ca5bb9..2d278e72c8d93f654087328db697b3e71ad4718c 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/ZeroMQExt/VistaZeroMQCommon.cpp
+++ b/VistaCoreLibs/VistaKernel/Cluster/ZeroMQExt/VistaZeroMQCommon.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaZeroMQCommon.h"
 #include <zmq.hpp>
diff --git a/VistaCoreLibs/VistaKernel/Cluster/ZeroMQExt/VistaZeroMQCommon.h b/VistaCoreLibs/VistaKernel/Cluster/ZeroMQExt/VistaZeroMQCommon.h
index 983e3d4b8ac2053d5b6d22e47528fa86e9eff9ab..a5f9364771977c1b52488b4c2e5e88270b4b3de4 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/ZeroMQExt/VistaZeroMQCommon.h
+++ b/VistaCoreLibs/VistaKernel/Cluster/ZeroMQExt/VistaZeroMQCommon.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAZEROMQCOMMON_H
 #define _VISTAZEROMQCOMMON_H
diff --git a/VistaCoreLibs/VistaKernel/Cluster/ZeroMQExt/_SourceFiles.cmake b/VistaCoreLibs/VistaKernel/Cluster/ZeroMQExt/_SourceFiles.cmake
index 5cf93de0d783c078aa25d5876349d7db8cf44ef9..e5aa48bcf3e91ab66d0090b67838fd2cd435dee4 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/ZeroMQExt/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaKernel/Cluster/ZeroMQExt/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id:$
+
 
 set( RelativeDir "./Cluster/ZeroMQExt" )
 set( RelativeSourceGroup "Source Files\\Cluster\\ZeroMQExt" )
diff --git a/VistaCoreLibs/VistaKernel/Cluster/_SourceFiles.cmake b/VistaCoreLibs/VistaKernel/Cluster/_SourceFiles.cmake
index e6749571b1568c962fabec6f9247aede81a53b4d..68931237b5920cf7411e8b8776b22c5c818757c3 100644
--- a/VistaCoreLibs/VistaKernel/Cluster/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaKernel/Cluster/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "./Cluster" )
 set( RelativeSourceGroup "Source Files\\Cluster" )
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/GlutWindowImp/VistaGlutTextEntity.cpp b/VistaCoreLibs/VistaKernel/DisplayManager/GlutWindowImp/VistaGlutTextEntity.cpp
index 2d83a3455c986cc23866e8b7a1f15bd5b6e4cec4..02f869030b69fd3b84faf34f9faa25e14c05488e 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/GlutWindowImp/VistaGlutTextEntity.cpp
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/GlutWindowImp/VistaGlutTextEntity.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaGlutTextEntity.h"
 
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/GlutWindowImp/VistaGlutTextEntity.h b/VistaCoreLibs/VistaKernel/DisplayManager/GlutWindowImp/VistaGlutTextEntity.h
index 9e8d8c93acd55912ca63e88b0a171f95becc0956..d0aaeef69627c7cf4be887eae106ac5c67085cc5 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/GlutWindowImp/VistaGlutTextEntity.h
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/GlutWindowImp/VistaGlutTextEntity.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAGLUTTEXTENTITY_H
 #define _VISTAGLUTTEXTENTITY_H
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/GlutWindowImp/VistaGlutWindowingToolkit.cpp b/VistaCoreLibs/VistaKernel/DisplayManager/GlutWindowImp/VistaGlutWindowingToolkit.cpp
index a09b65da483fb17c5068cc78b025143c6d35de46..fdb9c1ccb1da06fdf0f6489033774d55b5444dc3 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/GlutWindowImp/VistaGlutWindowingToolkit.cpp
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/GlutWindowImp/VistaGlutWindowingToolkit.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*============================================================================*/
 /* INCLUDES                                                                   */
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/GlutWindowImp/VistaGlutWindowingToolkit.h b/VistaCoreLibs/VistaKernel/DisplayManager/GlutWindowImp/VistaGlutWindowingToolkit.h
index edb5621cf77c8a1cc685a2006aad5c5e24cd7d76..4e85665a3ddb6ba7b2774d010b30426671b7ea1b 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/GlutWindowImp/VistaGlutWindowingToolkit.h
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/GlutWindowImp/VistaGlutWindowingToolkit.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAGLUTWINDOWINGTOOLKIT_H
 #define _VISTAGLUTWINDOWINGTOOLKIT_H
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/GlutWindowImp/_SourceFiles.cmake b/VistaCoreLibs/VistaKernel/DisplayManager/GlutWindowImp/_SourceFiles.cmake
index a42a075fd2d586adff212f5e7f8398f9ddce1821..3be63659846e85affe646d060be45a3d0a6ded2c 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/GlutWindowImp/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/GlutWindowImp/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "./DisplayManager/GlutWindowImp" )
 set( RelativeSourceGroup "Source Files\\DisplayManager\\GlutWindowImp" )
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/OpenSceneGraphWindowImp/VistaOSGWindowingToolkit.cpp b/VistaCoreLibs/VistaKernel/DisplayManager/OpenSceneGraphWindowImp/VistaOSGWindowingToolkit.cpp
index f984fcf80d58802416cf053c63ceedf286246382..6be0cb36e16111c695f6e5efbb53b92673713f0a 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/OpenSceneGraphWindowImp/VistaOSGWindowingToolkit.cpp
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/OpenSceneGraphWindowImp/VistaOSGWindowingToolkit.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*============================================================================*/
 /* INCLUDES                                                                   */
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/OpenSceneGraphWindowImp/VistaOSGWindowingToolkit.h b/VistaCoreLibs/VistaKernel/DisplayManager/OpenSceneGraphWindowImp/VistaOSGWindowingToolkit.h
index 7409225f7c051e5f92c9f9a4f41d159fb086fb1f..d31daea36a79e95143db1101c08e6198503a13b1 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/OpenSceneGraphWindowImp/VistaOSGWindowingToolkit.h
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/OpenSceneGraphWindowImp/VistaOSGWindowingToolkit.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOPENSCENEGRAPHWINDOWINGTOOLKIT_H
 #define _VISTAOPENSCENEGRAPHWINDOWINGTOOLKIT_H
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/OpenSceneGraphWindowImp/_SourceFiles.cmake b/VistaCoreLibs/VistaKernel/DisplayManager/OpenSceneGraphWindowImp/_SourceFiles.cmake
index 269438e60edb2bae08c6321191922e471bcc9bc8..1ac499d6e44bb91731dc9ad3be7ce75ae67bf943 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/OpenSceneGraphWindowImp/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/OpenSceneGraphWindowImp/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id: _SourceFiles.cmake 23946 2011-10-29 16:52:36Z dr165799 $
+
 
 set( RelativeDir "./DisplayManager/OpenSceneGraphWindowImp" )
 set( RelativeSourceGroup "Source Files\\DisplayManager\\OpenSceneGraphWindowImp" )
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/Vista2DDrawingObjects.cpp b/VistaCoreLibs/VistaKernel/DisplayManager/Vista2DDrawingObjects.cpp
index 36531936220d9a9cb5b6ade823025f5d0f43ba9a..582a85b852c7570f5667468b478ea3c8d5db778c 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/Vista2DDrawingObjects.cpp
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/Vista2DDrawingObjects.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaKernel/DisplayManager/Vista2DDrawingObjects.h>
 //#include <VistaKernel/GraphicsManager/VistaGraphicsBridge.h>
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/Vista2DDrawingObjects.h b/VistaCoreLibs/VistaKernel/DisplayManager/Vista2DDrawingObjects.h
index cdbe742890039e4bceab22d60a61064d511137be..c68465262254832f07423adc8b6b4f2eea930757 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/Vista2DDrawingObjects.h
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/Vista2DDrawingObjects.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTA2DDRAWINGOBJECT_H
 #define _VISTA2DDRAWINGOBJECT_H
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/Vista3DTextOverlay.cpp b/VistaCoreLibs/VistaKernel/DisplayManager/Vista3DTextOverlay.cpp
index 40ad06ce6f09d5bdbab0fbb6738a6e4b8efa3a22..80ad34304938f2341d8aa8ffc3c5cb8b255f0dc0 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/Vista3DTextOverlay.cpp
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/Vista3DTextOverlay.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <GL/glew.h>
 
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/Vista3DTextOverlay.h b/VistaCoreLibs/VistaKernel/DisplayManager/Vista3DTextOverlay.h
index 2d52797531413b701cc135f89df382b78e8726d9..e4a2adc9aff67dc0c9881124d05155073e21e178 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/Vista3DTextOverlay.h
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/Vista3DTextOverlay.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTA3DTEXTOVERLAY_H
 #define _VISTA3DTEXTOVERLAY_H
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/VistaColorOverlay.cpp b/VistaCoreLibs/VistaKernel/DisplayManager/VistaColorOverlay.cpp
index f6b9b7b561c0145740db8ee1617b19a8d7b28ef2..338e8778ad5c792be0db70e56f0b5f67c60bd5d3 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/VistaColorOverlay.cpp
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/VistaColorOverlay.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaStreamManagerExt.cpp 34351 2013-03-26 11:50:28Z dr165799 $
+
 
 #include <GL/glew.h>
 
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/VistaColorOverlay.h b/VistaCoreLibs/VistaKernel/DisplayManager/VistaColorOverlay.h
index 06f3be9d3a4525937b2f3c558924f1cd211b2ca6..31758e068c996b43372d1c890a177a8e14fac544 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/VistaColorOverlay.h
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/VistaColorOverlay.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaStreamManagerExt.h 34351 2013-03-26 11:50:28Z dr165799 $
+
 
 #ifndef _VISTAFADEOUTOVERLAY_H
 #define _VISTAFADEOUTOVERLAY_H
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplay.cpp b/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplay.cpp
index 91e00c7704cbc9d63857852da1c2eaf8cd530a2a..8ca16470bdc8b2eca0563001c3eeaee4499ccaba 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplay.cpp
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplay.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDisplay.h"
 #include "VistaDisplayManager.h"
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplay.h b/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplay.h
index 29f2784475c71d4d1b03b8a71ffbc6882814c701..de58b52c14e9067bfd4c790d8edd0ec8a788fcf9 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplay.h
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplay.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if !defined(_VISTADISPLAY_H)
 #define _VISTADISPLAY_H
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplayBridge.cpp b/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplayBridge.cpp
index a5cb9afb423b76fa73e8e4d8bffa14fc751eab14..f1a6420007f82b11c0277feab58bbd8614796e21 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplayBridge.cpp
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplayBridge.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDisplayBridge.h"
 
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplayBridge.h b/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplayBridge.h
index a35e7f6c6eb5e568e9f402803e1de8a39a9e2c01..bf0bee1a2996ef8698f1c02e5d38dc102dee1314 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplayBridge.h
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplayBridge.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADISPLAYBRIDGE_H
 #define _VISTADISPLAYBRIDGE_H
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplayEntity.cpp b/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplayEntity.cpp
index 0a295123a962a3853ff95d25291172941d36f6b3..3334858633bfc052f6c943966604843328143767 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplayEntity.cpp
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplayEntity.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(WIN32)
 #pragma warning(disable: 4996)
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplayEntity.h b/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplayEntity.h
index 59e13227c2fba66b010db701b9300c9fe38d73d7..37fdd1d311b1e5e245f0c9531f769a130c8127bd 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplayEntity.h
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplayEntity.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if !defined _VISTADISPLAYENTITY_H
 #define _VISTADISPLAYENTITY_H
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplayManager.cpp b/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplayManager.cpp
index 57e992c0cbf8a84ca97c2677bc6ead831067e237..72361b289532c6059b87c66fa51d11f224c9794a 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplayManager.cpp
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplayManager.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDisplayManager.h"
 
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplayManager.h b/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplayManager.h
index d87cfb62f81698fa9a23713fed06513160c585c0..235e109b442ae22464f072968995dffda28f3d25 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplayManager.h
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplayManager.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if !defined(_VISTADISPLAYMANAGER_H)
 #define _VISTADISPLAYMANAGER_H
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplaySystem.cpp b/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplaySystem.cpp
index b588993e421f9ee3bd5ea7c84f01a8d830a73ef7..355e8518a9af642fcf80fce9f2154874896e495b 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplaySystem.cpp
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplaySystem.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDisplaySystem.h"
 #include "VistaDisplayManager.h"
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplaySystem.h b/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplaySystem.h
index 0a5fb57bc638f48ed6e109a5f28a4a5bc9d2847f..2646abc132269c7ff4b481dea59082a738cfaedb 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplaySystem.h
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/VistaDisplaySystem.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADISPLAYSYSTEM_H
 #define _VISTADISPLAYSYSTEM_H
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/VistaProjection.cpp b/VistaCoreLibs/VistaKernel/DisplayManager/VistaProjection.cpp
index 7a06039a41c429fe2e261ed8a601620751634b3e..3283e42e3fbaf403368032533bc491bdd9893074 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/VistaProjection.cpp
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/VistaProjection.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaProjection.h"
 #include "VistaDisplayBridge.h"
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/VistaProjection.h b/VistaCoreLibs/VistaKernel/DisplayManager/VistaProjection.h
index e542957788166b427f544621ea400bc455aef34a..849da6260f286f490eab54b4597530c2b02b50f1 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/VistaProjection.h
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/VistaProjection.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if !defined(_VISTAPROJECTION_H)
 #define _VISTAPROJECTION_H
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/VistaSceneOverlay.cpp b/VistaCoreLibs/VistaKernel/DisplayManager/VistaSceneOverlay.cpp
index ec4837510b85d9085e5c0fe15df6107378807d88..4ad80c38bc223f88b1ac2f2cea39e40dbb0549de 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/VistaSceneOverlay.cpp
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/VistaSceneOverlay.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaSceneOverlay.h"
 
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/VistaSceneOverlay.h b/VistaCoreLibs/VistaKernel/DisplayManager/VistaSceneOverlay.h
index d679b197ba25f89c7986656cd1f5aa4311fe0c92..30a38295a1c1d9acc5e740740ef01f53b156306c 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/VistaSceneOverlay.h
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/VistaSceneOverlay.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASCENEOVERLAY_H
 #define _VISTASCENEOVERLAY_H
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/VistaSimpleTextOverlay.cpp b/VistaCoreLibs/VistaKernel/DisplayManager/VistaSimpleTextOverlay.cpp
index e4af24f86cfea3d6be2fa312a5c57e8ca2ef616c..ff2a9c8942f20c6640a0adc79d3546197929fa2a 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/VistaSimpleTextOverlay.cpp
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/VistaSimpleTextOverlay.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <GL/glew.h>
 
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/VistaSimpleTextOverlay.h b/VistaCoreLibs/VistaKernel/DisplayManager/VistaSimpleTextOverlay.h
index 7629baae707db2d0574d9a01bc4299f075cfb681..9ae44e31c933294241497806d8a8593832831e4d 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/VistaSimpleTextOverlay.h
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/VistaSimpleTextOverlay.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASIMPLETEXTOVERLAY_H
 #define _VISTASIMPLETEXTOVERLAY_H
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/VistaTextEntity.h b/VistaCoreLibs/VistaKernel/DisplayManager/VistaTextEntity.h
index 67a2ed5b0fbaf7ef993b40ce671791b0582f0f00..df3cd7852614e39e0e7195a15e79345f34b28925 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/VistaTextEntity.h
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/VistaTextEntity.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATEXTENTITY_H
 #define _VISTATEXTENTITY_H
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/VistaViewport.cpp b/VistaCoreLibs/VistaKernel/DisplayManager/VistaViewport.cpp
index 1cb8a3171271de76d96ef1736ddc6d3b1d56a382..5c7010a1019fc130e2db825bcae7df4814376891 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/VistaViewport.cpp
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/VistaViewport.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaViewport.h"
 #include "VistaDisplaySystem.h"
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/VistaViewport.h b/VistaCoreLibs/VistaKernel/DisplayManager/VistaViewport.h
index d9f23ca68c7561359f7ae41f089367338cd4f90d..45c68cb89a31d62a079c1f56d6a923d1c04ae4dd 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/VistaViewport.h
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/VistaViewport.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if !defined _VISTAVIEWPORT_H
 #define _VISTAVIEWPORT_H
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/VistaViewportResizeToProjectionAdapter.cpp b/VistaCoreLibs/VistaKernel/DisplayManager/VistaViewportResizeToProjectionAdapter.cpp
index f4e41bd2420dd89124d71bb1df191fd068d4f5b2..e5eb9351794d438573ed31868b2adda2bf364253 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/VistaViewportResizeToProjectionAdapter.cpp
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/VistaViewportResizeToProjectionAdapter.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaViewportResizeToProjectionAdapter.h"
 #include "VistaViewport.h"
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/VistaViewportResizeToProjectionAdapter.h b/VistaCoreLibs/VistaKernel/DisplayManager/VistaViewportResizeToProjectionAdapter.h
index be90ecaf02828b24f2e5569082a3849971a175e1..3203c9656d7155d26c3c0d79ef3ab96a344261f4 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/VistaViewportResizeToProjectionAdapter.h
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/VistaViewportResizeToProjectionAdapter.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAVIEWPORTRESIZETOPROJECTIONADAPTER_H
 #define _VISTAVIEWPORTRESIZETOPROJECTIONADAPTER_H
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/VistaVirtualPlatform.cpp b/VistaCoreLibs/VistaKernel/DisplayManager/VistaVirtualPlatform.cpp
index 7fa4ef567b750f95fc8b90f8b1ba7a2d1abcc2d3..6c9e910c9296f98d05d6d50d11ad0a7d7a606bf3 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/VistaVirtualPlatform.cpp
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/VistaVirtualPlatform.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaVirtualPlatform.h"
 #include <VistaAspects/VistaAspectsUtils.h>
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/VistaVirtualPlatform.h b/VistaCoreLibs/VistaKernel/DisplayManager/VistaVirtualPlatform.h
index 2c9899e862d207292155d95ab95f4dbd33a98b65..9fdff9f00036f685bb2ee0c09b588c1148514481 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/VistaVirtualPlatform.h
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/VistaVirtualPlatform.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if !defined _VISTAVIRTUALPLATFORM_H
 #define _VISTAVIRTUALPLATFORM_H
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/VistaWindow.cpp b/VistaCoreLibs/VistaKernel/DisplayManager/VistaWindow.cpp
index bf1899b0ac8e68537a4ece43997e6ee8b01f093f..83f343e3fc201ffd310679ebe28a22b1c88494f6 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/VistaWindow.cpp
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/VistaWindow.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaWindow.h"
 #include "VistaDisplayManager.h"
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/VistaWindow.h b/VistaCoreLibs/VistaKernel/DisplayManager/VistaWindow.h
index 4324ba928a5b29f40585cedf40919bd8c41fc41f..94bed62eb2a1aa233b2927707976e56d3c476a43 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/VistaWindow.h
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/VistaWindow.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAWINDOW_H
 #define _VISTAWINDOW_H
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/VistaWindowingToolkit.h b/VistaCoreLibs/VistaKernel/DisplayManager/VistaWindowingToolkit.h
index 825730edbd47ca38d0948d483337cdf71bb9dea8..fc8f840eaf6b62d91a3924340a2fce0dc470ca6b 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/VistaWindowingToolkit.h
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/VistaWindowingToolkit.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAWINDOWINGTOOLKIT_H
 #define _VISTAWINDOWINGTOOLKIT_H
diff --git a/VistaCoreLibs/VistaKernel/DisplayManager/_SourceFiles.cmake b/VistaCoreLibs/VistaKernel/DisplayManager/_SourceFiles.cmake
index 1024def6c87ff58d4ce9ea7bbdd203c8fc9b51a5..299eed6a09a01b4fdcdb24819f13cf93798a3575 100644
--- a/VistaCoreLibs/VistaKernel/DisplayManager/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaKernel/DisplayManager/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "./DisplayManager" )
 set( RelativeSourceGroup "Source Files\\DisplayManager" )
diff --git a/VistaCoreLibs/VistaKernel/EventManager/VistaCentralEventHandler.cpp b/VistaCoreLibs/VistaKernel/EventManager/VistaCentralEventHandler.cpp
index 05abdcd3d0113c134f55c89851c2568e4ed59647..d4c154766b904199a4745056ab41348549310daf 100644
--- a/VistaCoreLibs/VistaKernel/EventManager/VistaCentralEventHandler.cpp
+++ b/VistaCoreLibs/VistaKernel/EventManager/VistaCentralEventHandler.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaKernel/EventManager/VistaCentralEventHandler.h>
 
diff --git a/VistaCoreLibs/VistaKernel/EventManager/VistaCentralEventHandler.h b/VistaCoreLibs/VistaKernel/EventManager/VistaCentralEventHandler.h
index 5458737c8b0a6b6ec29ac218b49d15e41386f57e..64689f64fd8df556ed7392161a7f131494232e4e 100644
--- a/VistaCoreLibs/VistaKernel/EventManager/VistaCentralEventHandler.h
+++ b/VistaCoreLibs/VistaKernel/EventManager/VistaCentralEventHandler.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTACENTRALEVENTHANDLER_H
 #define _VISTACENTRALEVENTHANDLER_H
diff --git a/VistaCoreLibs/VistaKernel/EventManager/VistaCommandEvent.cpp b/VistaCoreLibs/VistaKernel/EventManager/VistaCommandEvent.cpp
index 658765fc24cbf4f4846768c952568b7c2fced05e..84946a7b5573268f94a159cb9bfd53d56d32f87b 100644
--- a/VistaCoreLibs/VistaKernel/EventManager/VistaCommandEvent.cpp
+++ b/VistaCoreLibs/VistaKernel/EventManager/VistaCommandEvent.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaCommandEvent.h"
 #include <VistaAspects/VistaSerializer.h>
diff --git a/VistaCoreLibs/VistaKernel/EventManager/VistaCommandEvent.h b/VistaCoreLibs/VistaKernel/EventManager/VistaCommandEvent.h
index d99e3b7c545388eb4fdf1c58d990cf4c2084af9a..00ce004e0102afa3e98786caca39c448172fe970 100644
--- a/VistaCoreLibs/VistaKernel/EventManager/VistaCommandEvent.h
+++ b/VistaCoreLibs/VistaKernel/EventManager/VistaCommandEvent.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTACOMMANDEVENT_H
 #define _VISTACOMMANDEVENT_H
diff --git a/VistaCoreLibs/VistaKernel/EventManager/VistaEvent.cpp b/VistaCoreLibs/VistaKernel/EventManager/VistaEvent.cpp
index 3d9c7e546627e6ed0ea55880e3f340706dd2116c..b58e09538d18a08d53def793866ad6d4824d174d 100644
--- a/VistaCoreLibs/VistaKernel/EventManager/VistaEvent.cpp
+++ b/VistaCoreLibs/VistaKernel/EventManager/VistaEvent.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaEvent.h"
 
diff --git a/VistaCoreLibs/VistaKernel/EventManager/VistaEvent.h b/VistaCoreLibs/VistaKernel/EventManager/VistaEvent.h
index da7d17f035082b92f8d8524657a5b6402bc5d52c..d3a6fd06a5ba9f55ddd8b97db3ee1aaf2e87e16b 100644
--- a/VistaCoreLibs/VistaKernel/EventManager/VistaEvent.h
+++ b/VistaCoreLibs/VistaKernel/EventManager/VistaEvent.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAEVENT_H
 #define _VISTAEVENT_H
diff --git a/VistaCoreLibs/VistaKernel/EventManager/VistaEventHandler.cpp b/VistaCoreLibs/VistaKernel/EventManager/VistaEventHandler.cpp
index 5d902980a0872af50a03b1935e5c5deaea5ef908..76802898fc88581b9421517c613a09ad45152b7d 100644
--- a/VistaCoreLibs/VistaKernel/EventManager/VistaEventHandler.cpp
+++ b/VistaCoreLibs/VistaKernel/EventManager/VistaEventHandler.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaEventHandler.h" 
 
diff --git a/VistaCoreLibs/VistaKernel/EventManager/VistaEventHandler.h b/VistaCoreLibs/VistaKernel/EventManager/VistaEventHandler.h
index 734be866a208f60a5eb84a895039e59542a7246a..dbb7017269b976e3bca10c4f610490632cd2c1e5 100644
--- a/VistaCoreLibs/VistaKernel/EventManager/VistaEventHandler.h
+++ b/VistaCoreLibs/VistaKernel/EventManager/VistaEventHandler.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAEVENTHANDLER_H
 #define _VISTAEVENTHANDLER_H
diff --git a/VistaCoreLibs/VistaKernel/EventManager/VistaEventManager.cpp b/VistaCoreLibs/VistaKernel/EventManager/VistaEventManager.cpp
index bc038aaea4ac17fe9b54bcdb4fc272a239e62e9e..616dc223f1ae3e42b8ed2977a8f4acbeaaf87d3a 100644
--- a/VistaCoreLibs/VistaKernel/EventManager/VistaEventManager.cpp
+++ b/VistaCoreLibs/VistaKernel/EventManager/VistaEventManager.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaEventManager.h"
 
diff --git a/VistaCoreLibs/VistaKernel/EventManager/VistaEventManager.h b/VistaCoreLibs/VistaKernel/EventManager/VistaEventManager.h
index 8fb10465373b42c3223828de69a63a02e471d725..7bdf0b4a709bbb7a0ee67bb0450b5305c1da8ab6 100644
--- a/VistaCoreLibs/VistaKernel/EventManager/VistaEventManager.h
+++ b/VistaCoreLibs/VistaKernel/EventManager/VistaEventManager.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAEVENTMANAGER_H
 #define _VISTAEVENTMANAGER_H
diff --git a/VistaCoreLibs/VistaKernel/EventManager/VistaEventObserver.h b/VistaCoreLibs/VistaKernel/EventManager/VistaEventObserver.h
index 571bcfed101df08755ea70972f9cfb3f240df639..90ba736377b27fabbebc5e3f47357ddd50d5df14 100644
--- a/VistaCoreLibs/VistaKernel/EventManager/VistaEventObserver.h
+++ b/VistaCoreLibs/VistaKernel/EventManager/VistaEventObserver.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAEVENTOBSERVER_H
 #define _VISTAEVENTOBSERVER_H
diff --git a/VistaCoreLibs/VistaKernel/EventManager/VistaExternalMsgEvent.cpp b/VistaCoreLibs/VistaKernel/EventManager/VistaExternalMsgEvent.cpp
index 5499d1e0b10607d0f5ea04e2482ed7edffd54845..baa220113605f93c462ac1241ce5f908d86415db 100644
--- a/VistaCoreLibs/VistaKernel/EventManager/VistaExternalMsgEvent.cpp
+++ b/VistaCoreLibs/VistaKernel/EventManager/VistaExternalMsgEvent.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaExternalMsgEvent.h"
 
diff --git a/VistaCoreLibs/VistaKernel/EventManager/VistaExternalMsgEvent.h b/VistaCoreLibs/VistaKernel/EventManager/VistaExternalMsgEvent.h
index 8b0ae4ceb88e8ab484494478b3c1471bea2898df..48f1c2579907cea3dff1ddbbbce5b92fb62e3d8c 100644
--- a/VistaCoreLibs/VistaKernel/EventManager/VistaExternalMsgEvent.h
+++ b/VistaCoreLibs/VistaKernel/EventManager/VistaExternalMsgEvent.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAEXTERNALMSGEVENT_H
 #define _VISTAEXTERNALMSGEVENT_H
diff --git a/VistaCoreLibs/VistaKernel/EventManager/VistaSystemEvent.cpp b/VistaCoreLibs/VistaKernel/EventManager/VistaSystemEvent.cpp
index 184d67beafa9d2c092f7339e7a9d334d2d0aa9aa..bc82ec338e411a65a08c0be5db47e91b7f707994 100644
--- a/VistaCoreLibs/VistaKernel/EventManager/VistaSystemEvent.cpp
+++ b/VistaCoreLibs/VistaKernel/EventManager/VistaSystemEvent.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaKernel/EventManager/VistaSystemEvent.h>
 
diff --git a/VistaCoreLibs/VistaKernel/EventManager/VistaSystemEvent.h b/VistaCoreLibs/VistaKernel/EventManager/VistaSystemEvent.h
index fab3adc4e90ccaa8e596b5e2ee1476c2be022658..47fd2baa72509731d24bfef8d0dbe6e316255d25 100644
--- a/VistaCoreLibs/VistaKernel/EventManager/VistaSystemEvent.h
+++ b/VistaCoreLibs/VistaKernel/EventManager/VistaSystemEvent.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASYSTEMEVENT_H
 #define _VISTASYSTEMEVENT_H
diff --git a/VistaCoreLibs/VistaKernel/EventManager/VistaTickTimer.cpp b/VistaCoreLibs/VistaKernel/EventManager/VistaTickTimer.cpp
index 363db0959dab610599d11646d990702d37029d77..843084656ac130cf55a78dc53b6ed71620d7dbbe 100644
--- a/VistaCoreLibs/VistaKernel/EventManager/VistaTickTimer.cpp
+++ b/VistaCoreLibs/VistaKernel/EventManager/VistaTickTimer.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaTickTimer.h"
 
diff --git a/VistaCoreLibs/VistaKernel/EventManager/VistaTickTimer.h b/VistaCoreLibs/VistaKernel/EventManager/VistaTickTimer.h
index a1ddda09aebba76aaec2611509f425fe4670e384..3382a11e72436f5f8d8d6b647d6e55a544006559 100644
--- a/VistaCoreLibs/VistaKernel/EventManager/VistaTickTimer.h
+++ b/VistaCoreLibs/VistaKernel/EventManager/VistaTickTimer.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATICKTIMER_H
 #define _VISTATICKTIMER_H
diff --git a/VistaCoreLibs/VistaKernel/EventManager/VistaTickTimerEvent.cpp b/VistaCoreLibs/VistaKernel/EventManager/VistaTickTimerEvent.cpp
index 06b39d9e39f8c95055aa1c05f38612ded0b15b51..76cd20160f609a37fc587536cf57717dda6da5d3 100644
--- a/VistaCoreLibs/VistaKernel/EventManager/VistaTickTimerEvent.cpp
+++ b/VistaCoreLibs/VistaKernel/EventManager/VistaTickTimerEvent.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaTickTimerEvent.h"
 
diff --git a/VistaCoreLibs/VistaKernel/EventManager/VistaTickTimerEvent.h b/VistaCoreLibs/VistaKernel/EventManager/VistaTickTimerEvent.h
index 3d5f95a91a01b7223d33da4aa3a1903a1c64d4eb..9fec093ed51ca72d2bb3fd89d2435295f927aa0f 100644
--- a/VistaCoreLibs/VistaKernel/EventManager/VistaTickTimerEvent.h
+++ b/VistaCoreLibs/VistaKernel/EventManager/VistaTickTimerEvent.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATICKTIMEREVENT_H
 #define _VISTATICKTIMEREVENT_H
diff --git a/VistaCoreLibs/VistaKernel/EventManager/VistaTimeoutHandler.cpp b/VistaCoreLibs/VistaKernel/EventManager/VistaTimeoutHandler.cpp
index a52d1b7320237f7c2e6e3c0a0d90917a7fc8e980..d344372dba04ebfe63627872629861eaadc7e43d 100644
--- a/VistaCoreLibs/VistaKernel/EventManager/VistaTimeoutHandler.cpp
+++ b/VistaCoreLibs/VistaKernel/EventManager/VistaTimeoutHandler.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaTimeoutHandler.h"
 
diff --git a/VistaCoreLibs/VistaKernel/EventManager/VistaTimeoutHandler.h b/VistaCoreLibs/VistaKernel/EventManager/VistaTimeoutHandler.h
index 0c867ea4bd5897ef25b6cfbcaee4edafdab63a8a..699a31058b5caa79b6b0a938939af00a971e962e 100644
--- a/VistaCoreLibs/VistaKernel/EventManager/VistaTimeoutHandler.h
+++ b/VistaCoreLibs/VistaKernel/EventManager/VistaTimeoutHandler.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATIMEOUTHANDLER_H
 #define _VISTATIMEOUTHANDLER_H
diff --git a/VistaCoreLibs/VistaKernel/EventManager/VistaTimeoutRouter.cpp b/VistaCoreLibs/VistaKernel/EventManager/VistaTimeoutRouter.cpp
index 338eea857bb04aa97d045678f11b4bf9cfde96b9..ab14ef79cdd3479b8ef25df532a178649ea02d68 100644
--- a/VistaCoreLibs/VistaKernel/EventManager/VistaTimeoutRouter.cpp
+++ b/VistaCoreLibs/VistaKernel/EventManager/VistaTimeoutRouter.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaTimeoutRouter.h" 
 #include "VistaTickTimer.h"
diff --git a/VistaCoreLibs/VistaKernel/EventManager/VistaTimeoutRouter.h b/VistaCoreLibs/VistaKernel/EventManager/VistaTimeoutRouter.h
index 51e01482433859f544da5f67300df4725fa02993..d40b11940d9178fcb6f991c6df8359df264ac995 100644
--- a/VistaCoreLibs/VistaKernel/EventManager/VistaTimeoutRouter.h
+++ b/VistaCoreLibs/VistaKernel/EventManager/VistaTimeoutRouter.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATIMEOUTROUTER_H
 #define _VISTATIMEOUTROUTER_H
diff --git a/VistaCoreLibs/VistaKernel/EventManager/_SourceFiles.cmake b/VistaCoreLibs/VistaKernel/EventManager/_SourceFiles.cmake
index ae810ec4aa9274e754765938b34650881bcad587..725c636a6e6e29068d9d13043ababee3a911ea4b 100644
--- a/VistaCoreLibs/VistaKernel/EventManager/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaKernel/EventManager/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "./EventManager" )
 set( RelativeSourceGroup "Source Files\\EventManager" )
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/Vista3DText.cpp b/VistaCoreLibs/VistaKernel/GraphicsManager/Vista3DText.cpp
index 3d74a86b4c168c1ee39b01b9834ecdce127387b4..2f14d7ae11c83eae9912744197eac9bca2049e01 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/Vista3DText.cpp
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/Vista3DText.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "Vista3DText.h" 
 #include <VistaBase/VistaVectorMath.h>
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/Vista3DText.h b/VistaCoreLibs/VistaKernel/GraphicsManager/Vista3DText.h
index 1179286253a66e267fd19d9f95d191f0a6422bae..f20bc4acc4b4a1190687ceb465ee9e67346e5091 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/Vista3DText.h
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/Vista3DText.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _IVISTA3DTEXT_H
 #define _IVISTA3DTEXT_H
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaAxes.cpp b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaAxes.cpp
index d5d2f8c793b3a4eefe4e7da7f68962116decf4d7..2b9acd1214dfb337bd5ac34d1108e3baa0926d1a 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaAxes.cpp
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaAxes.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaAxes.h"
 
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaAxes.h b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaAxes.h
index 12636e2a25fc25812de7899d2f0cd069ff1d5336..7d540c1ce1dea7e5528f591c560e9703ac2d7f68 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaAxes.h
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaAxes.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAXES_H
 #define _VISTAXES_H
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaExtensionNode.cpp b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaExtensionNode.cpp
index 3c7f89b5398f7622ed472501385db33cc2145a22..a41b981ad1d7bb039f29fc4ea673185c62ac9154 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaExtensionNode.cpp
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaExtensionNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaKernel/GraphicsManager/VistaExtensionNode.h"
 #include "VistaKernel/GraphicsManager/VistaNodeBridge.h"
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaExtensionNode.h b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaExtensionNode.h
index 14880721ec7cd52592650a7b5e4932089f913882..6d737a3b2e4799619ad9bec6247647045a78547c 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaExtensionNode.h
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaExtensionNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAEXTENSIONNODE_H
 #define _VISTAEXTENSIONNODE_H
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGeomNode.cpp b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGeomNode.cpp
index 0f260263cc5ffd09fa56776144005a39f189e361..6eefdd48919dd9d80b18ab42714ea05766f40af2 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGeomNode.cpp
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGeomNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaKernel/GraphicsManager/VistaGeomNode.h"
 #include "VistaKernel/GraphicsManager/VistaGeometry.h"
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGeomNode.h b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGeomNode.h
index eb5dfffbde6c21421fd23e06ae40a93a05862f95..a92f549aa28ee2587b8a10ec9562c910ec1c55ea 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGeomNode.h
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGeomNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAGEOMNODE_H
 #define _VISTAGEOMNODE_H
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGeometry.cpp b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGeometry.cpp
index c762f2f7ee85c02612d36f085849307736f53161..b96ef59440a9f85525d6dac0bd60a7c8e7d5170e 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGeometry.cpp
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGeometry.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaGeometry.h"
 
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGeometry.h b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGeometry.h
index fbe62e6123f9b63c506dd2673ec149a934f68694..bb92a3f277426b98b82461c769d46be006d3a49e 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGeometry.h
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGeometry.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAGEOMETRY_H
 #define _VISTAGEOMETRY_H
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGeometryFactory.cpp b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGeometryFactory.cpp
index 28084d8b5824f536f2b23c22d86763479c3bf663..0f6dbad38c7ae815252bc06cbd0f5b2baacf2e3e 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGeometryFactory.cpp
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGeometryFactory.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*============================================================================*/
 /* INCLUDES                                                                   */
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGeometryFactory.h b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGeometryFactory.h
index 314b25aea92b790cd6e7994ce6514f561a560e2f..c7cfff525e7a34464b5f93687c923b07df9d35ed 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGeometryFactory.h
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGeometryFactory.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAGEOMFACTORY_H
 #define _VISTAGEOMFACTORY_H
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGraphicsBridge.cpp b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGraphicsBridge.cpp
index 3c53ef33c426aecfabc6b3d2e24d30cddae87200..3baa16290b8a6cde7a4b9eb4aa7fe683b19ba217 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGraphicsBridge.cpp
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGraphicsBridge.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaGraphicsBridge.h"
 
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGraphicsManager.cpp b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGraphicsManager.cpp
index 7cb646ac7d18209fe6fe4ada956f350c3df4ee17..fa03af2011e444cfe219fb0052c6a76614f77845 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGraphicsManager.cpp
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGraphicsManager.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaGraphicsManager.h"
 
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGraphicsManager.h b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGraphicsManager.h
index d8538ddf65328f2c0bc0ba2deed17abc6da24852..c75d6136af951ae8e84585c88ddb3d8d1ec4321f 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGraphicsManager.h
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGraphicsManager.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTANNEWGRAPHICSMANAGER_H
 #define _VISTANNEWGRAPHICSMANAGER_H
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGroupNode.cpp b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGroupNode.cpp
index f6b8fa4deb144f94627ad2e7e8f85e0558ae183b..c9443687ea4a6313fc8b7526d81feddae9b3c610 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGroupNode.cpp
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGroupNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaGroupNode.h"
 #include "VistaNodeBridge.h"
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGroupNode.h b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGroupNode.h
index f590af51e68528913635d04e6c1b0d28b53d2975..5bc0872ad4cacad32d2525b410151c85a69325b4 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGroupNode.h
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaGroupNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAGROUPNODE_H
 #define _VISTAGROUPNODE_H
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaLODNode.cpp b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaLODNode.cpp
index 167517ef476ab223595884184ecb94a77c38f073..7b8f283e62d84c6af11f91a4878ae0c4bf4753bb 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaLODNode.cpp
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaLODNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaKernel/GraphicsManager/VistaLODNode.h"
 #include "VistaKernel/GraphicsManager/VistaNodeBridge.h"
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaLODNode.h b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaLODNode.h
index edab9748aee98933503c4d3a423240d4730ec2c7..7c777dd78ca99b5072de0066169a9fac88fdecc1 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaLODNode.h
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaLODNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTALODNODE_H
 #define _VISTALODNODE_H
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaLeafNode.cpp b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaLeafNode.cpp
index efe7256b3387998586a053eb428a5b5d6c83e56d..31f1eb1941585b014ad7e59fdeef90860f50104f 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaLeafNode.cpp
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaLeafNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaKernel/GraphicsManager/VistaLeafNode.h"
 #include "VistaKernel/GraphicsManager/VistaNodeBridge.h"
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaLeafNode.h b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaLeafNode.h
index fe2296fead529dc7bd1744dd107971cdd04fb755..ae6bdd39416e3577f2674d17112119afc1a372d7 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaLeafNode.h
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaLeafNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTALEAFNODE_H
 #define _VISTALEAFNODE_H
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaLightNode.cpp b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaLightNode.cpp
index e88b21db98d95efcac9c63fa0b662408f31e0f5b..575d9c8dfd65784a0ac9e53366c7a5e413e4b564 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaLightNode.cpp
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaLightNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaKernel/GraphicsManager/VistaLightNode.h"
 #include "VistaKernel/GraphicsManager/VistaNodeBridge.h"
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaLightNode.h b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaLightNode.h
index e6ea52e76680944a39b337bd3af8b0f7470004a1..c7bad75e68c9d22ee6a42e4e4bf61807241411fb 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaLightNode.h
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaLightNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTALIGHTNODE_H
 #define _VISTALIGHTNODE_H
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaNode.cpp b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaNode.cpp
index 7f3cfb1a69fdf1ebe0d038750b3f6b6498a2e844..26abbeee7b47257516a7de6fe5f3b512f3b00f0b 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaNode.cpp
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <VistaKernel/GraphicsManager/VistaNode.h>
 #include <VistaKernel/GraphicsManager/VistaGroupNode.h>
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaNode.h b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaNode.h
index 1f3b8ac9162e6f4914b3ce3b5715361f793fdd08..290900b9ded4dc2a38364738640c2d923b498f83 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaNode.h
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTANODE_H
 #define _VISTANODE_H
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaNodeBridge.cpp b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaNodeBridge.cpp
index 55773b73d28a0515c439923909a8a677fc3e6894..64c28a9c3e4c9e91934cb732f27ce5d2fccdfdeb 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaNodeBridge.cpp
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaNodeBridge.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaNodeBridge.h" 
 #include "VistaGeomNode.h"
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaNodeBridge.h b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaNodeBridge.h
index 0dec4c8bdc677b5bd63bed33bd9431e1c7f23514..775032c16e4844d3a20b5cc7754ab50be32e4290 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaNodeBridge.h
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaNodeBridge.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTANODEBRIDGE_H
 #define _VISTANODEBRIDGE_H
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaNodeInterface.h b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaNodeInterface.h
index 8b50ffde1a20f9c203cbb854d4da0e5f4a55a89c..3b68b3ffe8475f2013abdf4ddab52ac7d29be230 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaNodeInterface.h
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaNodeInterface.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTANODEINTERFACE_H
 #define _VISTANODEINTERFACE_H
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLDebug.cpp b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLDebug.cpp
index 6193e631cacadcbd39cf7dee5b43134739e548e3..0db95b6c5a4d88dd9e917bd9c28830fe174b041e 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLDebug.cpp
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLDebug.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <GL/glew.h>
 
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLDebug.h b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLDebug.h
index 3f31b0df6231d183daec33311d0dbd92c8eeb366..6bacae6c6a649f7eb0d9f723f345c6ab792da989 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLDebug.h
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLDebug.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOPENGLDEBUG_H
 #define _VISTAOPENGLDEBUG_H
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLDraw.cpp b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLDraw.cpp
index c61cf75ad6b954932b486d20c65c3d505f133a3d..f54bcc3032980551168520b7ca3bcf3ad5b835d2 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLDraw.cpp
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLDraw.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 #include <VistaKernel/GraphicsManager/VistaOpenGLDraw.h>
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLDraw.h b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLDraw.h
index 92d4dc10c9d6f1fc8f07ec51ad652df18badf122..517b7b47746848e280499f1afca02d2c286d8300 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLDraw.h
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLDraw.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOPENGLDRAW_H
 #define _VISTAOPENGLDRAW_H
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLNode.cpp b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLNode.cpp
index f289be83831939940adf2afcdda399c17857c893..6de23645498fd46aba6fe62ad762e0a8585cb46e 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLNode.cpp
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaOpenGLNode.h"
 #include "VistaNodeBridge.h"
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLNode.h b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLNode.h
index 8cf6de7862b626325e2555ff56fb64add6623d87..891f91b8a89810335e77e6c194e8e0157199cc05 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLNode.h
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOPENGLNODE_H
 #define _VISTAOPENGLNODE_H
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLPolyLine.cpp b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLPolyLine.cpp
index f9b7ea661030a20da838ec790fe75e757736f608..dafac3976dd671990b408900f1eb76cd20f31692 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLPolyLine.cpp
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLPolyLine.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$                                                                       
+
 
 #include <GL/glew.h>
 
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLPolyLine.h b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLPolyLine.h
index ca9baafa5733dfd08f2fad145091e117ce26f5ad..436fd282e0f92c9e17afa0500536c44840684bda 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLPolyLine.h
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLPolyLine.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOPENGLPOLYLINE_H
 #define _VISTAOPENGLPOLYLINE_H
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLPrimitiveList.cpp b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLPrimitiveList.cpp
index db00c0affa10a7fe21031083d090cabc8b6adab0..90e4325272b32ecf3e8f57f6527350fe8145b81f 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLPrimitiveList.cpp
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLPrimitiveList.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <GL/glew.h>
 
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLPrimitiveList.h b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLPrimitiveList.h
index ea43c76e98d6c8e97d9356b7139d57848e0b770c..ad96690e96303a0d9afe8800aeedda81023b26c3 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLPrimitiveList.h
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaOpenGLPrimitiveList.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOPENGLPRIMITIVELIST_H
 #define _VISTAOPENGLPRIMITIVELIST_H
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaSceneGraph.cpp b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaSceneGraph.cpp
index 5481ea8f0522860e3fd5e2941973e6b7ddba45d9..0f762ca21a570155ce3934c3cf6f440157dba8d7 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaSceneGraph.cpp
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaSceneGraph.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaSceneGraph.h"
 
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaSceneGraph.h b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaSceneGraph.h
index 1489a4ce5428514519a9c5d70a00091c6ce4f764..cf435c576b1da6368cf5543eb232e5e42a254a8b 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaSceneGraph.h
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaSceneGraph.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASCENEGRAPH_H
 #define _VISTASCENEGRAPH_H
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaSwitchNode.cpp b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaSwitchNode.cpp
index 342366e1053aad63ad96d30d3dcf9844252f9687..b51e5498b84461e8811512fabeaeadab55847cd3 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaSwitchNode.cpp
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaSwitchNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaKernel/GraphicsManager/VistaSwitchNode.h"
 #include "VistaKernel/GraphicsManager/VistaNodeBridge.h"
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaSwitchNode.h b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaSwitchNode.h
index 2760f5754efde0e240e9518d19b944f2bc2f49a8..4ef37becdcf8e25e953f006d9b9891bc344c5a6a 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaSwitchNode.h
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaSwitchNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASWITCHNODE_H
 #define _VISTASWITCHNODE_H
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaTextNode.cpp b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaTextNode.cpp
index f4454ab9b3501e15ab96eff2db8e697fa6d5d500..c91acddef791225fbdfcfd4ef33575d59e71912c 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaTextNode.cpp
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaTextNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaKernel/GraphicsManager/VistaTextNode.h"
 #include "VistaKernel/GraphicsManager/VistaGeometry.h"
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaTextNode.h b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaTextNode.h
index 8a9d33f0d8c2d4382bf03fb10749d8b30d10b4e8..c5db20d6a35147fd74e1f71c8dbff7e8ec94f699 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaTextNode.h
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaTextNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAFONTNODE_H
 #define _VISTAFONTNODE_H
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaTransformNode.cpp b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaTransformNode.cpp
index 7685db77da29162e4d006850caf62465fae5aa24..f6b518b426ee549f191f771fec6fdab90838dfd5 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaTransformNode.cpp
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaTransformNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaTransformNode.h"
 #include "VistaNodeBridge.h"
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaTransformNode.h b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaTransformNode.h
index 742caeae60065bcba1d8821c93b8a65d408f0aa0..6de1e571464f206e65e5111f3209bf50417942cb 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/VistaTransformNode.h
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/VistaTransformNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATRANSFORMNODE_H
 #define _VISTATRANSFORMNODE_H
diff --git a/VistaCoreLibs/VistaKernel/GraphicsManager/_SourceFiles.cmake b/VistaCoreLibs/VistaKernel/GraphicsManager/_SourceFiles.cmake
index 3124f5743c8f50c0290d1b9095e1d28254447cb1..1d5d0746191dc1be302b97b45a268626d8e6ba63 100644
--- a/VistaCoreLibs/VistaKernel/GraphicsManager/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaKernel/GraphicsManager/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id: _SourceFiles.cmake 37031 2013-08-07 09:03:52Z dr165799 $
+
 
 set( RelativeDir "./GraphicsManager" )
 set( RelativeSourceGroup "Source Files\\GraphicsManager" )
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfn3DMouseTransformNode.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfn3DMouseTransformNode.cpp
index 9453ca54ac465f124d7628f897b52c19d5e67288..3956185e95369adb6281cdfb78fe4aea460a5a18 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfn3DMouseTransformNode.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfn3DMouseTransformNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDfn3DMouseTransformNode.h"
 #include <VistaDataFlowNet/VdfnPort.h>
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfn3DMouseTransformNode.h b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfn3DMouseTransformNode.h
index 51b2b392521083244c82f7b8a6e5a2d47c059ce7..5b031ee72f57e9286595f88afe41d08add1d2819 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfn3DMouseTransformNode.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfn3DMouseTransformNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADFN3DMOUSETRANSFORMNODE_H
 #define _VISTADFN3DMOUSETRANSFORMNODE_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnClusterNodeInfoNode.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnClusterNodeInfoNode.cpp
index 900bae1c9a917c2a164961f0e0645aa2a067d84d..4adac410fcc6bbecc9e22087e034b51694a6bd44 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnClusterNodeInfoNode.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnClusterNodeInfoNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDfnClusterNodeInfoNode.h"
 #include <VistaDataFlowNet/VdfnPort.h>
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnClusterNodeInfoNode.h b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnClusterNodeInfoNode.h
index 97914d889db933c1202a1687a65a00e91ec5d6b9..975134420c5f69d6ee49a5df77ed3f74092d877c 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnClusterNodeInfoNode.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnClusterNodeInfoNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADFNCLUSTERNODEINFONODE_H
 #define _VISTADFNCLUSTERNODEINFONODE_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnCropViewportNode.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnCropViewportNode.cpp
index 7415981f65f46f74742b7221bfc1f93b37c7c609..33587c8060e392e2801733fc165fa302f7f46365 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnCropViewportNode.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnCropViewportNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <GL/glew.h>
 
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnCropViewportNode.h b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnCropViewportNode.h
index 1177d57f670d5bd99e6107aa37dadb3534bf3b5e..09bb5239cad709a65534014335856dbb57144849 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnCropViewportNode.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnCropViewportNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADFNCROPVIEWPORTNODE_H
 #define _VISTADFNCROPVIEWPORTNODE_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnDeviceDebugNode.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnDeviceDebugNode.cpp
index da86de09422a0ce814a7ce10c8c37ce4f7010034..9a8d3ed034f0affc7929761114453243b09dc0f7 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnDeviceDebugNode.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnDeviceDebugNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDfnDeviceDebugNode.h"
 
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnDeviceDebugNode.h b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnDeviceDebugNode.h
index 3b83e7f682701fb7a875cab18ccb5ddf493e1979..87aaf7f172d73ee3d0b730ceed706d990828a656 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnDeviceDebugNode.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnDeviceDebugNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADFNDEVICEDEBUGNODE_H
 #define _VISTADFNDEVICEDEBUGNODE_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnEventSourceNode.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnEventSourceNode.cpp
index 2dcfa84c1728dda12fcb1d3a951c705863bff665..88b5cfd0822039a42ed2d7f37da1697bdcfe22c2 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnEventSourceNode.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnEventSourceNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDfnEventSourceNode.h"
 
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnEventSourceNode.h b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnEventSourceNode.h
index 3adc7cb00484142cdd0a9f7faff0e9b1d37343af..39455656cd82c027ac3c003cd2d62599cbd1654f 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnEventSourceNode.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnEventSourceNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADFNEVENTSOURCENODE_H
 #define _VISTADFNEVENTSOURCENODE_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnFadeoutNode.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnFadeoutNode.cpp
index 6fee9ced428411c395abb5bf7cd1e7c628761385..9172c086de53dace3dcad6331278fede4429a940 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnFadeoutNode.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnFadeoutNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <GL/glew.h>
 
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnFadeoutNode.h b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnFadeoutNode.h
index 4de6abebd9358d1f38adfc24928190eb62639f49..65808c873b8aacf3e3d5b23d997f90d9856def38 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnFadeoutNode.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnFadeoutNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADFNFADEOUTNODE_H
 #define _VISTADFNFADEOUTNODE_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnGeometryNode.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnGeometryNode.cpp
index 2d8f86fb531376fbbe2db9230b5318243cda9441..827cdbeb80842e7d77c183d470415aef8c12e88f 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnGeometryNode.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnGeometryNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDfnGeometryNode.h" 
 
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnGeometryNode.h b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnGeometryNode.h
index 76b545dcc74b719f1315778089290a4ddf3fbf86..45faf186a3e9cb1600c079a801e8ce1b2b3732f3 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnGeometryNode.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnGeometryNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADFNGEOMETRYNODE_H
 #define _VISTADFNGEOMETRYNODE_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnKeyCallbackNode.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnKeyCallbackNode.cpp
index 3c0a717764e69211b175879b0c3824577a5f1af6..76f43771162762c31ecc262de1432354dd508e7c 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnKeyCallbackNode.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnKeyCallbackNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDfnKeyCallbackNode.h" 
 
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnKeyCallbackNode.h b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnKeyCallbackNode.h
index 538bc7401fb6f1ee6b41b6247897df1a0505f316..d3a53df8c0138f1720036b066b17b35d6f0295b4 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnKeyCallbackNode.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnKeyCallbackNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADFNCALLBACKCOUNTERNODE_H
 #define _VISTADFNCALLBACKCOUNTERNODE_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnKeyStateNode.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnKeyStateNode.cpp
index db2e8c8380843224511ba6df75c24629b3aa9b70..1b28f4a5ea489c43c9fae456e6b0eed98409cc91 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnKeyStateNode.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnKeyStateNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaDfnKeyStateNode.cpp 40274 2014-01-29 09:59:23Z dr165799 $
+
 
 #include "VistaDfnKeyStateNode.h" 
 
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnKeyStateNode.h b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnKeyStateNode.h
index 4628f5d73d370cf5725b7a9bfc7c67308c515817..110b8e142c1b5c4d82c8df22a8b6140538d360a3 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnKeyStateNode.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnKeyStateNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaDfnKeyStateNode.h 40274 2014-01-29 09:59:23Z dr165799 $
+
 
 #ifndef _VISTADFNKEYSTATENODE_H
 #define _VISTADFNKEYSTATENODE_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnMouseWheelChangeDetectNode.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnMouseWheelChangeDetectNode.cpp
index cc4fe58e64774b89b0b81c5dbdba3d91bf074606..423ca86806942ee31f3e43e99f6322cf31fd13f7 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnMouseWheelChangeDetectNode.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnMouseWheelChangeDetectNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDfnMouseWheelChangeDetectNode.h" 
 #include <VistaDataFlowNet/VdfnPort.h>
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnMouseWheelChangeDetectNode.h b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnMouseWheelChangeDetectNode.h
index 7d78d3d34037e6fe0120c2825bea0d5aeba7223c..eda458e03fcbaf8d26edf771fda7e22bf0a6289d 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnMouseWheelChangeDetectNode.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnMouseWheelChangeDetectNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADFNMOUSEWHEELCONVERERNODE_H
 #define _VISTADFNMOUSEWHEELCONVERERNODE_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnNavigationNode.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnNavigationNode.cpp
index f8f98bf39439bbcf70ddfb1fc28f9a507c96738c..6230573240d572c4baf65ba9245ff11d0d0ee6d1 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnNavigationNode.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnNavigationNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnNavigationNode.h b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnNavigationNode.h
index 538a82035c3494c675fd219f2a9e91558c682feb..b89aac4cd824df28875b1a52a1b04f462fbfcdef 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnNavigationNode.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnNavigationNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADFNNAVIGATIONNODE_H
 #define _VISTADFNNAVIGATIONNODE_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnPortChangeHandlerBase.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnPortChangeHandlerBase.cpp
index 00435dc077b8f10f1db0ea6eabd79b5236f0ba19..d89916bc318f654e369493538b924c1b5b96291b 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnPortChangeHandlerBase.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnPortChangeHandlerBase.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDfnPortChangeHandlerBase.h" 
 
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnPortChangeHandlerBase.h b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnPortChangeHandlerBase.h
index 173727511488bd1cfcc52fafa5a1ca04e112b109..6be14190f8f7edd8ad7bec96fbbd16222742e108 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnPortChangeHandlerBase.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnPortChangeHandlerBase.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADFNPORTCHANGEHANDLERBASE_H
 #define _VISTADFNPORTCHANGEHANDLERBASE_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnProjectionSourceNode.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnProjectionSourceNode.cpp
index 0ffd0b0100cec372c9b9e3d455fd7ebd07fc0167..b83ac7ca48e9086bd11124a69ac4939caa01a431 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnProjectionSourceNode.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnProjectionSourceNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDfnProjectionSourceNode.h" 
 #include <VistaDataFlowNet/VdfnPort.h>
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnProjectionSourceNode.h b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnProjectionSourceNode.h
index 2c3e66ff9998bc101e3abdc8bd18b46b448e48a9..c2ac3dd85502929652ec5b6f578cc92fe0ef626d 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnProjectionSourceNode.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnProjectionSourceNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADFNPROJECTIONSOURCENODE_H
 #define _VISTADFNPROJECTIONSOURCENODE_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnProximityWarningNode.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnProximityWarningNode.cpp
index 5e93f121ec21cf5d023df7f64cf2ee302750779a..3508edc2387615ebda7374caaed37b482d02ce3e 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnProximityWarningNode.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnProximityWarningNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnProximityWarningNode.h b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnProximityWarningNode.h
index 5576c18a7aa6cf4353b58fbd16e7f8820c9cefde..6fb5a2beef0db451c85f793d6c6fbf4a995812f9 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnProximityWarningNode.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnProximityWarningNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADFNPROXIMITYWARNINGNODE_H
 #define _VISTADFNPROXIMITYWARNINGNODE_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnReferenceFrameTransformNode.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnReferenceFrameTransformNode.cpp
index 6e41aae2973c139e431a27d5491d5f967660f38c..be0a979c569cdad2f3151549566dcc705ba32a0f 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnReferenceFrameTransformNode.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnReferenceFrameTransformNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDfnReferenceFrameTransformNode.h" 
 
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnReferenceFrameTransformNode.h b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnReferenceFrameTransformNode.h
index 835e61a83f97420841caac20b1691dbaa3378dbb..93efc9324d3e621db42b01b66e8b5ae76eaed312 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnReferenceFrameTransformNode.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnReferenceFrameTransformNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADFNREFERENCEFRAMETRANSFORMNODE_H
 #define _VISTADFNREFERENCEFRAMETRANSFORMNODE_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnSensorFrameNode.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnSensorFrameNode.cpp
index 3d1c7d2cc0021fd0ffd21854dd0e47ec266bc8ec..318caf448b3abb0209ac023e765511dcb8a3ce2b 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnSensorFrameNode.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnSensorFrameNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDfnSensorFrameNode.h" 
 
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnSensorFrameNode.h b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnSensorFrameNode.h
index 72aa3975d00ff9389d0da2f7d99e0cfb9b53d2b6..ea5f4691f1601710db3678ae75240a027329bfba 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnSensorFrameNode.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnSensorFrameNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADFNSENSORFRAMENODE_H
 #define _VISTADFNSENSORFRAMENODE_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnSimpleTextNode.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnSimpleTextNode.cpp
index 2fe055971bace923c463a8bf47c86967aa2f8c94..f2c45a2e94fb393ad459ed3d19f01b9f9a0adefe 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnSimpleTextNode.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnSimpleTextNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDfnSimpleTextNode.h"
 
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnSimpleTextNode.h b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnSimpleTextNode.h
index 1839785af33d517f2046432fe0bed1df1a55ccd0..4a1314fd47f31ec3cf08d195c05abb2ad89b6fbe 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnSimpleTextNode.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnSimpleTextNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADFNSIMPLETEXTNODE_H
 #define _VISTADFNSIMPLETEXTNODE_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnSystemTriggerControlNode.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnSystemTriggerControlNode.cpp
index c4829d045237aeb4e4fbf714c93147c4a67c7468..9cec9fb8d0fcbe7bb88241562d07478006dec1bc 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnSystemTriggerControlNode.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnSystemTriggerControlNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDfnSystemTriggerControlNode.h"
 
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnSystemTriggerControlNode.h b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnSystemTriggerControlNode.h
index 908d9c97c174c7d08e58efe018254cffc0567b67..cfa395dd5220e54bde1f2839d25f7d30c76e5e57 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnSystemTriggerControlNode.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnSystemTriggerControlNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADFNSYSTEMTRIGGERNODE_H
 #define _VISTADFNSYSTEMTRIGGERNODE_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnTextOverlayNode.h b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnTextOverlayNode.h
index ddd2cd4e68d7f82904147f86b10a7cba56bcfb25..94a55ca2ea95c3f323f880e4cf4eb206ff5a6562 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnTextOverlayNode.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnTextOverlayNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADFNTEXTOVERLAYNODE_H
 #define _VISTADFNTEXTOVERLAYNODE_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnTrackballNode.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnTrackballNode.cpp
index d460c4869e46ed74a6183d5b6ed20c540e9b1b28..d3b6192902c76031dae6691437215794e023de23 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnTrackballNode.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnTrackballNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDfnTrackballNode.h" 
 #include <VistaBase/VistaExceptionBase.h>
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnTrackballNode.h b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnTrackballNode.h
index 8a38578551c74db1d16e1c3b791647ab877c8f29..c3a6ae51cf8615ac816a9f692d6611639eb10768 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnTrackballNode.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnTrackballNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADFNTRACKBALLNODE_H
 #define _VISTADFNTRACKBALLNODE_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnViewerSinkNode.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnViewerSinkNode.cpp
index 04c4b6b8032121be9d503c100fff815bcfa9832f..9d479ce7d06812d8e3309d7557bc5530c5a6a5a7 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnViewerSinkNode.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnViewerSinkNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDfnViewerSinkNode.h" 
 #include <VistaDataFlowNet/VdfnPort.h>
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnViewerSinkNode.h b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnViewerSinkNode.h
index 6c293599ee9ebc73fa8847fc2c4e385be27084fe..0e208b5324e8b1f8b031c27ba286230bb806193a 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnViewerSinkNode.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnViewerSinkNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADFNVIEWERSINKNODE_H
 #define _VISTADFNVIEWERSINKNODE_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnViewerSourceNode.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnViewerSourceNode.cpp
index 1ca92190bd411555989916273fe8f8f81f04354b..793876c27ab82bcfb05f23ed958a351a2967a784 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnViewerSourceNode.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnViewerSourceNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDfnViewerSourceNode.h"
 #include <VistaDataFlowNet/VdfnPort.h>
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnViewerSourceNode.h b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnViewerSourceNode.h
index 4ef1940e2f396ddf018570d044cbf69bbb7614fc..0666d46200dabbc16345226bad9318c57918c618 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnViewerSourceNode.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnViewerSourceNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADFNVIEWERSOURCENODE_H
 #define _VISTADFNVIEWERSOURCENODE_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnViewportSourceNode.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnViewportSourceNode.cpp
index b6ff6da4e0f066414c0da3146f87a257dec2504e..e7e5c7c9e6072778dd6adde279969eeb650a678e 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnViewportSourceNode.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnViewportSourceNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDfnViewportSourceNode.h"
 #include <VistaDataFlowNet/VdfnPort.h>
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnViewportSourceNode.h b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnViewportSourceNode.h
index 2de9fced2c3c5801e6deec76c9b402b752786a97..f53c05c72b0efbafb4c7ba30abec095f5bbd245c 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnViewportSourceNode.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnViewportSourceNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADFNVIEWPORTSOURCENODE_H
 #define _VISTADFNVIEWPORTSOURCENODE_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnWindowSourceNode.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnWindowSourceNode.cpp
index c94be06680eb77dfe938d851ba9b8211234a7810..3b01571abae5264997c7f7f3a6a41504b41e437e 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnWindowSourceNode.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnWindowSourceNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDfnWindowSourceNode.h"
 #include <VistaDataFlowNet/VdfnPort.h>
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnWindowSourceNode.h b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnWindowSourceNode.h
index 47b186581b97c1418567e4351868889f71f1b071..bcb8ba12dce4a73f371acdc39fdfe6df82e8e2b7 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnWindowSourceNode.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaDfnWindowSourceNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADFNWINDOWSOURCENODE_H
 #define _VISTADFNWINDOWSOURCENODE_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaKernelDfnNodeCreators.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaKernelDfnNodeCreators.cpp
index da167ad439f97a2270ea6a04508a1a55ab2b4048..2a48c846fdab3098c1781db763dee52d3899fa66 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaKernelDfnNodeCreators.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaKernelDfnNodeCreators.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaKernelDfnNodeCreators.h"
 
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaKernelDfnNodeCreators.h b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaKernelDfnNodeCreators.h
index 0efa93d2cad99a3faa90b42660454dc2219c3184..a6000550f69e661f0068803d1e225a0dd3cc5fd9 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaKernelDfnNodeCreators.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/VistaKernelDfnNodeCreators.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAKERNELDFNNODECREATORSS_H
 #define _VISTAKERNELDFNNODECREATORSS_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/_SourceFiles.cmake b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/_SourceFiles.cmake
index 340f72467aab7c658328eadfc623ecf850c194da..db7ecba26ddbc0ec4d7e043cf5bb70c28b0159ee 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/DfnNodes/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "./InteractionManager/DfnNodes" )
 set( RelativeSourceGroup "Source Files\\InteractionManager\\DfnNodes" )
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/VistaIntentionSelect.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/VistaIntentionSelect.cpp
index 1850ad04346e9a950ff2fcc9c067fbaafdfb2d93..8df9afa39eb397dddc90087ed46d97dd552383f1 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/VistaIntentionSelect.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/VistaIntentionSelect.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaIntentionSelect.cpp 55276 2016-04-01 08:28:10Z sg783867 $
+
 
 #include "VistaIntentionSelect.h"
 
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/VistaIntentionSelect.h b/VistaCoreLibs/VistaKernel/InteractionManager/VistaIntentionSelect.h
index fe0a0444fb112708fb34f2960d0232b30785e0e6..7b1d59e28c09b529090daccc775e834ebc448d01 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/VistaIntentionSelect.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/VistaIntentionSelect.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaIntentionSelect.h 55276 2016-04-01 08:28:10Z sg783867 $
+
 
 #ifndef _VISTAINTENTIONSELECT_H
 #define _VISTAINTENTIONSELECT_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/VistaInteractionContext.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/VistaInteractionContext.cpp
index 3e70385215186935b55cd4db1750fbb4954bf61e..e83c619f3a8f103afc75e40ad32ad76a0af4ba41 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/VistaInteractionContext.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/VistaInteractionContext.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaInteractionContext.h"
 
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/VistaInteractionContext.h b/VistaCoreLibs/VistaKernel/InteractionManager/VistaInteractionContext.h
index 791dacbccdf6b2c22fcd84a9fa4b85f932bc1aab..31f246819faf51243b8b960c56d7a79fdcc3fdea 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/VistaInteractionContext.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/VistaInteractionContext.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAINTERACTIONCONTEXT_H
 #define _VISTAINTERACTIONCONTEXT_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/VistaInteractionEvent.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/VistaInteractionEvent.cpp
index 019b45ff152d8b910c6cf2351028f82c8f7c0968..01c72105b2f97b08aa3b7bb6b96d48d0092b721a 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/VistaInteractionEvent.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/VistaInteractionEvent.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaInteractionEvent.h"
 #include <VistaDeviceDriversBase/VistaDeviceSensor.h>
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/VistaInteractionEvent.h b/VistaCoreLibs/VistaKernel/InteractionManager/VistaInteractionEvent.h
index 82dd3a68227d66838ca4a4f8338e104876459152..43ad766a118f1ada67b30f134f9b2b44eee0dfdd 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/VistaInteractionEvent.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/VistaInteractionEvent.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAINTERACTIONEVENT_H
 #define _VISTAINTERACTIONEVENT_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/VistaInteractionManager.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/VistaInteractionManager.cpp
index 35eb90d8bec9a28379a15f63298decdbee40ed83..52df72d8c08b5366946b222da08f8419dc8b39ed 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/VistaInteractionManager.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/VistaInteractionManager.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaInteractionManager.h"
 
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/VistaInteractionManager.h b/VistaCoreLibs/VistaKernel/InteractionManager/VistaInteractionManager.h
index 394ce0099c73e96e716311003a7c18cc3db5ac7e..a3b454725f6a2215a915a2d502c6de8262ed41f5 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/VistaInteractionManager.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/VistaInteractionManager.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAINTERACTIONMANAGER_H
 #define _VISTAINTERACTIONMANAGER_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/VistaKeyboardSystemControl.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/VistaKeyboardSystemControl.cpp
index 4cbb87a69eb91a21accc79bfc311ff16c17ad193..3dd231181e07af5097f3288344fbd53e61cda7bc 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/VistaKeyboardSystemControl.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/VistaKeyboardSystemControl.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaKeyboardSystemControl.h"
 
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/VistaKeyboardSystemControl.h b/VistaCoreLibs/VistaKernel/InteractionManager/VistaKeyboardSystemControl.h
index d6fb42609c9d743c27655bfdf5fe1b326c6e2b62..bdaa2058c3d320862f4f62748f50160bc1cab18e 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/VistaKeyboardSystemControl.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/VistaKeyboardSystemControl.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAKEYBOARDSYSTEMCONTROL_H
 #define _VISTAKEYBOARDSYSTEMCONTROL_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/VistaObjectSetMove.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/VistaObjectSetMove.cpp
index 0cb7a9bf7aaba1aab2ffc045875d3da6f59af054..deb053ea27f86d7e9854f4427b03ad6aa5d021c2 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/VistaObjectSetMove.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/VistaObjectSetMove.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaObjectSetMove.h"
 
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/VistaObjectSetMove.h b/VistaCoreLibs/VistaKernel/InteractionManager/VistaObjectSetMove.h
index fe12d1ce32c47e7f2826f8f3c9b5cdcc9ce55dce..f9c79278ebb9ef6303bbd942e274d1500262bb4e 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/VistaObjectSetMove.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/VistaObjectSetMove.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOBJECTSETMOVE_H
 #define _VISTAOBJECTSETMOVE_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/VistaUserPlatform.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/VistaUserPlatform.cpp
index b439c2851490811c97c21936484f91257fef611b..ccf75ae34654b18e1c843c32f80373e22a9afa6d 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/VistaUserPlatform.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/VistaUserPlatform.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaUserPlatform.h" 
 #include "VistaVirtualPlatformAdapter.h"
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/VistaUserPlatform.h b/VistaCoreLibs/VistaKernel/InteractionManager/VistaUserPlatform.h
index 9a521679d0138f792dd8e074ada03e01943e6052..d6720b40ef27aff859ee17d7b96928e8aa5cff70 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/VistaUserPlatform.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/VistaUserPlatform.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAUSERPLATFORM_H
 #define _VISTAUSERPLATFORM_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/VistaVirtualPlatformAdapter.cpp b/VistaCoreLibs/VistaKernel/InteractionManager/VistaVirtualPlatformAdapter.cpp
index 833879412d037591d687e40b10d5af7ef7cad35d..32fe8d8cad2d73c79ef7be84b1332d42af4cca45 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/VistaVirtualPlatformAdapter.cpp
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/VistaVirtualPlatformAdapter.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaVirtualPlatformAdapter.h"
 #include <VistaKernel/DisplayManager/VistaVirtualPlatform.h>
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/VistaVirtualPlatformAdapter.h b/VistaCoreLibs/VistaKernel/InteractionManager/VistaVirtualPlatformAdapter.h
index e9d8d6c3bfcb0fbad69944d938d37bf886defb2a..2e0a677d7c85dd00481af2cd787cfa6c3a797ebe 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/VistaVirtualPlatformAdapter.h
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/VistaVirtualPlatformAdapter.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAVIRTUALPLATFORMADAPTER_H
 #define _VISTAVIRTUALPLATFORMADAPTER_H
diff --git a/VistaCoreLibs/VistaKernel/InteractionManager/_SourceFiles.cmake b/VistaCoreLibs/VistaKernel/InteractionManager/_SourceFiles.cmake
index b636560a3f48143ca27deae970d774c7d4fce9cc..fb3a20ce3718024bfa970063f34ebbe469ab3afe 100644
--- a/VistaCoreLibs/VistaKernel/InteractionManager/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaKernel/InteractionManager/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "./InteractionManager" )
 set( RelativeSourceGroup "Source Files\\InteractionManager" )
diff --git a/VistaCoreLibs/VistaKernel/OpenSG/OSGAC3DFileType.cpp b/VistaCoreLibs/VistaKernel/OpenSG/OSGAC3DFileType.cpp
index 40e9d91675fcfb9adeb8677d9c8760f809535b97..3c1c2e232c02ec49240438f6be41a5c37c4ace96 100644
--- a/VistaCoreLibs/VistaKernel/OpenSG/OSGAC3DFileType.cpp
+++ b/VistaCoreLibs/VistaKernel/OpenSG/OSGAC3DFileType.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 //-------------------------------
diff --git a/VistaCoreLibs/VistaKernel/OpenSG/OSGAC3DFileType.h b/VistaCoreLibs/VistaKernel/OpenSG/OSGAC3DFileType.h
index 42d797ded71681df7594a6740eee9883f386491a..4bb77b33ba720d11bfc14486a4b6192a43ed2063 100644
--- a/VistaCoreLibs/VistaKernel/OpenSG/OSGAC3DFileType.h
+++ b/VistaCoreLibs/VistaKernel/OpenSG/OSGAC3DFileType.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _AC3DSCENEFILETYPE_H_
 #define _AC3DSCENEFILETYPE_H_
diff --git a/VistaCoreLibs/VistaKernel/OpenSG/OSGVistaOpenGLDrawCore.cpp b/VistaCoreLibs/VistaKernel/OpenSG/OSGVistaOpenGLDrawCore.cpp
index 96b6638c9538af8d4fd53f8e225f3bbef912ee05..cf1e3863ebc9e5a60ed223de994f02a6d05f05cd 100644
--- a/VistaCoreLibs/VistaKernel/OpenSG/OSGVistaOpenGLDrawCore.cpp
+++ b/VistaCoreLibs/VistaKernel/OpenSG/OSGVistaOpenGLDrawCore.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "OSGVistaOpenGLDrawCore.h"
 
diff --git a/VistaCoreLibs/VistaKernel/OpenSG/OSGVistaOpenGLDrawCore.h b/VistaCoreLibs/VistaKernel/OpenSG/OSGVistaOpenGLDrawCore.h
index 96126e30a1de3aceefe8e32be516c50e34ef8893..71917b34362cb2bffa1b17960ddf3ad8be416f5e 100644
--- a/VistaCoreLibs/VistaKernel/OpenSG/OSGVistaOpenGLDrawCore.h
+++ b/VistaCoreLibs/VistaKernel/OpenSG/OSGVistaOpenGLDrawCore.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 #ifndef _OSGVISTAOPENGLDRAWCORE_H_
 #define _OSGVISTAOPENGLDRAWCORE_H_
 
diff --git a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGDisplayBridge.cpp b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGDisplayBridge.cpp
index 8e39a11d48ae08c8975a553c7deeb57fc4d887aa..38ad956b2646b1f8fc181ab9fdbe1647083def3e 100644
--- a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGDisplayBridge.cpp
+++ b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGDisplayBridge.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifdef WIN32
 // disable warnings from OpenSG
diff --git a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGDisplayBridge.h b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGDisplayBridge.h
index 72c85e039bf85bd6366b54ffcfd87c4f799d3cf1..093526965445f4b0a6e04324963a5d26f7abe814 100644
--- a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGDisplayBridge.h
+++ b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGDisplayBridge.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOPENSGDISPLAYBRIDGE_H
 #define _VISTAOPENSGDISPLAYBRIDGE_H
diff --git a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGGLOverlayForeground.cpp b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGGLOverlayForeground.cpp
index cc19ff714fb1564e09a24466a96146315bba5e22..14345ba17d9518eb2ebc8ec08ee52da0b22c0529 100644
--- a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGGLOverlayForeground.cpp
+++ b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGGLOverlayForeground.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 //---------------------------------------------------------------------------
 //  Includes
diff --git a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGGLOverlayForeground.h b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGGLOverlayForeground.h
index fc719e387e55dbe0de1bed51c8a972f44c1ad261..a1a0a99c26e19ec0b5be6d2ab447bc818325b2ee 100644
--- a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGGLOverlayForeground.h
+++ b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGGLOverlayForeground.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTA_OPENSG_GLOVERLAYFOREGROUND_H_
 #define _VISTA_OPENSG_GLOVERLAYFOREGROUND_H_
diff --git a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGGLOverlayForegroundBase.cpp b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGGLOverlayForegroundBase.cpp
index 66af0668d2a8e72a5a9fb1e5b8e653b5da4e45b4..f15d37281687e1383f6abc88b18532eb5b0739f8 100644
--- a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGGLOverlayForegroundBase.cpp
+++ b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGGLOverlayForegroundBase.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 
diff --git a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGGLOverlayForegroundBase.h b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGGLOverlayForegroundBase.h
index 299726fe30042db5359a51b11ed1ca8a034f0c9b..e9b8d017394672926f52c1b7c40f72638124d5e7 100644
--- a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGGLOverlayForegroundBase.h
+++ b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGGLOverlayForegroundBase.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTA_OPENSG_GLOVERLAYFOREGROUND_BASE_H_
 #define _VISTA_OPENSG_GLOVERLAYFOREGROUND_BASE_H_
diff --git a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGGLOverlayForegroundFields.h b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGGLOverlayForegroundFields.h
index cd7802c7a86abe8596e5b7fd0b1dc97e58c25f1d..816d90d1f84b7a384617c58e91b4c2745004bee6 100644
--- a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGGLOverlayForegroundFields.h
+++ b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGGLOverlayForegroundFields.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTA_OPENSG_GLOVERLAYFOREGROUND_FIELDS_H_
 #define _VISTA_OPENSG_GLOVERLAYFOREGROUND_FIELDS_H_
diff --git a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGGraphicsBridge.cpp b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGGraphicsBridge.cpp
index e3e0efb39a67f0d359345c575398bcd8b2017fb4..5e259b20f221ce16dc461b231ae4aed91519a698 100644
--- a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGGraphicsBridge.cpp
+++ b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGGraphicsBridge.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(WIN32)
 #pragma warning(disable: 4996)
@@ -917,7 +917,7 @@ bool VistaOpenSGGraphicsBridge::SetCoordinates(const int idx, const vector<Vista
 
 bool VistaOpenSGGraphicsBridge::SetCoordinates(const int idx, const vector<float>& coords, IVistaGeometryData*pData)
 {
-	unsigned int i, n(idx + coords.size()/3);
+	unsigned int n = idx + coords.size()/3;
 	VistaOpenSGGeometryData* pOpenSGData = static_cast<VistaOpenSGGeometryData*>(pData);
 	if( idx < 0)
 		return false;
@@ -928,7 +928,7 @@ bool VistaOpenSGGraphicsBridge::SetCoordinates(const int idx, const vector<float
 	const float* c = &coords[3*idx];
 	beginEditCP(pOpenSGData->GetGeometry()->getPositions());
 	{
-		for( i = idx; i < n; ++i, c+=3 )
+		for( unsigned int i = idx; i < n; ++i, c+=3 )
 			pOpenSGData->GetGeometry()->getPositions()->setValue( osg::Pnt3f(*c,*(c+1),*(c+2)), i );
 	}
 	endEditCP(pOpenSGData->GetGeometry()->getPositions());
@@ -963,7 +963,7 @@ bool VistaOpenSGGraphicsBridge::SetTextureCoord2D(const int idx, const float coo
 
 bool VistaOpenSGGraphicsBridge::SetTextureCoords2D(const int idx, const vector<VistaVector3D>& textureCoords2D, IVistaGeometryData* pData)
 {
-	unsigned int i, n(idx + textureCoords2D.size());
+	unsigned n = idx + textureCoords2D.size();
 	VistaOpenSGGeometryData* pOpenSGData = static_cast<VistaOpenSGGeometryData*>(pData);
 	if( idx < 0 )
 		return false;
@@ -973,7 +973,7 @@ bool VistaOpenSGGraphicsBridge::SetTextureCoords2D(const int idx, const vector<V
 
 	beginEditCP(pOpenSGData->GetGeometry()->getTexCoords());
 	{
-		for( i = idx; i < n; ++i )
+		for( unsigned int i = idx; i < n; ++i )
 			pOpenSGData->GetGeometry()->getTexCoords()->setValue( osg::Vec2f(textureCoords2D[i-idx][0],textureCoords2D[i-idx][1]), i );
 	}
 	endEditCP(pOpenSGData->GetGeometry()->getTexCoords());
@@ -982,7 +982,7 @@ bool VistaOpenSGGraphicsBridge::SetTextureCoords2D(const int idx, const vector<V
 
 bool VistaOpenSGGraphicsBridge::SetTextureCoords2D(const int idx, const vector<float>& textureCoords2D, IVistaGeometryData* pData)
 {
-	unsigned int i, n(idx + (textureCoords2D.size()/2));
+	unsigned int n = idx + (textureCoords2D.size()/2);
 	VistaOpenSGGeometryData* pOpenSGData = static_cast<VistaOpenSGGeometryData*>(pData);
 	if( idx < 0 )
 		return false;
@@ -992,7 +992,7 @@ bool VistaOpenSGGraphicsBridge::SetTextureCoords2D(const int idx, const vector<f
 
 	beginEditCP(pOpenSGData->GetGeometry()->getTexCoords());
 	{
-		for( i = idx; i < n; ++i )
+		for( unsigned int i = idx; i < n; ++i )
 			pOpenSGData->GetGeometry()->getTexCoords()->setValue( osg::Vec2f(textureCoords2D[(i-idx)*2],textureCoords2D[(i-idx)*2+1]), i );
 	}
 	endEditCP(pOpenSGData->GetGeometry()->getTexCoords());
@@ -1030,7 +1030,7 @@ bool VistaOpenSGGraphicsBridge::SetNormal(const int idx, const float normal[3],
 
 bool VistaOpenSGGraphicsBridge::SetNormals(const int idx, const vector<float>& normals, IVistaGeometryData* pData)
 {
-	unsigned int i, n(idx + normals.size()/3);
+	unsigned int n = idx + normals.size()/3;
 	VistaOpenSGGeometryData* pOpenSGData = static_cast<VistaOpenSGGeometryData*>(pData);
 	if( idx < 0 )
 		return false;
@@ -1041,7 +1041,7 @@ bool VistaOpenSGGraphicsBridge::SetNormals(const int idx, const vector<float>& n
 	const float *c = &normals[3*idx];
 	beginEditCP(pOpenSGData->GetGeometry()->getNormals());
 	{
-		for( i = idx; i < n; ++i, c+=3 )
+		for( unsigned int i = idx; i < n; ++i, c+=3 )
 			pOpenSGData->GetGeometry()->getNormals()->setValue( osg::Vec3f(*c,*(c+1),*(c+2)), i );
 	}
 	endEditCP(pOpenSGData->GetGeometry()->getNormals());
@@ -1050,7 +1050,7 @@ bool VistaOpenSGGraphicsBridge::SetNormals(const int idx, const vector<float>& n
 
 bool VistaOpenSGGraphicsBridge::SetNormals(const int idx, const vector<VistaVector3D>& normals, IVistaGeometryData* pData)
 {
-	unsigned int i, n(idx + normals.size());
+	unsigned int n = idx + normals.size();
 	VistaOpenSGGeometryData* pOpenSGData = static_cast<VistaOpenSGGeometryData*>(pData);
 	if( idx < 0 )
 		return false;
@@ -1060,7 +1060,7 @@ bool VistaOpenSGGraphicsBridge::SetNormals(const int idx, const vector<VistaVect
 
 	beginEditCP(pOpenSGData->GetGeometry()->getNormals());
 	{
-		for( i = idx; i < n; ++i )
+		for( unsigned int i = idx; i < n; ++i )
 			pOpenSGData->GetGeometry()->getNormals()->setValue( osg::Vec3f(normals[i-idx][0],normals[i-idx][1],normals[i-idx][2]), i );
 	}
 	endEditCP(pOpenSGData->GetGeometry()->getNormals());
@@ -1121,7 +1121,7 @@ bool VistaOpenSGGraphicsBridge::SetColor(const int idx, const VistaColor& color,
 
 bool VistaOpenSGGraphicsBridge::SetColors(const int idx, const vector<VistaColor>& colors, IVistaGeometryData* pData)
 {
-	unsigned int i, n(idx + colors.size());
+	unsigned int n = idx + colors.size();
 	VistaOpenSGGeometryData* pOpenSGData = static_cast<VistaOpenSGGeometryData*>(pData);
 	if( idx < 0 )
 		return false;
@@ -1132,7 +1132,7 @@ bool VistaOpenSGGraphicsBridge::SetColors(const int idx, const vector<VistaColor
 	float c[3];
 	beginEditCP(pOpenSGData->GetGeometry()->getColors());
 	{
-		for( i = idx; i < n; ++i )
+		for( unsigned int i = idx; i < n; ++i )
 		{
 			colors[i-idx].GetValues(c);
 			pOpenSGData->GetGeometry()->getColors()->setValue( osg::Color3f(c[0],c[1],c[2]), i );
@@ -1145,7 +1145,7 @@ bool VistaOpenSGGraphicsBridge::SetColors(const int idx, const vector<VistaColor
 
 bool VistaOpenSGGraphicsBridge::SetColors(const int idx, const int bufferLength, float* colors, IVistaGeometryData* pData)
 {
-	unsigned int i, n(idx + (bufferLength/3));
+	unsigned int n = idx + (bufferLength/3);
 	VistaOpenSGGeometryData* pOpenSGData = static_cast<VistaOpenSGGeometryData*>(pData);
 	if( idx < 0 )
 		return false;
@@ -1155,7 +1155,7 @@ bool VistaOpenSGGraphicsBridge::SetColors(const int idx, const int bufferLength,
 
 	beginEditCP(pOpenSGData->GetGeometry()->getColors());
 	{
-		for( i = idx; i < n; ++i )
+		for( unsigned int i = idx; i < n; ++i )
 			pOpenSGData->GetGeometry()->getColors()->setValue( osg::Color3f(colors[(i-idx)*3],colors[(i-idx)*3+1],colors[(i-idx)*3+2]), i );
 	}
 	endEditCP(pOpenSGData->GetGeometry()->getColors());
@@ -1588,14 +1588,12 @@ bool VistaOpenSGGraphicsBridge::DeleteTexture(IVistaGeometryData* pData)
 	osg::ChunkMaterialPtr stm = osg::ChunkMaterialPtr::dcast(pOpenSGData->GetGeometry()->getMaterial());
 	if( stm.getCPtr() == NULL )
 		return false;
-
-	osg::StateChunkPtr stateChunk = osg::NullFC;
+	
 	//search for the TextureChunk
 	/** 
 	 * @todo BEE there may be more then ONE texture chunk!
 	 */
-	stateChunk = stm->find(osg::TextureChunk::getClassType());
-
+	osg::StateChunkPtr stateChunk = stm->find(osg::TextureChunk::getClassType());
 	if(stateChunk != osg::NullFC)
 	{
 		beginEditCP(stm);
@@ -2546,9 +2544,8 @@ bool VistaOpenSGGraphicsBridge::SetRenderingAttributes(const VistaRenderingAttri
 	}
 	else
 	{
-		osg::StateChunkPtr stateChunk = osg::NullFC;
 		//search for an existing TextureChunk
-		stateChunk = stm->find(osg::TextureChunk::getClassType());
+		osg::StateChunkPtr stateChunk = stm->find(osg::TextureChunk::getClassType());
 		if(stateChunk==osg::NullFC)
 		{
 //                      cerr << " Warning VistaOpenSGGraphicsBridge::SetRenderingAttributes(): no texture found. " << std::endl;
@@ -3393,7 +3390,6 @@ bool VistaOpenSGGraphicsBridge::SetMaterial(const VistaMaterial& oMaterial, IVis
 		}
 		else
 		{
-			stateChunk = osg::NullFC;
 			stateChunk = stm->find(osg::BlendChunk::getClassType());
 			if( stateChunk != osg::NullFC )
 			{
@@ -3412,7 +3408,6 @@ bool VistaOpenSGGraphicsBridge::SetMaterial(const VistaMaterial& oMaterial, IVis
 				stm->addChunk(blendchunk);
 			else
 			{
-				stateChunk = osg::NullFC;
 				stateChunk = stm->find(osg::BlendChunk::getClassType());
 				if( stateChunk != osg::NullFC )
 				{
diff --git a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGGraphicsBridge.h b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGGraphicsBridge.h
index 0d6597414af43a254093a923c4fd6d69ba4ffcff..cbbfaa942063cbb18dd70b8f6a7fcbafeb663980 100644
--- a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGGraphicsBridge.h
+++ b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGGraphicsBridge.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOPENSGGRAPHICSBRIDGE_H
 #define _VISTAOPENSGGRAPHICSBRIDGE_H
diff --git a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGNodeBridge.cpp b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGNodeBridge.cpp
index 004fefd3185ea9653cda0abb122251e2bd44a879..3a29710d1804f56f57a011ac8f8f6d5224ff8bbd 100644
--- a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGNodeBridge.cpp
+++ b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGNodeBridge.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifdef WIN32
 // disable warnings from OpenSG
diff --git a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGNodeBridge.h b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGNodeBridge.h
index 00f9b6571b0719341ae405a02f7b687ed6ff56f2..a6b600a8badedc4ff1771b4133308820a13440bc 100644
--- a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGNodeBridge.h
+++ b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGNodeBridge.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOPENSGNODEBRIDGE_H
 #define _VISTAOPENSGNODEBRIDGE_H
diff --git a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGSystemClassFactory.cpp b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGSystemClassFactory.cpp
index 1455f17fbb05512dad8c0b737413f7522eaa17b9..fd3478c674de01dd71463bf4d834f1d959b7115a 100644
--- a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGSystemClassFactory.cpp
+++ b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGSystemClassFactory.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(VISTA_SYS_OPENSG)
 
diff --git a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGSystemClassFactory.h b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGSystemClassFactory.h
index 8cc638fc781f2bf44f7006b3c3cb9cde50cd3338..1ed1de02ec31a3c8c0ad0fef0b5b4c35484f06eb 100644
--- a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGSystemClassFactory.h
+++ b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGSystemClassFactory.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOPENSGSGSYSTEMCLASSFACTORY_H
 #define _VISTAOPENSGSGSYSTEMCLASSFACTORY_H
diff --git a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGTextForeground.cpp b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGTextForeground.cpp
index fc82b57e91ea4ad7c3895386b16fb6f4a23ea8c0..bbbffce3388630835dd114e325825a3a3b39b500 100644
--- a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGTextForeground.cpp
+++ b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGTextForeground.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 //---------------------------------------------------------------------------
 //  Includes
diff --git a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGTextForeground.h b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGTextForeground.h
index c5f514baecf135c704e31b6443ac3fcd34f9dcb1..ffea8db0f6a2875da9f168600d33d77c6f9263e1 100644
--- a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGTextForeground.h
+++ b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGTextForeground.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTA_OPENSG_TEXTFOREGROUND_H_
 #define _VISTA_OPENSG_TEXTFOREGROUND_H_
diff --git a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGTextForegroundBase.cpp b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGTextForegroundBase.cpp
index 2d58f4736346e4f86464207f1b4fe2be46cc8ae9..f7aff0c861017b19d7ba40d5b2c4a5f5180ff1c8 100644
--- a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGTextForegroundBase.cpp
+++ b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGTextForegroundBase.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaOpenSGTextForegroundBase.h"
 #include "VistaOpenSGTextForeground.h"
diff --git a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGTextForegroundBase.h b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGTextForegroundBase.h
index ab191f1fe2db1378a4c3dc8581b6e1396d1c3730..4bdf1d34a78537a58d2986513478f4686a087601 100644
--- a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGTextForegroundBase.h
+++ b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGTextForegroundBase.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTA_OPENSG_TEXTFOREGROUND_BASE_H_
 #define _VISTA_OPENSG_TEXTFOREGROUND_BASE_H_
diff --git a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGTextForegroundFields.h b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGTextForegroundFields.h
index fd920ded6097a723ee725c19634a5abad61139be..917dcb916fc1b28fbb965731f6836be244c064f5 100644
--- a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGTextForegroundFields.h
+++ b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGTextForegroundFields.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTA_OPENSG_TEXTFOREGROUND_FIELDS_H_
 #define _VISTA_OPENSG_TEXTFOREGROUND_FIELDS_H_
diff --git a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGThreadImp.cpp b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGThreadImp.cpp
index bf28a358fdd8d4a54b6ce335c9585ede55010054..2f4ba38d6ce42446e5183e189ca59a832a4c8d07 100644
--- a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGThreadImp.cpp
+++ b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGThreadImp.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaOpenSGThreadImp.h" 
 #include <VistaInterProcComm/Concurrency/VistaThread.h>
diff --git a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGThreadImp.h b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGThreadImp.h
index 1c5fbcb526fed56d277be250790c3efd89045231..e7408e948d0cfd2982bb8086469a1d3f5529b6d8 100644
--- a/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGThreadImp.h
+++ b/VistaCoreLibs/VistaKernel/OpenSG/VistaOpenSGThreadImp.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOPENSGTHREADIMP_H
 #define _VISTAOPENSGTHREADIMP_H
diff --git a/VistaCoreLibs/VistaKernel/OpenSG/_SourceFiles.cmake b/VistaCoreLibs/VistaKernel/OpenSG/_SourceFiles.cmake
index d2256b1451de2f609fa3cd49aeb70e06cafa3dcd..acfba38a0efe269b70ceb10c8e96a8186991ae5d 100644
--- a/VistaCoreLibs/VistaKernel/OpenSG/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaKernel/OpenSG/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "./OpenSG" )
 set( RelativeSourceGroup "Source Files\\OpenSG" )
diff --git a/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityBarrierTape.cpp b/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityBarrierTape.cpp
index e5e5db6618fa812a6eac318244a7f471713be5c8..bc6de61d53ea166ec336f11b1b1755cdee420bda 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityBarrierTape.cpp
+++ b/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityBarrierTape.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <GL/glew.h>
 
diff --git a/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityBarrierTape.h b/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityBarrierTape.h
index 06c3f953defc177361ca296b8fc9627252258048..a1485f17f17e004b596a158ab79a75517ef2409b 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityBarrierTape.h
+++ b/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityBarrierTape.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAPROXIMITYBARRIERTAPE_H
 #define _VISTAPROXIMITYBARRIERTAPE_H
diff --git a/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityFadeout.cpp b/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityFadeout.cpp
index ba5268021555a0dd955b82d79c8c652367d6c84c..af0b5512ee6e8f98c6a208d18dc7e927d2fde06d 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityFadeout.cpp
+++ b/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityFadeout.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <GL/glew.h>
 
diff --git a/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityFadeout.h b/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityFadeout.h
index 0ad85e68dec49dcc9660d194cc9cad2b23aea9ab..57d7501a45030371b51ac2ebadfcf9531e5cc277 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityFadeout.h
+++ b/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityFadeout.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAPROXIMITYFADEOUT_H
 #define _VISTAPROXIMITYFADEOUT_H
diff --git a/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityFence.cpp b/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityFence.cpp
index 64c9653a9aae622592409653ecc1be05475a84fb..93f0e0daa1046225655059325bb707ff10b60ceb 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityFence.cpp
+++ b/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityFence.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaProximityBarrierTape.h"
 
diff --git a/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityFence.h b/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityFence.h
index 06c3f953defc177361ca296b8fc9627252258048..a1485f17f17e004b596a158ab79a75517ef2409b 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityFence.h
+++ b/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityFence.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAPROXIMITYBARRIERTAPE_H
 #define _VISTAPROXIMITYBARRIERTAPE_H
diff --git a/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximitySign.cpp b/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximitySign.cpp
index 818e9a3f09feeadd01214dc881aa9d22720e74cc..2f7d8d75caaa1a558d666406c3b911c75b8984d3 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximitySign.cpp
+++ b/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximitySign.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaProximitySign.h"
 
diff --git a/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximitySign.h b/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximitySign.h
index d7ba95d821b17a0f3ce443dcc49214c63334ea62..47759d2278d5626009ebb1ba8cd3ddce6a989ed3 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximitySign.h
+++ b/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximitySign.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAPROXIMITYSIGN_H
 #define _VISTAPROXIMITYSIGN_H
diff --git a/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityWarningBase.cpp b/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityWarningBase.cpp
index 169837bfa67098f46b12ad57f54cbb2b0df759a1..dc86f51720504203a96aa775af1d9607371133cc 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityWarningBase.cpp
+++ b/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityWarningBase.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaProximityWarningBase.h"
 
diff --git a/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityWarningBase.h b/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityWarningBase.h
index 9dd1dab198476719d5826ff61285126136cdb439..37fafaa5195a100f0f25e19ba7db492bcef018c4 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityWarningBase.h
+++ b/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/VistaProximityWarningBase.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAPROXIMITYWARNINGBASE_H
 #define _VISTAPROXIMITYWARNINGBASE_H
diff --git a/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/_SourceFiles.cmake b/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/_SourceFiles.cmake
index b2e44926ac8184bd4ccfe9a4d58fe11a3590a681..388cdb86b204c05da17044ebbe5978f23b6460c7 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaKernel/Stuff/ProximityWarning/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id:$
+
 
 set( RelativeDir "./Stuff/ProximityWarning" )
 set( RelativeSourceGroup "Source Files\\Stuff\\ProximityWarning" )
diff --git a/VistaCoreLibs/VistaKernel/Stuff/VistaAC3DLoader.cpp b/VistaCoreLibs/VistaKernel/Stuff/VistaAC3DLoader.cpp
index acc48d1802785835bc88e713ef611e101f268229..3de875efb13532cb1befc45618b5dff1f4fa544d 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/VistaAC3DLoader.cpp
+++ b/VistaCoreLibs/VistaKernel/Stuff/VistaAC3DLoader.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(WIN32)
 #pragma warning(disable: 4996)
diff --git a/VistaCoreLibs/VistaKernel/Stuff/VistaAC3DLoader.h b/VistaCoreLibs/VistaKernel/Stuff/VistaAC3DLoader.h
index eef948b955e90f75e31d8d7c3d1b0a776c826b5d..6c847717bac8dc54fe56fad63f6faa3c58d5630a 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/VistaAC3DLoader.h
+++ b/VistaCoreLibs/VistaKernel/Stuff/VistaAC3DLoader.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAAC3DLOADER_H
 #define _VISTAAC3DLOADER_H
diff --git a/VistaCoreLibs/VistaKernel/Stuff/VistaAdaptiveVSyncControl.cpp b/VistaCoreLibs/VistaKernel/Stuff/VistaAdaptiveVSyncControl.cpp
index f3c82beacbf2ec157d77c83d9137cac12c35da33..eb2ac8294e792dcb2d819e6489ef9a225bce78c8 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/VistaAdaptiveVSyncControl.cpp
+++ b/VistaCoreLibs/VistaKernel/Stuff/VistaAdaptiveVSyncControl.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaFramerateDisplay.cpp 30802 2012-06-26 07:32:23Z dr165799 $
+
 
 #include "VistaAdaptiveVSyncControl.h"
 
diff --git a/VistaCoreLibs/VistaKernel/Stuff/VistaAdaptiveVSyncControl.h b/VistaCoreLibs/VistaKernel/Stuff/VistaAdaptiveVSyncControl.h
index 43c740e7bd6d116e7da81f9c7745a13a18d76ed0..6f4993f29629eabd542e06ec668f0f2f4453e497 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/VistaAdaptiveVSyncControl.h
+++ b/VistaCoreLibs/VistaKernel/Stuff/VistaAdaptiveVSyncControl.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaFramerateDisplay.h 30802 2012-06-26 07:32:23Z dr165799 $
+
 
 #ifndef _VISTAADAPTIVEVSYNCCONTROL_H
 #define _VISTAADAPTIVEVSYNCCONTROL_H
diff --git a/VistaCoreLibs/VistaKernel/Stuff/VistaEyeTester.cpp b/VistaCoreLibs/VistaKernel/Stuff/VistaEyeTester.cpp
index 3bd6e3263eca84048e83376cfed6bbe0513d1e5f..5898af0c8060ef897434997cec2553b5a9eee252 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/VistaEyeTester.cpp
+++ b/VistaCoreLibs/VistaKernel/Stuff/VistaEyeTester.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <GL/glew.h>
 
diff --git a/VistaCoreLibs/VistaKernel/Stuff/VistaEyeTester.h b/VistaCoreLibs/VistaKernel/Stuff/VistaEyeTester.h
index eea33c6247354d978a79bba4733a57f582970035..3377d679a5886f98923a52d010fc169cfb233042 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/VistaEyeTester.h
+++ b/VistaCoreLibs/VistaKernel/Stuff/VistaEyeTester.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAEYETESTER_H
 #define _VISTAEYETESTER_H
diff --git a/VistaCoreLibs/VistaKernel/Stuff/VistaFrameSeriesCapture.cpp b/VistaCoreLibs/VistaKernel/Stuff/VistaFrameSeriesCapture.cpp
index 5dfe1a129262c17286c4493824ab577db3b7f92f..d60c6aaaf45ed7ad482912f5556d1bce5bb83c0d 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/VistaFrameSeriesCapture.cpp
+++ b/VistaCoreLibs/VistaKernel/Stuff/VistaFrameSeriesCapture.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaFrameSeriesCapture.cpp 31051 2012-07-10 08:10:41Z dr165799 $
+
 
 #include "VistaFrameSeriesCapture.h"
 
diff --git a/VistaCoreLibs/VistaKernel/Stuff/VistaFrameSeriesCapture.h b/VistaCoreLibs/VistaKernel/Stuff/VistaFrameSeriesCapture.h
index 5ef86905bf8c1f8e56c98b99f2d294fac94e37e7..793941e3ec38fbfac07b8e322222e2ce321ed895 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/VistaFrameSeriesCapture.h
+++ b/VistaCoreLibs/VistaKernel/Stuff/VistaFrameSeriesCapture.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaFrameSeriesCapture.h 30802 2012-06-26 07:32:23Z dr165799 $
+
 
 #ifndef _VISTAFRAMESERIESCAPTURE_H
 #define _VISTAFRAMESERIESCAPTURE_H
diff --git a/VistaCoreLibs/VistaKernel/Stuff/VistaFramerateDisplay.cpp b/VistaCoreLibs/VistaKernel/Stuff/VistaFramerateDisplay.cpp
index 7892fbaee4c07d55431523596c840f1d4c347081..732270cd09959aa12067d2ddcf903eb1363fd78f 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/VistaFramerateDisplay.cpp
+++ b/VistaCoreLibs/VistaKernel/Stuff/VistaFramerateDisplay.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaFramerateDisplay.h"
 
diff --git a/VistaCoreLibs/VistaKernel/Stuff/VistaFramerateDisplay.h b/VistaCoreLibs/VistaKernel/Stuff/VistaFramerateDisplay.h
index 7b9537e17295b040eba9027c1d8fa115fe9771a9..64802ef2a8e35947801d8baa7b10dd15a7d2e3c1 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/VistaFramerateDisplay.h
+++ b/VistaCoreLibs/VistaKernel/Stuff/VistaFramerateDisplay.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAFRAMERATEDISPLAY_H
 #define _VISTAFRAMERATEDISPLAY_H
diff --git a/VistaCoreLibs/VistaKernel/Stuff/VistaInteractionHandlerBase.cpp b/VistaCoreLibs/VistaKernel/Stuff/VistaInteractionHandlerBase.cpp
index e187e919f21f2c132139351438523f8e257b63a4..d970b716fa273b941533933db8411cf104a35d4d 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/VistaInteractionHandlerBase.cpp
+++ b/VistaCoreLibs/VistaKernel/Stuff/VistaInteractionHandlerBase.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaInteractionHandlerBase.h" 
 
diff --git a/VistaCoreLibs/VistaKernel/Stuff/VistaInteractionHandlerBase.h b/VistaCoreLibs/VistaKernel/Stuff/VistaInteractionHandlerBase.h
index e13a5887f3137fd0cb7514d7721e5c0f31e661d4..9d2aece0535d765d7fed63206d003ff7c2a6cbaf 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/VistaInteractionHandlerBase.h
+++ b/VistaCoreLibs/VistaKernel/Stuff/VistaInteractionHandlerBase.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAINTERACTIONHANDLERBASE_H
 #define _VISTAINTERACTIONHANDLERBASE_H
diff --git a/VistaCoreLibs/VistaKernel/Stuff/VistaKernelProfiling.h b/VistaCoreLibs/VistaKernel/Stuff/VistaKernelProfiling.h
index 8d4787ebf9ca2ca023c6915899742aa47d3896e8..36c44e03070fc3dd83a974c0ec886bcf63d60481 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/VistaKernelProfiling.h
+++ b/VistaCoreLibs/VistaKernel/Stuff/VistaKernelProfiling.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAKERNELPROFILING_H
 #define _VISTAKERNELPROFILING_H
diff --git a/VistaCoreLibs/VistaKernel/Stuff/VistaRuntimeLimiter.cpp b/VistaCoreLibs/VistaKernel/Stuff/VistaRuntimeLimiter.cpp
index ea1e9101210998ae5b360950d02554cea50ec263..f4d7a0a8ef759aa19725dbcbfc5f725b500f6b52 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/VistaRuntimeLimiter.cpp
+++ b/VistaCoreLibs/VistaKernel/Stuff/VistaRuntimeLimiter.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaRuntimeLimiter.cpp 31051 2012-07-10 08:10:41Z dr165799 $
+
 
 #include "VistaRuntimeLimiter.h"
 
diff --git a/VistaCoreLibs/VistaKernel/Stuff/VistaRuntimeLimiter.h b/VistaCoreLibs/VistaKernel/Stuff/VistaRuntimeLimiter.h
index 0b02053dc0c463d05b36926bc7ccacaf80ae7b0f..ebe8ccf141354ec5da059a97d20a6fd941353c26 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/VistaRuntimeLimiter.h
+++ b/VistaCoreLibs/VistaKernel/Stuff/VistaRuntimeLimiter.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaRuntimeLimiter.h 30802 2012-06-26 07:32:23Z dr165799 $
+
 
 #ifndef _VISTARUNTIMELIMITER_H
 #define _VISTARUNTIMELIMITER_H
diff --git a/VistaCoreLibs/VistaKernel/Stuff/VistaStreamManagerExt.cpp b/VistaCoreLibs/VistaKernel/Stuff/VistaStreamManagerExt.cpp
index 0c1865aa50a6b681535fb45816c65635607167bf..135f78ef69dd3d82a2ef393640a742f97df78b96 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/VistaStreamManagerExt.cpp
+++ b/VistaCoreLibs/VistaKernel/Stuff/VistaStreamManagerExt.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaStreamManagerExt.h"
 
diff --git a/VistaCoreLibs/VistaKernel/Stuff/VistaStreamManagerExt.h b/VistaCoreLibs/VistaKernel/Stuff/VistaStreamManagerExt.h
index 14609f0c892b77fae92df556feabcf9a1178262c..8d5ac4cad7e0aa2c88ee408eec3c102d4d2f0d53 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/VistaStreamManagerExt.h
+++ b/VistaCoreLibs/VistaKernel/Stuff/VistaStreamManagerExt.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASTREAMMANAGEREXT_H
 #define _VISTASTREAMMANAGEREXT_H
diff --git a/VistaCoreLibs/VistaKernel/Stuff/VistaVirtualConsole.cpp b/VistaCoreLibs/VistaKernel/Stuff/VistaVirtualConsole.cpp
index 9286ae60ff218648f55ba4008f87738742a3c2ef..6f53410ee97014d7f72d09c48e2c12599517e104 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/VistaVirtualConsole.cpp
+++ b/VistaCoreLibs/VistaKernel/Stuff/VistaVirtualConsole.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <GL/glew.h>
 
diff --git a/VistaCoreLibs/VistaKernel/Stuff/VistaVirtualConsole.h b/VistaCoreLibs/VistaKernel/Stuff/VistaVirtualConsole.h
index 73436a7aa3275decc7321f5b7dc25de96a06d23c..0c92808330c0c295820e979d02fa32cb89df0ce9 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/VistaVirtualConsole.h
+++ b/VistaCoreLibs/VistaKernel/Stuff/VistaVirtualConsole.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAVIRTUALCONSOLE_H
 #define _VISTAVIRTUALCONSOLE_H
diff --git a/VistaCoreLibs/VistaKernel/Stuff/_SourceFiles.cmake b/VistaCoreLibs/VistaKernel/Stuff/_SourceFiles.cmake
index e9889b705a5918dedda90acb441b4d0c7380a7ad..9df9c300d8f4d2ea85a6d67f6c45743cd68c1bb0 100644
--- a/VistaCoreLibs/VistaKernel/Stuff/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaKernel/Stuff/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "./Stuff" )
 set( RelativeSourceGroup "Source Files\\Stuff" )
diff --git a/VistaCoreLibs/VistaKernel/VistaDriverPropertyConfigurator.cpp b/VistaCoreLibs/VistaKernel/VistaDriverPropertyConfigurator.cpp
index a29cbe301ccc97faf9b185a84c4218df2f107549..c38b6e39b34e6b4f80ed1424cdffafa1e7400587 100644
--- a/VistaCoreLibs/VistaKernel/VistaDriverPropertyConfigurator.cpp
+++ b/VistaCoreLibs/VistaKernel/VistaDriverPropertyConfigurator.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDriverPropertyConfigurator.h" 
 #include <VistaDeviceDriversBase/VistaDeviceDriver.h>
diff --git a/VistaCoreLibs/VistaKernel/VistaDriverPropertyConfigurator.h b/VistaCoreLibs/VistaKernel/VistaDriverPropertyConfigurator.h
index ec0cbc9f13dca89c678771d70744369db461849d..8dffcd3159867dc2e33206049c0d6fad4c9ad1ae 100644
--- a/VistaCoreLibs/VistaKernel/VistaDriverPropertyConfigurator.h
+++ b/VistaCoreLibs/VistaKernel/VistaDriverPropertyConfigurator.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADRIVERPROPERTYCONFIGURATOR_H
 #define _VISTADRIVERPROPERTYCONFIGURATOR_H
diff --git a/VistaCoreLibs/VistaKernel/VistaFrameLoop.cpp b/VistaCoreLibs/VistaKernel/VistaFrameLoop.cpp
index 21056062bc3fc2f31a4b459e444b911492aa72f3..f30642c7f8b429140d3563cd1f7a84be7dbddb6d 100644
--- a/VistaCoreLibs/VistaKernel/VistaFrameLoop.cpp
+++ b/VistaCoreLibs/VistaKernel/VistaFrameLoop.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaFrameLoop.h"
 
diff --git a/VistaCoreLibs/VistaKernel/VistaFrameLoop.h b/VistaCoreLibs/VistaKernel/VistaFrameLoop.h
index 863bf99bbe27cc7f184496f5620dab4a984355a3..5c34e3ba9fc5403b51ef8fecb2e56236963f1da4 100644
--- a/VistaCoreLibs/VistaKernel/VistaFrameLoop.h
+++ b/VistaCoreLibs/VistaKernel/VistaFrameLoop.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAFRAMELOOP_H
 #define _VISTAFRAMELOOP_H
diff --git a/VistaCoreLibs/VistaKernel/VistaKernelConfig.h b/VistaCoreLibs/VistaKernel/VistaKernelConfig.h
index ff9da42a3e9a14e1b0cf018301cb05999d055e31..e12e69fd8ce09f6360caf8512e1697fcd5b1cf44 100644
--- a/VistaCoreLibs/VistaKernel/VistaKernelConfig.h
+++ b/VistaCoreLibs/VistaKernel/VistaKernelConfig.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAKERNELCONFIG_H
 #define _VISTAKERNELCONFIG_H
diff --git a/VistaCoreLibs/VistaKernel/VistaKernelMsgPort.cpp b/VistaCoreLibs/VistaKernel/VistaKernelMsgPort.cpp
index 5ba8fcd3ceac4fd0fefd8d94e8cdda9b8d6fb03a..bddff6013a02d8baade95118e8eb970760938419 100644
--- a/VistaCoreLibs/VistaKernel/VistaKernelMsgPort.cpp
+++ b/VistaCoreLibs/VistaKernel/VistaKernelMsgPort.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaKernelMsgPort.h"
 
diff --git a/VistaCoreLibs/VistaKernel/VistaKernelMsgPort.h b/VistaCoreLibs/VistaKernel/VistaKernelMsgPort.h
index 78ccd7c2e2859a8764a85d889b567a861a7ad39f..e2a2439ff839791eecb8abd969a2b3541144400e 100644
--- a/VistaCoreLibs/VistaKernel/VistaKernelMsgPort.h
+++ b/VistaCoreLibs/VistaKernel/VistaKernelMsgPort.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAKERNELMSGPORT_H
 #define _VISTAKERNELMSGPORT_H
diff --git a/VistaCoreLibs/VistaKernel/VistaKernelMsgTab.h b/VistaCoreLibs/VistaKernel/VistaKernelMsgTab.h
index 0eb66676e5127d67471ac1b95101f2c46516943c..b507969d450b3299ab6c15f4cf418f31df5b846a 100644
--- a/VistaCoreLibs/VistaKernel/VistaKernelMsgTab.h
+++ b/VistaCoreLibs/VistaKernel/VistaKernelMsgTab.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAKERNELMSGTAB_H
 #define _VISTAKERNELMSGTAB_H
diff --git a/VistaCoreLibs/VistaKernel/VistaSystem.cpp b/VistaCoreLibs/VistaKernel/VistaSystem.cpp
index 2ca44983af9f94765b985935af62c84ef69a30f1..ef7685e02dc7c94d1293c43824c4b9e52929eed6 100644
--- a/VistaCoreLibs/VistaKernel/VistaSystem.cpp
+++ b/VistaCoreLibs/VistaKernel/VistaSystem.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaSystem.h"
 
@@ -766,10 +766,8 @@ bool VistaSystem::DoInit( int argc, char **argv )
 			}
 			default:
 			{
-				vstr::errp() 
-						<< "VistaSystem::DoInit() -> unknown init routine " << std::endl;
+				vstr::errp() << "VistaSystem::DoInit() -> unknown init routine " << std::endl;
 				return false;
-				break;
 			}
 		};
 	}
@@ -1376,7 +1374,6 @@ bool VistaSystem::SetupBasicInteraction()
 	}
 
 	// setup projection updates
-	std::list<std::string> liDisplaySystems;
 	std::string sDisplaySystemSectionName = m_pClusterMode->GetConfigSectionName();
 
 	const std::map<std::string, VistaDisplaySystem*> m_mapDisplays = m_pDisplayManager->GetDisplaySystemsConstRef();
@@ -1915,7 +1912,7 @@ void VistaSystem::HandleEvent(VistaEvent *pEvent)
 	}
 	else if(pEvent->GetType() == VistaExternalMsgEvent::GetTypeId())
 	{
-		VistaMsg *pMsg = ((VistaExternalMsgEvent*)pEvent)->GetThisMsg();
+		VistaMsg *pMsg = Vista::assert_cast< VistaExternalMsgEvent* >( pEvent )->GetThisMsg();
 
 		switch(pMsg->GetMsgType())
 		{
diff --git a/VistaCoreLibs/VistaKernel/VistaSystem.h b/VistaCoreLibs/VistaKernel/VistaSystem.h
index dee329295c81537a27b4db12b3b7baf8dd69f920..66a501ab189e3243519a07fa8ead7811b28f51a9 100644
--- a/VistaCoreLibs/VistaKernel/VistaSystem.h
+++ b/VistaCoreLibs/VistaKernel/VistaSystem.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASYSTEM_H
 #define _VISTASYSTEM_H
diff --git a/VistaCoreLibs/VistaKernel/VistaSystemClassFactory.h b/VistaCoreLibs/VistaKernel/VistaSystemClassFactory.h
index b66c4a9dba3d55189bbd44e71ffe0d8ab3ba0c81..b5718685ceb5b46e295007e8a7028796ce0ce547 100644
--- a/VistaCoreLibs/VistaKernel/VistaSystemClassFactory.h
+++ b/VistaCoreLibs/VistaKernel/VistaSystemClassFactory.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASYSTEMCLASSFACTORY_H
 #define _VISTASYSTEMCLASSFACTORY_H
diff --git a/VistaCoreLibs/VistaKernel/VistaSystemCommands.cpp b/VistaCoreLibs/VistaKernel/VistaSystemCommands.cpp
index 4db40afedcb584703538118c2b92aa14af2939b8..af03c1d56f1b116f33906c1274ff2fec3e8a4ff4 100644
--- a/VistaCoreLibs/VistaKernel/VistaSystemCommands.cpp
+++ b/VistaCoreLibs/VistaKernel/VistaSystemCommands.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaSystemCommands.h"
 
diff --git a/VistaCoreLibs/VistaKernel/VistaSystemCommands.h b/VistaCoreLibs/VistaKernel/VistaSystemCommands.h
index 5e93a37a3cd912afa48192c3c1815d5445b7b8d4..ac252a58a01b5b2455634053a8e03336fa1032d3 100644
--- a/VistaCoreLibs/VistaKernel/VistaSystemCommands.h
+++ b/VistaCoreLibs/VistaKernel/VistaSystemCommands.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASYSTEMCOMMANDS_H
 #define _VISTASYSTEMCOMMANDS_H
diff --git a/VistaCoreLibs/VistaKernel/VistaSystemConfigurators.cpp b/VistaCoreLibs/VistaKernel/VistaSystemConfigurators.cpp
index a26337a31f46f24946e897871c677e64d8aff149..2500e1f9e8b44a1960b4b3793a45a9d8047ad918 100644
--- a/VistaCoreLibs/VistaKernel/VistaSystemConfigurators.cpp
+++ b/VistaCoreLibs/VistaKernel/VistaSystemConfigurators.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(SUNOS)
 #include <sunmath.h>
diff --git a/VistaCoreLibs/VistaKernel/VistaSystemConfigurators.h b/VistaCoreLibs/VistaKernel/VistaSystemConfigurators.h
index aa5ffe71f6447b17961ca1758b2836750850082d..3899356a6a8a0c7eef1d01fc15972988739f81e8 100644
--- a/VistaCoreLibs/VistaKernel/VistaSystemConfigurators.h
+++ b/VistaCoreLibs/VistaKernel/VistaSystemConfigurators.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASYSTEMCONFIGURATORS_H
 #define _VISTASYSTEMCONFIGURATORS_H
diff --git a/VistaCoreLibs/VistaKernel/_SourceFiles.cmake b/VistaCoreLibs/VistaKernel/_SourceFiles.cmake
index acec7b218f63b6e1548433a27027b95c292cce1c..9fcd9b1321a9249c7efee6af670bbf6658bd9177 100644
--- a/VistaCoreLibs/VistaKernel/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaKernel/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/CMakeLists.txt b/VistaCoreLibs/VistaKernelOpenSGExt/CMakeLists.txt
index 29fd300205e9c1233192100b6fe89c19af4620cd..4fc580b88eb2e39fd83daf96d36027c26eabb034 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/CMakeLists.txt
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id$
+
 
 vista_adopt_version( VistaKernelOpenSGExt VistaCoreLibs )
 
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaKernelOpenSGExtConfig.h b/VistaCoreLibs/VistaKernelOpenSGExt/VistaKernelOpenSGExtConfig.h
index 92615d5e7b35bda56b58fe503d6bae5f4c6abe9f..32a6abc87deb5f2f5d5143c1f554499243af3c64 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaKernelOpenSGExtConfig.h
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaKernelOpenSGExtConfig.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAKERNELOPENSGEXTCONFIG_H
 #define _VISTAKERNELOPENSGEXTCONFIG_H
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGGeometryTools.cpp b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGGeometryTools.cpp
index 0c7b3153642a2bdc1af53c6f7832f6bd0391d945..37e1eb34358ca6401cac33df2d0f5ebdf48f60e8 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGGeometryTools.cpp
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGGeometryTools.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(WIN32)
 #pragma warning(disable: 4127)
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGGeometryTools.h b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGGeometryTools.h
index d0416faf0c81f72ca78f6dd5698fe65f5db75ba7..7b33324178857bdc689f8a083f5cafcaf0187ae2 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGGeometryTools.h
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGGeometryTools.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOPENSGGEOMETRYTOOLS_H
 #define _VISTAOPENSGGEOMETRYTOOLS_H
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGGraphicsStatsOverlay.cpp b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGGraphicsStatsOverlay.cpp
index 5a48d606996fb7d11b8f5341cf01b45ff9f27990..8cc1f5fe8dd6d3065a7ef78c6f2717c3dcb42165 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGGraphicsStatsOverlay.cpp
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGGraphicsStatsOverlay.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaOpenSGNormalMapMaterial.cpp 34351 2013-03-26 11:50:28Z dr165799 $
+
 
 
 
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGGraphicsStatsOverlay.h b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGGraphicsStatsOverlay.h
index 82b111faed7c04a21b349ac6a1d001ce3d344d69..15bb3b925d492b01b6b5084d4fc2554a8dc0d465 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGGraphicsStatsOverlay.h
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGGraphicsStatsOverlay.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaOpenSGNormalMapMaterial.h 34351 2013-03-26 11:50:28Z dr165799 $
+
 
 #ifndef _VISTAOPENSGGRAPHICSSTATSOVERLAY_H
 #define _VISTAOPENSGGRAPHICSSTATSOVERLAY_H
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGHaloShader.cpp b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGHaloShader.cpp
index 7058798f84ef8de975bb3651a0f9727a5c5495db..5818873193e8ff0ac8190aedbdaeb51aead19026 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGHaloShader.cpp
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGHaloShader.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaOpenSGHaloShader.cpp 34351 2013-03-26 11:50:28Z dr165799 $
+
 
 #if defined(WIN32)
 #pragma warning(disable: 4127)
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGHaloShader.h b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGHaloShader.h
index 580144631af174585ce9ca8c4d1950db56ba0166..c66d0684ff224917e98dd3def728c9a4adf76a08 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGHaloShader.h
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGHaloShader.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaOpenSGHaloShader.h 34351 2013-03-26 11:50:28Z dr165799 $
+
 
 #ifndef _VISTAOPENSGHALOSHADER_H_
 #define _VISTAOPENSGHALOSHADER_H_
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGMaterialTools.cpp b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGMaterialTools.cpp
index 7e7b4b752dbcc8bc2e26f165aebf0b067196051b..29b52cdf710e01b805746396ea640794a6102eab 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGMaterialTools.cpp
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGMaterialTools.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(WIN32)
 #pragma warning(disable: 4127)
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGMaterialTools.h b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGMaterialTools.h
index 1e17af8bcf66edb2167c0afc6f133e146b46fb5d..803073dccda6b06c2b04b6c681379cf6c2d6d573 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGMaterialTools.h
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGMaterialTools.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOPENSGMATERIALTOOLS_H
 #define _VISTAOPENSGMATERIALTOOLS_H
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGModelOptimizer.cpp b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGModelOptimizer.cpp
index daf71c4c1cf946e12660ab09ee1dbbdb1e8cf53b..3558425abadbbe0829dc98c3ba47bab3e3765915 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGModelOptimizer.cpp
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGModelOptimizer.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaOpenSGModelOptimizer.cpp 54797 2016-02-09 08:04:04Z dr165799 $
+
 
 #if defined(WIN32)
 // OpenSG warnings
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGModelOptimizer.h b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGModelOptimizer.h
index 819f32f82bed31fc56dff768572795f6ac3b8bb7..9fbb2cf652b97811f725cfc3d173009374ded239 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGModelOptimizer.h
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGModelOptimizer.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOPENSGMODELOPTIMIZER_H_
 #define _VISTAOPENSGMODELOPTIMIZER_H_
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGMultiMaterial.cpp b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGMultiMaterial.cpp
index 41b9f807d18b2a0223a3d7cb32ae44ef541853fe..7e0afe77ce13d75e41d3fad72370cb7e05ea6b0a 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGMultiMaterial.cpp
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGMultiMaterial.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaOpenSGMultiTextureMaterial.cpp 29146 2012-02-08 15:13:47Z dr165799 $
+
 
 
 
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGMultiMaterial.h b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGMultiMaterial.h
index 2c66e1e0f2d77fc408bf3357419343eefd2c5996..2c2df3e57a5a4c9d182052598370e0e5dd30210e 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGMultiMaterial.h
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGMultiMaterial.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaOpenSGMultiTextureMaterial.h 29146 2012-02-08 15:13:47Z dr165799 $
+
 
 #ifndef _VISTAOPENSGMULTIMATERIAL_H
 #define _VISTAOPENSGMULTIMATERIAL_H
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGMultiMaterialShaderCreator.cpp b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGMultiMaterialShaderCreator.cpp
index 953837be6819cb497fe72b06981fee62502a7ce0..14dda0349de9b4d6fcd8c6926152f4bf831d2a2a 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGMultiMaterialShaderCreator.cpp
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGMultiMaterialShaderCreator.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaOpenSGMultiTextureMaterial.cpp 29146 2012-02-08 15:13:47Z dr165799 $
+
 
 
 
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGMultiMaterialShaderCreator.h b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGMultiMaterialShaderCreator.h
index 7ea032a847e68005f78a81878f1f04fe02677428..b9644acfe4b9c8cd7e6a8d07eae467ec0862c0a4 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGMultiMaterialShaderCreator.h
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGMultiMaterialShaderCreator.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaOpenSGMultiTextureMaterial.h 29146 2012-02-08 15:13:47Z dr165799 $
+
 
 #ifndef _VISTAOPENSGMULTIMATERIALSHADERCREATOR_H
 #define _VISTAOPENSGMULTIMATERIALSHADERCREATOR_H
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGNormalMapMaterial.cpp b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGNormalMapMaterial.cpp
index 76915e34bd815fa668182ff790acaae8a34d4e88..a56ef64dd7fce1adb60d4cbb2a4570f107f18c3c 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGNormalMapMaterial.cpp
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGNormalMapMaterial.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(WIN32)
 #pragma warning(disable: 4127)
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGNormalMapMaterial.h b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGNormalMapMaterial.h
index dadc5d2d9fc60703d72282e0403540d2cda0b7c6..28606b47367d236a34f323a9e2ce6480a249b7c9 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGNormalMapMaterial.h
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGNormalMapMaterial.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOPENSGNORMALMAPMATERIAL_H__
 #define _VISTAOPENSGNORMALMAPMATERIAL_H__
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGNormalMapMaterialShaders.cpp b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGNormalMapMaterialShaders.cpp
index b8f18e9e82af7821ca4c6f6db2e4aceb34915906..77b4d8448cdaeccf48f2fa3952b632f7ce749a30 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGNormalMapMaterialShaders.cpp
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGNormalMapMaterialShaders.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <string>
 #include "VistaOpenSGNormalMapMaterial.h"
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGParticleManager.cpp b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGParticleManager.cpp
index b78a21a7d71375d2bdc16aa4a83ae986aab41b2a..111d5615948d0beebd66331a06103a343a39a2bb 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGParticleManager.cpp
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGParticleManager.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaOpenSGParticleManager.cpp$
+
 
 //For further example code and how to use OpenSG Particle Manager please see the Vista ParticleDemo!
 
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGParticleManager.h b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGParticleManager.h
index ee59175f75688451c65ae5ed0b806a52c69da27b..85e3385b9c5113f122ae4b3c3d95c2cff2918ae5 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGParticleManager.h
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGParticleManager.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaOpenSGParticleManager.h$
+
 
 #ifndef _VISTAOPENSGPARTICLEMANAGER_H
 #define _VISTAOPENSGPARTICLEMANAGER_H
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGParticleManagerParticleChanger.cpp b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGParticleManagerParticleChanger.cpp
index 7ee4dbddb6d83709da16e5ff2dd05496cb498f4b..9c6da2b40f0ab267b8c80d1384defa3869b44414 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGParticleManagerParticleChanger.cpp
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGParticleManagerParticleChanger.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaOpenSGParticleManagerParticleChanger.cpp$
+
 
 //For further example code and how to use OpenSG Particle Manager please see the Vista ParticleDemo!
 
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGParticleManagerParticleChanger.h b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGParticleManagerParticleChanger.h
index 11a969121df844a0a26677fed810628e0a1d24f3..1a33b1a1d6098efb78372a34e5c25782e9668f04 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGParticleManagerParticleChanger.h
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGParticleManagerParticleChanger.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaOpenSGParticleManagerParticleChanger.h$
+
 
 #ifndef _VISTAOPENSGPARTICLEMANAGERPARTICLECHANGER_H__
 #define _VISTAOPENSGPARTICLEMANAGERPARTICLECHANGER_H__
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGParticles.cpp b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGParticles.cpp
index 43d6479d25fd7f5a81a4aa682d81b49472e6efdc..783d7768b9e4ace6798054e2a6f94d4f741b4100 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGParticles.cpp
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGParticles.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaOpenSGParticles.cpp$
+
 
 #if defined(WIN32)
 #pragma warning(disable: 4127)
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGParticles.h b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGParticles.h
index 8bf55eb44ca59e80c87bc6de248598c87124875c..e6626178594dba1f340396945320b720cd691611 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGParticles.h
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGParticles.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOPENSGPARTICLES_H__
 #define _VISTAOPENSGPARTICLES_H__
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGPerMaterialShader.cpp b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGPerMaterialShader.cpp
index 799c54be7b852a10c69b0f1e04def7f49060fe14..5bede1051e0a9f11c830447d5c876c49b1a3e66c 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGPerMaterialShader.cpp
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGPerMaterialShader.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(WIN32)
 #pragma warning(disable: 4127)
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGPerMaterialShader.h b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGPerMaterialShader.h
index 0e149327a9c2977b43fcee5850f3efe1f4113ca0..77fc55e1e3719234128c1427d78fe1e9835a2c39 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGPerMaterialShader.h
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGPerMaterialShader.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOPENSGPERPERMATERIALSHADER_H__
 #define _VISTAOPENSGPERPERMATERIALSHADER_H__
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGPhongShader.cpp b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGPhongShader.cpp
index 9afa51c48ef010aece978a840791cd02158ab26d..deca88cb25faea6866f565b22e85605670f2c0ce 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGPhongShader.cpp
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGPhongShader.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(WIN32)
 #pragma warning(disable: 4127)
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGPhongShader.h b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGPhongShader.h
index e88bad9ed06303a9a9176c961eec5aa21a55b7fa..6ed35f0b0f42a4fc462dcb4f33fb5171d579f0c6 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGPhongShader.h
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGPhongShader.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOPENSGPHONGSHADER_H_
 #define _VISTAOPENSGPHONGSHADER_H_
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGShadow.cpp b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGShadow.cpp
index e1797767747b4a5158089278ec4338347289bf35..8b054db8a6dbb55abf0d5a0bb6253f3c0af03117 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGShadow.cpp
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGShadow.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(WIN32)
 #pragma warning(disable: 4127)
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGShadow.h b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGShadow.h
index 4391108c4f0b3ede9d7d3a7d1830915e60365d1c..2a05d5da80424845a4494038a6f52f9c3aee1189 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGShadow.h
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGShadow.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOPENSGSHADOW_H
 #define _VISTAOPENSGSHADOW_H
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGSkybox.cpp b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGSkybox.cpp
index a0b719f0c72cd3c04505355b99a6d5cd102347a6..62ecf9012e4f8550db6d44e7a546ce8b295d9baa 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGSkybox.cpp
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGSkybox.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaOpenSGSkybox.h"
 
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGSkybox.h b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGSkybox.h
index 73accb691d300711cd5c344e1cfeddf6434ce185..0a9c21b4e9d46874e8c212fedc874e944472ad74 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGSkybox.h
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGSkybox.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOPENSGSKYBOX_H
 #define _VISTAOPENSGSKYBOX_H
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGTextureLoader.cpp b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGTextureLoader.cpp
index de3a074546bedfaad27c83af658cedb1679ca10e..3463c43e2455f0447696cfc686bd3a34226d7566 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGTextureLoader.cpp
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGTextureLoader.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaOpenSGMultiTextureMaterial.cpp 29146 2012-02-08 15:13:47Z dr165799 $
+
 
 
 
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGTextureLoader.h b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGTextureLoader.h
index a10f95f608067a544d4884da7b8762107e679ef3..ce2d60b2aa0db440a88c5a58f05e4b31c110afdd 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGTextureLoader.h
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGTextureLoader.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaOpenSGMultiTextureMaterial.h 29146 2012-02-08 15:13:47Z dr165799 $
+
 
 #ifndef _VISTAOPENSGTEXTURELOADER_H
 #define _VISTAOPENSGTEXTURELOADER_H
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGToonShader.cpp b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGToonShader.cpp
index d3d44db8de529e1719efa2df603e84c6d2a63c83..8f2230c2a67b6882480e351a572892cc7a068126 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGToonShader.cpp
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGToonShader.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(WIN32)
 #pragma warning(disable: 4127)
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGToonShader.h b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGToonShader.h
index b13c94d94a2376beed8881f1487e9d88ac7b7a1a..e0b87c218831f89b5c1248d5b307e614429fa58c 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGToonShader.h
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGToonShader.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOPENSGTOONSHADER_H_
 #define _VISTAOPENSGTOONSHADER_H_
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGWebInterface.cpp b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGWebInterface.cpp
index d50428fba4f36b5334de8e0df8ad0e73639f8d15..cdae659eac28c3f6f2a759c613ea6a833849eca4 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGWebInterface.cpp
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGWebInterface.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if defined(WIN32)
 #pragma warning(disable: 4127)
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGWebInterface.h b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGWebInterface.h
index 920c70b35d87eb106aac76f8fda16217f16c4af6..0319549d6783278ce6414363477a2f631695834d 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGWebInterface.h
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/VistaOpenSGWebInterface.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAOPENSGWEBINTERFACE_H_
 #define _VISTAOPENSGWEBINTERFACE_H_
diff --git a/VistaCoreLibs/VistaKernelOpenSGExt/_SourceFiles.cmake b/VistaCoreLibs/VistaKernelOpenSGExt/_SourceFiles.cmake
index 0394eee8938a4bdcaa9c49d417adaab1cdd40985..2703eb61ebf170bdf789da606d60ecda2b5ee2d5 100644
--- a/VistaCoreLibs/VistaKernelOpenSGExt/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaKernelOpenSGExt/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaCoreLibs/VistaMath/CMakeLists.txt b/VistaCoreLibs/VistaMath/CMakeLists.txt
index 71db7403e9a3cd36e3aa989cc42fbabe17bac002..e65fb5133055dcce763570e7d9a4a1ba7a9ed96b 100644
--- a/VistaCoreLibs/VistaMath/CMakeLists.txt
+++ b/VistaCoreLibs/VistaMath/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id$
+
 
 vista_adopt_version( VistaMath VistaCoreLibs )
 
diff --git a/VistaCoreLibs/VistaMath/VistaBoundingBox.cpp b/VistaCoreLibs/VistaMath/VistaBoundingBox.cpp
index 1c1d863ce416746af57fe574c5ffd2b62c88d744..14973721c1ba5d66e725081914f02d96ff0c5295 100644
--- a/VistaCoreLibs/VistaMath/VistaBoundingBox.cpp
+++ b/VistaCoreLibs/VistaMath/VistaBoundingBox.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 //============================================================================
diff --git a/VistaCoreLibs/VistaMath/VistaBoundingBox.h b/VistaCoreLibs/VistaMath/VistaBoundingBox.h
index b96c804c67ad090709621fa15b8cab7eb166721a..9828ea8a65deeb633ce3aec3e2822c1045b26f75 100644
--- a/VistaCoreLibs/VistaMath/VistaBoundingBox.h
+++ b/VistaCoreLibs/VistaMath/VistaBoundingBox.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef VISTABOUNDINGBOX_H
 #define VISTABOUNDINGBOX_H
diff --git a/VistaCoreLibs/VistaMath/VistaBoundingSphere.cpp b/VistaCoreLibs/VistaMath/VistaBoundingSphere.cpp
index 78dc1ca6d8da6141fd41226379667080913ee4a5..8d252b8118e314bf6fdfb8411e680af72703e05e 100644
--- a/VistaCoreLibs/VistaMath/VistaBoundingSphere.cpp
+++ b/VistaCoreLibs/VistaMath/VistaBoundingSphere.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 //============================================================================
 //  INCLUDES
diff --git a/VistaCoreLibs/VistaMath/VistaBoundingSphere.h b/VistaCoreLibs/VistaMath/VistaBoundingSphere.h
index 30aa316d5f9fb80a508a1efdb32f9a8c13429b08..aa29e1f51e5ee3fa613e338b1c0aed6f8cb27a00 100644
--- a/VistaCoreLibs/VistaMath/VistaBoundingSphere.h
+++ b/VistaCoreLibs/VistaMath/VistaBoundingSphere.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef VISTABOUNDINGSPHERE_H
 #define VISTABOUNDINGSPHERE_H
diff --git a/VistaCoreLibs/VistaMath/VistaFilter.h b/VistaCoreLibs/VistaMath/VistaFilter.h
index 7b1c6d10573c95f0a5c9d8ffcdf490f77067ca78..c81dff7c222a438ae25e437c7d29345159c669cc 100644
--- a/VistaCoreLibs/VistaMath/VistaFilter.h
+++ b/VistaCoreLibs/VistaMath/VistaFilter.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /**
  *
diff --git a/VistaCoreLibs/VistaMath/VistaGeometries.cpp b/VistaCoreLibs/VistaMath/VistaGeometries.cpp
index 562298481acec3a61e1fb6536ccc089d0d0a45a0..660500b0975f4c2c63c2b7de26be5d37f256f29f 100644
--- a/VistaCoreLibs/VistaMath/VistaGeometries.cpp
+++ b/VistaCoreLibs/VistaMath/VistaGeometries.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaVector.h"
 #include <VistaBase/VistaVectorMath.h>
diff --git a/VistaCoreLibs/VistaMath/VistaGeometries.h b/VistaCoreLibs/VistaMath/VistaGeometries.h
index 0681a6cd35143e9ed55477b2d6de17935ba06a6b..b90038be354248185a7453f3bd4860abcca9334e 100644
--- a/VistaCoreLibs/VistaMath/VistaGeometries.h
+++ b/VistaCoreLibs/VistaMath/VistaGeometries.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAGEOMETRIES_H
 #define _VISTAGEOMETRIES_H
diff --git a/VistaCoreLibs/VistaMath/VistaIndirectXform.cpp b/VistaCoreLibs/VistaMath/VistaIndirectXform.cpp
index 6693ecf7e4ba263d9e729d395b056e3150d53a51..9ef0ce0a015eaa8b2fe92ff5c9605f1072197947 100644
--- a/VistaCoreLibs/VistaMath/VistaIndirectXform.cpp
+++ b/VistaCoreLibs/VistaMath/VistaIndirectXform.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaIndirectXform.h"
 
diff --git a/VistaCoreLibs/VistaMath/VistaIndirectXform.h b/VistaCoreLibs/VistaMath/VistaIndirectXform.h
index dc2bfab28f9b25665ab94b4b837f6cee7a2319bb..d4bf926ad5dc9ff2633c56c20a3f8f040a1d81f6 100644
--- a/VistaCoreLibs/VistaMath/VistaIndirectXform.h
+++ b/VistaCoreLibs/VistaMath/VistaIndirectXform.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAINDIRECTXFORM_H
 #define _VISTAINDIRECTXFORM_H
diff --git a/VistaCoreLibs/VistaMath/VistaLeastSquaresPlane.cpp b/VistaCoreLibs/VistaMath/VistaLeastSquaresPlane.cpp
index 6dbc27f3b96729ec01e8458b07ee1c9aacacd961..36142a1671c59f7e0c426e156ee48f53688a52e5 100644
--- a/VistaCoreLibs/VistaMath/VistaLeastSquaresPlane.cpp
+++ b/VistaCoreLibs/VistaMath/VistaLeastSquaresPlane.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaLeastSquaresPlane.h"
 
diff --git a/VistaCoreLibs/VistaMath/VistaLeastSquaresPlane.h b/VistaCoreLibs/VistaMath/VistaLeastSquaresPlane.h
index dc6026663bab40431e99745a1064f04aafd49fec..46397f2460b2ff5df926ef2b782d45f84367f0cd 100644
--- a/VistaCoreLibs/VistaMath/VistaLeastSquaresPlane.h
+++ b/VistaCoreLibs/VistaMath/VistaLeastSquaresPlane.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTALEASTSUQARESPLANE_H
 #define _VISTALEASTSUQARESPLANE_H
diff --git a/VistaCoreLibs/VistaMath/VistaMathConfig.h b/VistaCoreLibs/VistaMath/VistaMathConfig.h
index 0d67202acee060c29f33c3c592106c4e262980e4..66e16393d6706df08faf7d63c81cb604a3fd4c88 100644
--- a/VistaCoreLibs/VistaMath/VistaMathConfig.h
+++ b/VistaCoreLibs/VistaMath/VistaMathConfig.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAMATHCONFIG_H
 #define _VISTAMATHCONFIG_H
diff --git a/VistaCoreLibs/VistaMath/VistaMathTools.h b/VistaCoreLibs/VistaMath/VistaMathTools.h
index 350b25a453634dcb0df165be68d81e897f048728..2965f9d21b6f83ba3b8fdbd67ce2d4d198417aa9 100644
--- a/VistaCoreLibs/VistaMath/VistaMathTools.h
+++ b/VistaCoreLibs/VistaMath/VistaMathTools.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAMATHTOOLS_H__
 #define _VISTAMATHTOOLS_H__
diff --git a/VistaCoreLibs/VistaMath/VistaMatrix.h b/VistaCoreLibs/VistaMath/VistaMatrix.h
index fc6093159902a2cb54b6eb6c7b7edff546882c58..323005124b2927556f97b4112cd211809cf70bbf 100644
--- a/VistaCoreLibs/VistaMath/VistaMatrix.h
+++ b/VistaCoreLibs/VistaMath/VistaMatrix.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAMATRIX_H
 #define _VISTAMATRIX_H
diff --git a/VistaCoreLibs/VistaMath/VistaPolynomial.cpp b/VistaCoreLibs/VistaMath/VistaPolynomial.cpp
index 7a5344e593ba7a3c25ac675c3b0fdd0cd73e7922..eb336c15f3960bba3fae442570666d2342664e7c 100644
--- a/VistaCoreLibs/VistaMath/VistaPolynomial.cpp
+++ b/VistaCoreLibs/VistaMath/VistaPolynomial.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaPolynomial.h"
 
diff --git a/VistaCoreLibs/VistaMath/VistaPolynomial.h b/VistaCoreLibs/VistaMath/VistaPolynomial.h
index 922ddc27e9868a1c196e3e1e2018f21af3e8b345..0ab301044f5c93a8c4491e3e66fed4b34c646f7d 100644
--- a/VistaCoreLibs/VistaMath/VistaPolynomial.h
+++ b/VistaCoreLibs/VistaMath/VistaPolynomial.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /* dont forget that these deal with floats! */
 
diff --git a/VistaCoreLibs/VistaMath/VistaSquareMatrix.h b/VistaCoreLibs/VistaMath/VistaSquareMatrix.h
index 1fcc1e1d2959d7f7a3f20011d4847958950bd8ee..44ab4d0c0f59175a060f60194eeafef89e39da7e 100644
--- a/VistaCoreLibs/VistaMath/VistaSquareMatrix.h
+++ b/VistaCoreLibs/VistaMath/VistaSquareMatrix.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASQUAREMATRIX_H
 #define _VISTASQUAREMATRIX_H
diff --git a/VistaCoreLibs/VistaMath/VistaVector.h b/VistaCoreLibs/VistaMath/VistaVector.h
index a7451bf7e1c4059eb62d721a2dfe7433c6fa0ecb..085184a30df35a51cf53614b12b15de1fb3eac65 100644
--- a/VistaCoreLibs/VistaMath/VistaVector.h
+++ b/VistaCoreLibs/VistaMath/VistaVector.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAVECTOR_H
 #define _VISTAVECTOR_H
diff --git a/VistaCoreLibs/VistaMath/_SourceFiles.cmake b/VistaCoreLibs/VistaMath/_SourceFiles.cmake
index 4713c22035d3fdbeac132c52cf1a2f467d4b49f7..075642efa04c4ef6b53b617832c99a9a967b23fe 100644
--- a/VistaCoreLibs/VistaMath/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaMath/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaCoreLibs/VistaOGLExt/CMakeLists.txt b/VistaCoreLibs/VistaOGLExt/CMakeLists.txt
index c54fd989f8b423f2772bf1e442fa202a842b3c27..de74cd34ba4334a38eafdfff356036f16571f791 100644
--- a/VistaCoreLibs/VistaOGLExt/CMakeLists.txt
+++ b/VistaCoreLibs/VistaOGLExt/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id$ 
+
 
 vista_adopt_version( VistaOGLExt VistaCoreLibs )
 
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer.cpp b/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer.cpp
index 305a54a6ca5f1d9c22c8c5761bb3769d2986ae9a..f65a956441866cb036c9a19986d77dd9af1bae5b 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer.cpp
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VflOITNode.cpp 29501 2012-03-09 08:29:45Z jh864363 $
+
 
 /*============================================================================*/
 /* INCLUDES																	  */
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer.h b/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer.h
index 5aecd66a06c6bb3aad221be27886b5b96177f23a..aba666bc932a93eaea31a31c99a921846b3c9603 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer.h
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VflOITNode.h 29501 2012-03-09 08:29:45Z jh864363 $
+
 
 #ifndef VISTA_A_BUFFER_H
 #define VISTA_A_BUFFER_H
@@ -48,7 +48,7 @@ public:
 	/* CONSTRUCTORS / DESTRUCTOR                                              */
 	/**************************************************************************/
 	IVistaABuffer();
-	~IVistaABuffer();
+	virtual ~IVistaABuffer();
 
 	/**************************************************************************/
 	/* PUBLIC INTERFACE                                                       */
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABufferCSG.cpp b/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABufferCSG.cpp
index a06a0151321bd00af228deb23e97138b648e27c4..c45e4a291d08f9bbe1f06b792a8608ea3839ac9d 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABufferCSG.cpp
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABufferCSG.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VflOITNode.cpp 29501 2012-03-09 08:29:45Z jh864363 $
+
 
 /*============================================================================*/
 /* INCLUDES																	  */
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABufferCSG.h b/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABufferCSG.h
index 7e512a29c22f46e44bff3affd24a6949d2411e7e..3b2fb0ac4ae526ccd1c9705324944cb535b2f461 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABufferCSG.h
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABufferCSG.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VflOITNode.h 29501 2012-03-09 08:29:45Z jh864363 $
+
 #ifndef VISTA_ABUFFER_CSG_H
 #define VISTA_ABUFFER_CSG_H
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABufferOIT.cpp b/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABufferOIT.cpp
index 5102dace5bbbc62282c15aef7465e369bce44782..c972924e82ee04919278facfb1a67f4ffaf012f2 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABufferOIT.cpp
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABufferOIT.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VflOITNode.cpp 29501 2012-03-09 08:29:45Z jh864363 $
+
 
 /*============================================================================*/
 /* INCLUDES																	  */
@@ -174,14 +174,15 @@ bool VistaABufferOIT::AddToSceneGraph( VistaSceneGraph* pSG )
 }
 
 
-void VistaABufferOIT::GetOpenGLNodes( VistaOpenGLNode* pNodeClear, VistaOpenGLNode* pNodeDisplay )
+VistaOpenGLNode* VistaABufferOIT::GetClearNode() const
 {
-	if(!m_pNodeClear || !m_pNodeDisplay)
-		return; // The nodes are not set yet
-	pNodeClear = m_pNodeClear;
-	pNodeDisplay = m_pNodeDisplay;
+	return m_pNodeClear;
 }
 
+VistaOpenGLNode* VistaABufferOIT::GetDisplayNode() const
+{
+	return m_pNodeDisplay;
+}
 
 void VistaABufferOIT::SetOpenGLNodes( VistaOpenGLNode* pNodeClear, VistaOpenGLNode* pNodeDisplay )
 {
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABufferOIT.h b/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABufferOIT.h
index d6318974e40ebbff5a809309dfb970d429df9e0f..2f04c541e6b41f700673a6d6586da9995c0a447d 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABufferOIT.h
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABufferOIT.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VflOITNode.h 29501 2012-03-09 08:29:45Z jh864363 $
+
 #ifndef VISTA_ABUFFER_OIT_H
 #define VISTA_ABUFFER_OIT_H
 /*============================================================================*/
@@ -101,8 +101,9 @@ public:
 	 * This method returns the OpenGLNodes.
 	 * They are used to call ClearABuffer()/DisplayABuffer().
 	 */
-	void GetOpenGLNodes(VistaOpenGLNode* pNodeClear, VistaOpenGLNode* pNodeDisplay);
-
+	VistaOpenGLNode* GetClearNode() const;
+	VistaOpenGLNode* GetDisplayNode() const;
+	
 	/**
 	 * This method sets the OpenGLNodes, they are not added to a SceneGraph, though.
 	 * These OpenGLNodes will then be used to call ClearABuffer()/DisplayABuffer()
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer_Array.cpp b/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer_Array.cpp
index 21ef3f1e10059bd9f6b58b75962d55fcb89f6ab3..d4e197cf6f8056c3a1a35b0786d560282aea4f7d 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer_Array.cpp
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer_Array.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VflOITNode.cpp 29501 2012-03-09 08:29:45Z jh864363 $
+
 
 /*============================================================================*/
 /* INCLUDES																	  */
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer_Array.h b/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer_Array.h
index 9bf9755b280d5d3850a3c466084c0118f3422693..e16a055a6effa49174abb03f9c3247e769627e7e 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer_Array.h
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer_Array.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VflOITNode.h 29501 2012-03-09 08:29:45Z jh864363 $
+
 
 #ifndef VISTA_A_BUFFER_ARRAY_H
 #define VISTA_A_BUFFER_ARRAY_H
@@ -46,7 +46,7 @@ public:
 	/* CONSTRUCTORS / DESTRUCTOR                                              */
 	/**************************************************************************/
 	VistaABufferArray();
-	~VistaABufferArray();
+	virtual ~VistaABufferArray();
 
 	/**************************************************************************/
 	/* PUBLIC INTERFACE                                                       */
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer_LinkedList.cpp b/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer_LinkedList.cpp
index 19e51c1ae589a5d776741501147d9146ae639093..82a2a5d1ea57a658acb0bba5c864fa6059db2f74 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer_LinkedList.cpp
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer_LinkedList.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VflOITNode.cpp 29501 2012-03-09 08:29:45Z jh864363 $
+
 
 /*============================================================================*/
 /* INCLUDES																	  */
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer_LinkedList.h b/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer_LinkedList.h
index 95b3098601aff6034f6a2826687953438c43cf00..e2c4777cd2a882ccc912a5498583c0cd0f878691 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer_LinkedList.h
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer_LinkedList.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VflOITNode.h 29501 2012-03-09 08:29:45Z jh864363 $
+
 
 #ifndef VISTA_A_BUFFER_LINKED_LIST_H
 #define VISTA_A_BUFFER_LINKED_LIST_H
@@ -49,7 +49,7 @@ public:
 	/* CONSTRUCTORS / DESTRUCTOR                                              */
 	/**************************************************************************/
 	VistaABufferLinkedList();
-	~VistaABufferLinkedList();
+	virtual ~VistaABufferLinkedList();
 
 	/**************************************************************************/
 	/* PUBLIC INTERFACE                                                       */
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer_Pages.cpp b/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer_Pages.cpp
index 11157fc6442d870b92ca605f994a06ba7739a7ff..50259c4a40194907660b68478fc877ddc732d503 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer_Pages.cpp
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer_Pages.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VflOITNode.cpp 29501 2012-03-09 08:29:45Z jh864363 $
+
 
 /*============================================================================*/
 /* INCLUDES																	  */
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer_Pages.h b/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer_Pages.h
index cf0e906521dba4ac8303c49c0ceeb4162b716352..0f0532fd7b10e58533ad72d3971d0b822e0b71b8 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer_Pages.h
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/VistaABuffer_Pages.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VflOITNode.h 29501 2012-03-09 08:29:45Z jh864363 $
+
 
 #ifndef VISTA_A_BUFFER_PAGES_H
 #define VISTA_A_BUFFER_PAGES_H
@@ -45,7 +45,7 @@ public:
 	/* CONSTRUCTORS / DESTRUCTOR                                              */
 	/**************************************************************************/
 	VistaABufferPages( unsigned int nPageSize );
-	~VistaABufferPages();
+	virtual ~VistaABufferPages();
 
 	/**************************************************************************/
 	/* PUBLIC INTERFACE                                                       */
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/_SourceFiles.cmake b/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/_SourceFiles.cmake
index 6083c6ae8dfd6d022c0e9682963efbccea3ffb27..b0eecaaa1662447964de7982350a675e8f87d911 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id: _SourceFiles.cmake 33944 2013-02-18 16:15:38Z jh864363 $
+
 
 set( RelativeDir "./Rendering/ABuffer" )
 set( RelativeSourceGroup "Source Files\\Rendering\\ABuffer" )
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/shaders/_SourceFiles.cmake b/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/shaders/_SourceFiles.cmake
index cfdd831d160ab46d9d1af60f97977604870e0376..d9e4f8da90fbe0f8e89ca0d1005b48b6d8a09adf 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/shaders/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/ABuffer/shaders/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id: _SourceFiles.cmake 33944 2013-02-18 16:15:38Z jh864363 $
+
 
 set( RelativeDir "./Rendering/ABuffer/shaders" )
 set( RelativeSourceGroup "Shader Files\\Rendering\\ABuffer" )
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/VistaGeometryData.cpp b/VistaCoreLibs/VistaOGLExt/Rendering/VistaGeometryData.cpp
index 9dad348363fb8bfacc1f67fff10e29d52883a3a5..0f1dc26d74cda43c2ff7983303d9368f7cf59ba0 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/VistaGeometryData.cpp
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/VistaGeometryData.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: $
+
 
 #include <GL/glew.h>
 
@@ -54,9 +54,8 @@ VistaGeometryData::~VistaGeometryData()
 }
 
 /******************************************************************************/
-/* Getter                                                                     */
+/* Getters                                                                    */
 /******************************************************************************/
-#pragma region Getter
 
 unsigned int VistaGeometryData::GetPolygonOffset() const
 {
@@ -106,11 +105,9 @@ VistaBufferObject* VistaGeometryData::GetVertexBufferObjekt( unsigned int uiInde
 
 	return NULL;
 }
-#pragma endregion
 /******************************************************************************/
-/* Setter                                                                     */
+/* Setters                                                                    */
 /******************************************************************************/
-#pragma region Setter
 
 void VistaGeometryData::SetPolygonOffset( unsigned int uiPolygonOffset )
 {
@@ -145,11 +142,9 @@ void VistaGeometryData::SetLineCount( unsigned int uiLineCount )
 	m_uiLineCount = uiLineCount;
 }
 
-#pragma endregion
 /******************************************************************************/
 /* Attribute Specification                                                    */
 /******************************************************************************/
-#pragma region Attribute Specification
 void VistaGeometryData::SpecifyFloatAttribute(
 	unsigned int uiIndex, 
 	unsigned int uiNumComponents, 
@@ -207,7 +202,7 @@ bool VistaGeometryData::UpdateAttributeData(
 
 	return true;
 }
-#pragma endregion
+
 /******************************************************************************/
 /* END OF FILE                                                                */
 /******************************************************************************/
\ No newline at end of file
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/VistaGeometryData.h b/VistaCoreLibs/VistaOGLExt/Rendering/VistaGeometryData.h
index 5e7ca7725edeac2e75ef006724a04fc394d0204b..6c44c293d80026d9f6cd712e79167ff6ca4ca14a 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/VistaGeometryData.h
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/VistaGeometryData.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: $
+
 #ifndef __VistaGeometryData_h
 #define __VistaGeometryData_h
 
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/VistaGeometryRenderingCore.cpp b/VistaCoreLibs/VistaOGLExt/Rendering/VistaGeometryRenderingCore.cpp
index 7d360ec3cfbd693f72447525a2feea5911fd3c55..73829f790bf3d8a997ae52a66c8264ea961f2f21 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/VistaGeometryRenderingCore.cpp
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/VistaGeometryRenderingCore.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: $
+
 
 #include <GL/glew.h>
 
@@ -277,6 +277,7 @@ VistaGeometryRenderingCore::UniformVariable::UniformVariable(
 	)
 	:	m_strName( strName )
 	,	m_uiType(uiNumComponents)
+	,	m_iValue( 0 )
 {
 	m_fValues[0] = f1;
 	m_fValues[1] = f2;
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/VistaGeometryRenderingCore.h b/VistaCoreLibs/VistaOGLExt/Rendering/VistaGeometryRenderingCore.h
index a66bcb863993c7b7146457df0bcb87bc016cd8f2..0c46909b17150fdedbda5a394da45fc605350cd3 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/VistaGeometryRenderingCore.h
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/VistaGeometryRenderingCore.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: $
+
 
 #ifndef __VistaGeometryRenderingCore_h
 #define __VistaGeometryRenderingCore_h
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/VistaParticleRenderingCore.cpp b/VistaCoreLibs/VistaOGLExt/Rendering/VistaParticleRenderingCore.cpp
index eae9fb97e7784dc2932ef14a09e392b246ca3fb7..09e09870ea1efa5ea9cff30866b6b54e17e38d2c 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/VistaParticleRenderingCore.cpp
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/VistaParticleRenderingCore.cpp
@@ -13,12 +13,12 @@
 /*                                               Technische Hochschule Aachen */
 /*      Purpose  :  ...                                                       */
 /*                                                                            */
-/*                                                 Copyright (c)  1998-2014   */
+/*                                                 Copyright (c)  1998-2016   */
 /*                                                 by  RWTH-Aachen, Germany   */
 /*                                                 All rights reserved.       */
 /*                                             .                              */
 /*============================================================================*/
-// $Id: VflGpuParticleRenderer.cpp 37742 2013-09-05 16:15:42Z sp841227 $
+
 
 /*============================================================================*/
 /* INCLUDES			                                                          */
@@ -225,7 +225,6 @@ void VistaParticleRenderingCore::Draw()
 	VistaOGLUtils::CheckForOGLError( __FILE__, __LINE__ );
 }
 /******************************************************************************/
-#pragma region Getter
 
 VistaParticleRenderingProperties* VistaParticleRenderingCore::GetProperties()
 {
@@ -286,9 +285,9 @@ const VistaVector3D& VistaParticleRenderingCore::GetLightDirection() const
 {
 	return m_v3LightDir;
 }
-#pragma endregion
+
 /******************************************************************************/
-#pragma region Setter
+
 void VistaParticleRenderingCore::SetPointSize( float fSize )
 {
 	m_fPointSize = fSize;
@@ -342,9 +341,9 @@ void VistaParticleRenderingCore::SetLightDirection( const VistaVector3D& v3Light
 {
 	m_v3LightDir = v3LightDir;
 }
-#pragma endregion
+
 /******************************************************************************/
-#pragma region Observer API
+
 bool VistaParticleRenderingCore::Observes( IVistaObserveable* pObserveable )
 {
 	return pObserveable == m_pProperties;
@@ -368,16 +367,16 @@ void VistaParticleRenderingCore::ObserverUpdate(
 	IVistaObserveable* pObserveable, int nMsg, int nTicket )
 {
 	if( pObserveable == m_pProperties && 
-		nMsg == VistaParticleRenderingProperties::MSG_TEXTURE_RESOLUTION_CHANGED ||
-		nMsg == VistaParticleRenderingProperties::MSG_GENERATE_MIPMAPS_CHANGED )
+		(nMsg == VistaParticleRenderingProperties::MSG_TEXTURE_RESOLUTION_CHANGED ||
+		 nMsg == VistaParticleRenderingProperties::MSG_GENERATE_MIPMAPS_CHANGED) )
 	{
 		UpdateTextures();
 	}
 }
-#pragma endregion
+
+
 /******************************************************************************/
-#pragma region  protected intervace
-#pragma endregion
+
 
 bool VistaParticleRenderingCore::InitShaders()
 {
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/VistaParticleRenderingCore.h b/VistaCoreLibs/VistaOGLExt/Rendering/VistaParticleRenderingCore.h
index 4f01fe61a2b21e5aa0390115316c123ba8059a9d..65c362ac354d18c93c7a98b0d3dee6fd76562be7 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/VistaParticleRenderingCore.h
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/VistaParticleRenderingCore.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaVolumeRenderingCore.h 33700 2013-02-04 16:45:33Z sp841227 $
+
 
 #ifndef __VISTAPARTICLERENDERERINGCORE_H
 #define __VISTAPARTICLERENDERERINGCORE_H
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/VistaParticleRenderingProperties.cpp b/VistaCoreLibs/VistaOGLExt/Rendering/VistaParticleRenderingProperties.cpp
index 369a926d0c096fc18674eff86fc77952fb5e79ac..b70a079e7ef935f0831d4fe4013a4571ca3e0762 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/VistaParticleRenderingProperties.cpp
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/VistaParticleRenderingProperties.cpp
@@ -13,12 +13,12 @@
 /*                                               Technische Hochschule Aachen */
 /*      Purpose  :  ...                                                       */
 /*                                                                            */
-/*                                                 Copyright (c)  1998-2014   */
+/*                                                 Copyright (c)  1998-2016   */
 /*                                                 by  RWTH-Aachen, Germany   */
 /*                                                 All rights reserved.       */
 /*                                             .                              */
 /*============================================================================*/
-// $Id: VflGpuParticleRenderer.cpp 37742 2013-09-05 16:15:42Z sp841227 $
+
 
 /*============================================================================*/
 /* INCLUDES			                                                          */
@@ -45,7 +45,7 @@ VistaParticleRenderingProperties::~VistaParticleRenderingProperties()
 { }
 
 /******************************************************************************/
-#pragma region Getter
+
 
 int VistaParticleRenderingProperties::GetDrawMode() const
 {
@@ -82,9 +82,9 @@ bool VistaParticleRenderingProperties::GetGenerateMipmaps() const
 	return m_bGenMipmaps;
 }
 
-#pragma endregion
+
 /******************************************************************************/
-#pragma region Setter
+
 
 bool VistaParticleRenderingProperties::SetDrawMode( int iMode )
 {
@@ -168,7 +168,7 @@ bool VistaParticleRenderingProperties::SetGenerateMipmaps( bool bGenMipmaps )
 	return true;
 }
 
-#pragma endregion
+
 /*============================================================================*/
 /* END OF FILE                                                                */
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/VistaParticleRenderingProperties.h b/VistaCoreLibs/VistaOGLExt/Rendering/VistaParticleRenderingProperties.h
index ae8303bd74fab61c9f62e9aac35228337cb03132..cff4b2beb7df3aab2a6d94226699acc623929e52 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/VistaParticleRenderingProperties.h
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/VistaParticleRenderingProperties.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaVolumeRenderingCore.h 33700 2013-02-04 16:45:33Z sp841227 $
+
 
 #ifndef __VISTAPARTICLERENDERINGPROPERTIES_H
 #define __VISTAPARTICLERENDERINGPROPERTIES_H
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/VistaParticleTraceRenderingCore.cpp b/VistaCoreLibs/VistaOGLExt/Rendering/VistaParticleTraceRenderingCore.cpp
index 077b1a15b0f597da98d9b1302263f970fe4645d3..08f7202c02e26c7f44f7e14bdf220e591f43eeae 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/VistaParticleTraceRenderingCore.cpp
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/VistaParticleTraceRenderingCore.cpp
@@ -13,12 +13,12 @@
 /*                                               Technische Hochschule Aachen */
 /*      Purpose  :  ...                                                       */
 /*                                                                            */
-/*                                                 Copyright (c)  1998-2014   */
+/*                                                 Copyright (c)  1998-2016   */
 /*                                                 by  RWTH-Aachen, Germany   */
 /*                                                 All rights reserved.       */
 /*                                             .                              */
 /*============================================================================*/
-// $Id: VflGpuParticleRenderer.cpp 37742 2013-09-05 16:15:42Z sp841227 $
+
 
 /*============================================================================*/
 /* INCLUDES			                                                          */
@@ -224,7 +224,7 @@ void VistaParticleTraceRenderingCore::Draw()
 	VistaOGLUtils::CheckForOGLError( __FILE__, __LINE__ );
 }
 /******************************************************************************/
-#pragma region Getter
+
 
 float VistaParticleTraceRenderingCore::GetLineWidth() const
 {
@@ -262,9 +262,9 @@ const VistaVector3D& VistaParticleTraceRenderingCore::GetLightDirection() const
 {
 	return m_v3LightDir;
 }
-#pragma endregion
+
 /******************************************************************************/
-#pragma region Setter
+
 
 void VistaParticleTraceRenderingCore::SetLineWidth( float fWidth )
 {
@@ -339,9 +339,9 @@ void VistaParticleTraceRenderingCore::SetCapCount( unsigned int n )
 {
 	m_nCapCount = n;
 }
-#pragma endregion
+
 /******************************************************************************/
-#pragma region Observer API
+
 bool VistaParticleTraceRenderingCore::Observes( IVistaObserveable* pObserveable )
 {
 	return pObserveable == m_pProperties;
@@ -365,15 +365,15 @@ void VistaParticleTraceRenderingCore::ObserverUpdate(
 	IVistaObserveable* pObserveable, int nMsg, int nTicket )
 {
 	if( pObserveable == m_pProperties && 
-		nMsg == VistaParticleRenderingProperties::MSG_GENERATE_MIPMAPS_CHANGED ||
-		nMsg == VistaParticleRenderingProperties::MSG_TEXTURE_RESOLUTION_CHANGED )
+		(nMsg == VistaParticleRenderingProperties::MSG_GENERATE_MIPMAPS_CHANGED ||
+		 nMsg == VistaParticleRenderingProperties::MSG_TEXTURE_RESOLUTION_CHANGED) )
 	{
 		UpdateTextures();
 	}
 }
-#pragma endregion
+
 /******************************************************************************/
-#pragma region protected intervace
+
 
 bool VistaParticleTraceRenderingCore::InitShaders()
 {
@@ -854,7 +854,7 @@ void VistaParticleTraceRenderingCore::RenderHalos()
 	m_pIlluminationTexture->Unbind( GL_TEXTURE1 );
 }
 
-#pragma endregion
+
 /*============================================================================*/
 /* END OF FILE                                                                */
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/VistaParticleTraceRenderingCore.h b/VistaCoreLibs/VistaOGLExt/Rendering/VistaParticleTraceRenderingCore.h
index f25fa77eabb58bf6de2af29ffaff64a186d08621..b7df1456a0e04bdb2a6a4328d61a7f1f787b133a 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/VistaParticleTraceRenderingCore.h
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/VistaParticleTraceRenderingCore.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaVolumeRenderingCore.h 33700 2013-02-04 16:45:33Z sp841227 $
+
 
 #ifndef __VISTAPARTICLETRACERENDERINGCORE_H
 #define __VISTAPARTICLETRACERENDERINGCORE_H
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/VistaReferencePlane.cpp b/VistaCoreLibs/VistaOGLExt/Rendering/VistaReferencePlane.cpp
index 1b39db493dde54bb9729a3c1543e694f975a741f..098eae7f52ec3144a2ad62874cebc16fa2d17c0d 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/VistaReferencePlane.cpp
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/VistaReferencePlane.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VfaReferencePlane.cpp 33272 2012-12-18 13:21:42Z sp841227 $
+
 
 /*============================================================================*/
 /* INCLUDES                                                                   */
@@ -298,6 +298,7 @@ VistaReferencePlane::VfaReferencePlaneProperties::VfaReferencePlaneProperties()
 	,	m_fTileWidth( 1.0f )
 	,	m_fTileLength( 0.1f )
 	,	m_bVisible( true )
+	,	m_fLineWidth( 0.01f )
 { }
 
 VistaReferencePlane::VfaReferencePlaneProperties::~VfaReferencePlaneProperties()
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/VistaReferencePlane.h b/VistaCoreLibs/VistaOGLExt/Rendering/VistaReferencePlane.h
index 754b8c6d34f5466e399a274412e40c09fd10dcf9..325383c7d6ea73af2449e74d665ebc56d89d4945 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/VistaReferencePlane.h
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/VistaReferencePlane.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VfaReferencePlane.h 32694 2012-11-08 09:15:20Z cn276793 $
+
 
 #ifndef _VFAREFERENCEPLANE_H
 #define _VFAREFERENCEPLANE_H
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/VistaVolumeRaycasterCore.cpp b/VistaCoreLibs/VistaOGLExt/Rendering/VistaVolumeRaycasterCore.cpp
index 4979dafc3fcb98c377c0fb1e45cdd8431281e52d..4f497b8bef418e33e871b6691119d4a86f2f0d6d 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/VistaVolumeRaycasterCore.cpp
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/VistaVolumeRaycasterCore.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaVolumeRaycasterCore.cpp 47481 2015-02-03 21:22:33Z sp841227 $
+
 
 
 #include "VistaVolumeRaycasterCore.h"
@@ -267,7 +267,7 @@ void VistaVolumeRaycasterCore::GetGradientVolume( int& iVolumeId, int& iChannelI
 bool VistaVolumeRaycasterCore::SetGradientVolume( const int iVolumeId,
 		const int iChannelIdx )
 {
-	if(    iVolumeId < 0 || iVolumeId >= m_vecVolumeTextures.size()
+	if(    iVolumeId < 0 || iVolumeId >= static_cast<int>(m_vecVolumeTextures.size())
 		|| iChannelIdx < 0 || iChannelIdx > 3 )
 	{
 		return false;
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/VistaVolumeRaycasterCore.h b/VistaCoreLibs/VistaOGLExt/Rendering/VistaVolumeRaycasterCore.h
index 3f4fd4e7ae31757f2eebea37ec65d2733a9df3e6..cc44ba155c59dda494164a1565f2b2662eea0549 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/VistaVolumeRaycasterCore.h
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/VistaVolumeRaycasterCore.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaVolumeRaycasterCore.h 41859 2014-05-08 15:07:56Z sp841227 $
+
 // 
 #ifndef __VistaVolumeRaycasterCore_h
 #define __VistaVolumeRaycasterCore_h
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/VistaVolumeRenderingCore.cpp b/VistaCoreLibs/VistaOGLExt/Rendering/VistaVolumeRenderingCore.cpp
index c27f41bcb229f5b7cc415d05119d3e8c288bf9a7..680d6198c1796dcfdfc87f55918cae4cb3219470 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/VistaVolumeRenderingCore.cpp
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/VistaVolumeRenderingCore.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaVolumeRenderingCore.cpp 41859 2014-05-08 15:07:56Z sp841227 $
+
 
 #include "VistaVolumeRenderingCore.h"
 
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/VistaVolumeRenderingCore.h b/VistaCoreLibs/VistaOGLExt/Rendering/VistaVolumeRenderingCore.h
index fb4b8a4983a02b64e4529a160178735c94095db0..12c314ddc4c0112ee326de801963736e50c34a06 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/VistaVolumeRenderingCore.h
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/VistaVolumeRenderingCore.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaVolumeRenderingCore.h 41859 2014-05-08 15:07:56Z sp841227 $
+
 
 
 #ifndef __VistaVolumeRenderingCore_h
diff --git a/VistaCoreLibs/VistaOGLExt/Rendering/_SourceFiles.cmake b/VistaCoreLibs/VistaOGLExt/Rendering/_SourceFiles.cmake
index b1c1da4af357bd63198870e7f8a240ca40a6b226..e509e04286585cf8ec77ff1e40099ecc07a8c518 100644
--- a/VistaCoreLibs/VistaOGLExt/Rendering/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaOGLExt/Rendering/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id: _SourceFiles.cmake 39287 2013-11-13 15:18:44Z jh864363 $
+
 
 set( RelativeDir "./Rendering" )
 set( RelativeSourceGroup "Source Files\\Rendering" )
diff --git a/VistaCoreLibs/VistaOGLExt/VistaBufferObject.cpp b/VistaCoreLibs/VistaOGLExt/VistaBufferObject.cpp
index 31d7174df45e4faa9bf344dd8b8670d5a6d9be2f..8811a04cf8ebe8d4c71f1584793704b9ef634e88 100644
--- a/VistaCoreLibs/VistaOGLExt/VistaBufferObject.cpp
+++ b/VistaCoreLibs/VistaOGLExt/VistaBufferObject.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaBufferObject.cpp 41859 2014-05-08 15:07:56Z sp841227 $
+
 
 /*============================================================================*/
 /* INCLUDES                                                                   */
diff --git a/VistaCoreLibs/VistaOGLExt/VistaBufferObject.h b/VistaCoreLibs/VistaOGLExt/VistaBufferObject.h
index 7535590ae2b93a03608ab791fa7455a6cc66fe76..667de76033938fe2fe4b4b7db9f62a8222ff67e7 100644
--- a/VistaCoreLibs/VistaOGLExt/VistaBufferObject.h
+++ b/VistaCoreLibs/VistaOGLExt/VistaBufferObject.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaBufferObject.h 41859 2014-05-08 15:07:56Z sp841227 $
+
 
 #ifndef _VistaBufferObject_h
 #define _VistaBufferObject_h
diff --git a/VistaCoreLibs/VistaOGLExt/VistaFramebufferObj.cpp b/VistaCoreLibs/VistaOGLExt/VistaFramebufferObj.cpp
index 713c68d024733ff0e073286841e1a52c868e2490..bffb2595b8d31b3c34bbfd81c79a5cd23b3f8617 100644
--- a/VistaCoreLibs/VistaOGLExt/VistaFramebufferObj.cpp
+++ b/VistaCoreLibs/VistaOGLExt/VistaFramebufferObj.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaFramebufferObj.cpp 45178 2014-10-31 11:00:58Z dr165799 $
+
 
 #include <VistaBase/VistaStreamUtils.h>
 
diff --git a/VistaCoreLibs/VistaOGLExt/VistaFramebufferObj.h b/VistaCoreLibs/VistaOGLExt/VistaFramebufferObj.h
index 6de4657f68627f9df98baa3039266e527a6ff06d..7817a35517b67e7b9701be314dc36ffefc545bc0 100644
--- a/VistaCoreLibs/VistaOGLExt/VistaFramebufferObj.h
+++ b/VistaCoreLibs/VistaOGLExt/VistaFramebufferObj.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaFramebufferObj.h 45177 2014-10-31 10:35:20Z dr165799 $
+
 
 
 #ifndef _VISTAFRAMEBUFFEROBJ_H
diff --git a/VistaCoreLibs/VistaOGLExt/VistaGLLine.cpp b/VistaCoreLibs/VistaOGLExt/VistaGLLine.cpp
index 53ea5ad1e200f67d6187db5afdf880433cf39a08..be64115d3843f27a7d49c2de9cca146d7f87e909 100644
--- a/VistaCoreLibs/VistaOGLExt/VistaGLLine.cpp
+++ b/VistaCoreLibs/VistaOGLExt/VistaGLLine.cpp
@@ -1,6 +1,6 @@
 /*======	======================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaGLLine.cpp 49417 2015-04-22 10:21:41Z sp841227 $
+
 
 #include <GL/glew.h>
 
diff --git a/VistaCoreLibs/VistaOGLExt/VistaGLLine.h b/VistaCoreLibs/VistaOGLExt/VistaGLLine.h
index 1ad522328957c860663656f5a9ac55fba6024a64..45dc456ec6526809be1c4b31a06fe17c346a52d2 100644
--- a/VistaCoreLibs/VistaOGLExt/VistaGLLine.h
+++ b/VistaCoreLibs/VistaOGLExt/VistaGLLine.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaGLLine.h 47469 2015-02-03 15:58:17Z jh864363 $
+
 
 #ifndef VISTA_GL_LINE_H
 #define VISTA_GL_LINE_H
diff --git a/VistaCoreLibs/VistaOGLExt/VistaGLPoints.cpp b/VistaCoreLibs/VistaOGLExt/VistaGLPoints.cpp
index 090931ab88619db45618dd1a5bbd116aba428eae..d08eb29cacd4fc6acef14233b15460da85787f51 100644
--- a/VistaCoreLibs/VistaOGLExt/VistaGLPoints.cpp
+++ b/VistaCoreLibs/VistaOGLExt/VistaGLPoints.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaGLLine.cpp 37237 2013-08-15 07:45:24Z jh864363 $
+
 
 #include <GL/glew.h>
 
diff --git a/VistaCoreLibs/VistaOGLExt/VistaGLPoints.h b/VistaCoreLibs/VistaOGLExt/VistaGLPoints.h
index 77d440fcd3cc64eb88c768d2e8c0dd8b6627d6fd..d7a4e0ab9917496c0201f3413596f6c7ec98065f 100644
--- a/VistaCoreLibs/VistaOGLExt/VistaGLPoints.h
+++ b/VistaCoreLibs/VistaOGLExt/VistaGLPoints.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaGLLine.h 33731 2013-02-06 09:57:29Z jh864363 $
+
 
 #ifndef VISTA_GL_POINTS_H
 #define VISTA_GL_POINTS_H
diff --git a/VistaCoreLibs/VistaOGLExt/VistaGLSLShader.cpp b/VistaCoreLibs/VistaOGLExt/VistaGLSLShader.cpp
index 216ecf44a6fc797eb9b70541ac7bb72cab9d28e2..9fddff0edf9655aafa80196d94c43f09e3334e41 100644
--- a/VistaCoreLibs/VistaOGLExt/VistaGLSLShader.cpp
+++ b/VistaCoreLibs/VistaOGLExt/VistaGLSLShader.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaGLSLShader.cpp 43275 2014-07-29 11:39:31Z ch940824 $
+
 
 /*============================================================================*/
 /* INCLUDES			                                                          */
@@ -40,6 +40,7 @@
 /*============================================================================*/
 VistaGLSLShader::VistaGLSLShader()
 :	m_uiProgram( 0 )
+,	m_bIsReadyForUse( false )
 { }
 
 VistaGLSLShader::~VistaGLSLShader()
@@ -662,7 +663,7 @@ bool VistaGLSLShader::SetUniformBlockBinding( GLuint uiBlockIndex,
 	return !VistaOGLUtils::CheckForOGLError( __FILE__, __LINE__ );
 }
 
-bool VistaGLSLShader::SetUniformBlockBinding( const std::string strBlockName,
+bool VistaGLSLShader::SetUniformBlockBinding( const std::string& strBlockName,
 		GLuint uiBindPoint )
 {
 	const GLuint uiIndex = GetUniformBlockIndex( strBlockName );
diff --git a/VistaCoreLibs/VistaOGLExt/VistaGLSLShader.h b/VistaCoreLibs/VistaOGLExt/VistaGLSLShader.h
index 9954dd8e0287af98e294e395055565e46b29bde4..52a1301849f037fa18635f8d73dcd2a36203e283 100644
--- a/VistaCoreLibs/VistaOGLExt/VistaGLSLShader.h
+++ b/VistaCoreLibs/VistaOGLExt/VistaGLSLShader.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaGLSLShader.h 41859 2014-05-08 15:07:56Z sp841227 $
+
 
 #ifndef _VistaGLSLShader_h
 #define _VistaGLSLShader_h
@@ -172,7 +172,7 @@ public:
 	 * @return Returns 'true' if the binding was successfully established.
 	 */
 	bool SetUniformBlockBinding( GLuint uiBlockIndex, GLuint uiBindPoint );
-	bool SetUniformBlockBinding( const std::string strBlockName,
+	bool SetUniformBlockBinding( const std::string& strBlockName,
 								 GLuint uiBindPoint );
 	/**
 	 * Queries the GL to determine the current bind point for the specified
diff --git a/VistaCoreLibs/VistaOGLExt/VistaOGLExtConfig.h b/VistaCoreLibs/VistaOGLExt/VistaOGLExtConfig.h
index e15ce26b21cd9b1bfd470ce9ba86fabad43d4812..44162775f5af6a3846a4f01e260f27d697475fa9 100644
--- a/VistaCoreLibs/VistaOGLExt/VistaOGLExtConfig.h
+++ b/VistaCoreLibs/VistaOGLExt/VistaOGLExtConfig.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaOGLExtConfig.h 41859 2014-05-08 15:07:56Z sp841227 $
+
 
 #ifndef _VISTAOGLEXTCONFIG_H
 #define _VISTAOGLEXTCONFIG_H
diff --git a/VistaCoreLibs/VistaOGLExt/VistaOGLUtils.cpp b/VistaCoreLibs/VistaOGLExt/VistaOGLUtils.cpp
index 4ffebd9f94671e085fad27cc95ea4f436f4fa15c..3d840e6fce5941c8c9d730071495018e90b2e2ce 100644
--- a/VistaCoreLibs/VistaOGLExt/VistaOGLUtils.cpp
+++ b/VistaCoreLibs/VistaOGLExt/VistaOGLUtils.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaOGLUtils.cpp 43050 2014-07-16 15:58:04Z sp841227 $
+
 
 
 #include "VistaOGLUtils.h"
diff --git a/VistaCoreLibs/VistaOGLExt/VistaOGLUtils.h b/VistaCoreLibs/VistaOGLExt/VistaOGLUtils.h
index b4c6a01118e63e0076d0f9e16536fde14034badc..ff666e33498d314b16b4b5af048f58d8a3685ef3 100644
--- a/VistaCoreLibs/VistaOGLExt/VistaOGLUtils.h
+++ b/VistaCoreLibs/VistaOGLExt/VistaOGLUtils.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaOGLUtils.h 43049 2014-07-16 15:55:55Z sp841227 $
+
 
 
 #ifndef _VISTAOGLUTILS_H
diff --git a/VistaCoreLibs/VistaOGLExt/VistaRenderToVertexArray.cpp b/VistaCoreLibs/VistaOGLExt/VistaRenderToVertexArray.cpp
index aaaaf2a10657a47a7385402688111b6ff10c7b19..876606fa501d64ecbd1ee1cefc28e444df58830d 100644
--- a/VistaCoreLibs/VistaOGLExt/VistaRenderToVertexArray.cpp
+++ b/VistaCoreLibs/VistaOGLExt/VistaRenderToVertexArray.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaRenderToVertexArray.cpp 41859 2014-05-08 15:07:56Z sp841227 $
+
 
 /*============================================================================*/
 /* INCLUDES                                                                   */
diff --git a/VistaCoreLibs/VistaOGLExt/VistaRenderToVertexArray.h b/VistaCoreLibs/VistaOGLExt/VistaRenderToVertexArray.h
index ec52533c01c259be496a1a8aaa7dd8dd6d01b57f..d6821d7a5b62a4a2c0f2904322aedbb1cb61e82c 100644
--- a/VistaCoreLibs/VistaOGLExt/VistaRenderToVertexArray.h
+++ b/VistaCoreLibs/VistaOGLExt/VistaRenderToVertexArray.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaRenderToVertexArray.h 41859 2014-05-08 15:07:56Z sp841227 $
+
 
 #ifndef _VistaRenderToVertexArray_h
 #define _VistaRenderToVertexArray_h
diff --git a/VistaCoreLibs/VistaOGLExt/VistaRenderbuffer.cpp b/VistaCoreLibs/VistaOGLExt/VistaRenderbuffer.cpp
index ed3dc8c1eec68863b00ec8791181d6159557be60..67bee6b9154b375b8af7e7ebb8e4fb6e5cf73518 100644
--- a/VistaCoreLibs/VistaOGLExt/VistaRenderbuffer.cpp
+++ b/VistaCoreLibs/VistaOGLExt/VistaRenderbuffer.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaRenderbuffer.cpp 41859 2014-05-08 15:07:56Z sp841227 $
+
 
 #include <VistaBase/VistaStreamUtils.h>
 
diff --git a/VistaCoreLibs/VistaOGLExt/VistaRenderbuffer.h b/VistaCoreLibs/VistaOGLExt/VistaRenderbuffer.h
index ad31a4a3d1051d52f1ec7fb7fdd986e4f0498b12..6da82d6cc5050e1af60f8edfdfcc4eaeb1f9246f 100644
--- a/VistaCoreLibs/VistaOGLExt/VistaRenderbuffer.h
+++ b/VistaCoreLibs/VistaOGLExt/VistaRenderbuffer.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaRenderbuffer.h 41859 2014-05-08 15:07:56Z sp841227 $
+
 
 
 #ifndef _VISTARENDERBUFFER_H
diff --git a/VistaCoreLibs/VistaOGLExt/VistaShaderRegistry.cpp b/VistaCoreLibs/VistaOGLExt/VistaShaderRegistry.cpp
index dc9adcced26bf44a0a5a9492158c6458be39ba76..7b00dece8a2dc686c6217b6ba12e3f651f43385a 100644
--- a/VistaCoreLibs/VistaOGLExt/VistaShaderRegistry.cpp
+++ b/VistaCoreLibs/VistaOGLExt/VistaShaderRegistry.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaShaderRegistry.cpp 41859 2014-05-08 15:07:56Z sp841227 $
+
 
 #include "VistaShaderRegistry.h"
 
diff --git a/VistaCoreLibs/VistaOGLExt/VistaShaderRegistry.h b/VistaCoreLibs/VistaOGLExt/VistaShaderRegistry.h
index 3e70a221c037f3499b6f2f9c5561eb17690a5cb7..f7e41ef3332a9b35375104988c0db73d14ce5ffc 100644
--- a/VistaCoreLibs/VistaOGLExt/VistaShaderRegistry.h
+++ b/VistaCoreLibs/VistaOGLExt/VistaShaderRegistry.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaShaderRegistry.h 41859 2014-05-08 15:07:56Z sp841227 $
+
 
 #ifndef VISTASHADERREGISTRY_H
 #define VISTASHADERREGISTRY_H
diff --git a/VistaCoreLibs/VistaOGLExt/VistaTexture.cpp b/VistaCoreLibs/VistaOGLExt/VistaTexture.cpp
index 5ca0e4de2d437dcf24fc25bd3356f4b5afbb4a2a..cf43e197aafa290e2b4863db5ba2ae62de122cdc 100644
--- a/VistaCoreLibs/VistaOGLExt/VistaTexture.cpp
+++ b/VistaCoreLibs/VistaOGLExt/VistaTexture.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaTexture.cpp 50471 2015-06-04 14:01:35Z sp841227 $
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaOGLExt/VistaTexture.h b/VistaCoreLibs/VistaOGLExt/VistaTexture.h
index 8c3156fced371af247a0e427da497fd7c874cd1c..5cf9632b27aab5048c186e402c84fd3964eb59ec 100644
--- a/VistaCoreLibs/VistaOGLExt/VistaTexture.h
+++ b/VistaCoreLibs/VistaOGLExt/VistaTexture.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaTexture.h 41859 2014-05-08 15:07:56Z sp841227 $
+
 
 
 #ifndef _VISTATEXTURE_H
diff --git a/VistaCoreLibs/VistaOGLExt/VistaTransformableTexture.cpp b/VistaCoreLibs/VistaOGLExt/VistaTransformableTexture.cpp
index 273d637d08d343f306b729aedc31ecdd36d1f770..b66168ee0ffda4a549f0b6da85e69c30ddf79ee6 100644
--- a/VistaCoreLibs/VistaOGLExt/VistaTransformableTexture.cpp
+++ b/VistaCoreLibs/VistaOGLExt/VistaTransformableTexture.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaTransformableTexture.cpp 42514 2014-06-13 09:10:45Z ss413432 $
+
 
 #include <GL/glew.h>
 
diff --git a/VistaCoreLibs/VistaOGLExt/VistaTransformableTexture.h b/VistaCoreLibs/VistaOGLExt/VistaTransformableTexture.h
index 6c22425c3d05dabbc6faa8dabf9bc7fa896395f9..bec6ac5fe8bb884635639175b7434225ce6ac2b5 100644
--- a/VistaCoreLibs/VistaOGLExt/VistaTransformableTexture.h
+++ b/VistaCoreLibs/VistaOGLExt/VistaTransformableTexture.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaTransformableTexture.h 41859 2014-05-08 15:07:56Z sp841227 $
+
 
 #ifndef _VISTATRANSFORMABLETEXTURE_H_
 #define _VISTATRANSFORMABLETEXTURE_H_
diff --git a/VistaCoreLibs/VistaOGLExt/VistaVertexArrayObject.cpp b/VistaCoreLibs/VistaOGLExt/VistaVertexArrayObject.cpp
index 888d51a8a206ce0d308e39b10a686353e2cbfe98..a6bfb3db6902d4e93136f3e1c6d3403f4757135f 100644
--- a/VistaCoreLibs/VistaOGLExt/VistaVertexArrayObject.cpp
+++ b/VistaCoreLibs/VistaOGLExt/VistaVertexArrayObject.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaVertexArrayObject.cpp 42514 2014-06-13 09:10:45Z ss413432 $
+
 
 #include <GL/glew.h>
 
diff --git a/VistaCoreLibs/VistaOGLExt/VistaVertexArrayObject.h b/VistaCoreLibs/VistaOGLExt/VistaVertexArrayObject.h
index 9a301dbd42a7123b7b772865c600da0871bcb189..8198a05a8a6dddc99f69bb27460e4a574140f406 100644
--- a/VistaCoreLibs/VistaOGLExt/VistaVertexArrayObject.h
+++ b/VistaCoreLibs/VistaOGLExt/VistaVertexArrayObject.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                                 VistaFlowLib                               */
-/*               Copyright (c) 1998-2014 RWTH Aachen University               */
+/*               Copyright (c) 1998-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaVertexArrayObject.h 42514 2014-06-13 09:10:45Z ss413432 $
+
 
 #ifndef _VistaVertexArrayObject_h
 #define _VistaVertexArrayObject_h
diff --git a/VistaCoreLibs/VistaOGLExt/_SourceFiles.cmake b/VistaCoreLibs/VistaOGLExt/_SourceFiles.cmake
index 5521c3631aae39c5228584b8f5059d642c8d69f6..0c0224eb92f7e1c81d98692867296ce1c49fb598 100644
--- a/VistaCoreLibs/VistaOGLExt/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaOGLExt/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id: _SourceFiles.cmake 40836 2014-02-18 12:20:56Z jh864363 $
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaCoreLibs/VistaOGLExt/shaders/_SourceFiles.cmake b/VistaCoreLibs/VistaOGLExt/shaders/_SourceFiles.cmake
index ee3138da0b8fb7c3844053d3103aa88130dc5db6..c4b2914fdcc0b5a84dafd2106eff637b122f1734 100644
--- a/VistaCoreLibs/VistaOGLExt/shaders/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaOGLExt/shaders/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id: _SourceFiles.cmake 36093 2013-07-04 15:25:40Z sp841227 $
+
 
 set( RelativeDir "./shaders" )
 set( RelativeSourceGroup "Shaders" )
diff --git a/VistaCoreLibs/VistaTestingUtils/VistaTestingCompare.h b/VistaCoreLibs/VistaTestingUtils/VistaTestingCompare.h
index 7f111e4b68a95ea8f9efaf364b23f1278b4200a1..2e86c867f8255c31a2bbfc04a5d87da376b37ed1 100644
--- a/VistaCoreLibs/VistaTestingUtils/VistaTestingCompare.h
+++ b/VistaCoreLibs/VistaTestingUtils/VistaTestingCompare.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATESTINGCOMPARE_H
 #define _VISTATESTINGCOMPARE_H
diff --git a/VistaCoreLibs/VistaTestingUtils/VistaTestingDummyStruct.h b/VistaCoreLibs/VistaTestingUtils/VistaTestingDummyStruct.h
index c78b921b47ea4a7d8891d059082134c477dbb4b1..aaa45162c1f1611c0efc4b98d589c5ad0a27a53e 100644
--- a/VistaCoreLibs/VistaTestingUtils/VistaTestingDummyStruct.h
+++ b/VistaCoreLibs/VistaTestingUtils/VistaTestingDummyStruct.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaTestingUtils.h 39125 2013-11-05 20:24:43Z dr165799 $
+
 
 #ifndef _VISTATESTINGDUMMYSTRUCT_H
 #define _VISTATESTINGDUMMYSTRUCT_H
diff --git a/VistaCoreLibs/VistaTestingUtils/VistaTestingRandom.h b/VistaCoreLibs/VistaTestingUtils/VistaTestingRandom.h
index f68c7e36c3e4af6067d84e58be198ffbd66b220b..98b1d7826145b93dcf14e0abf45d3484fa99fac8 100644
--- a/VistaCoreLibs/VistaTestingUtils/VistaTestingRandom.h
+++ b/VistaCoreLibs/VistaTestingUtils/VistaTestingRandom.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaTestingUtils.h 39125 2013-11-05 20:24:43Z dr165799 $
+
 
 #ifndef _VISTATESTINGRANDOM_H
 #define _VISTATESTINGRANDOM_H
diff --git a/VistaCoreLibs/VistaTools/CMakeLists.txt b/VistaCoreLibs/VistaTools/CMakeLists.txt
index fea780c00a8a7c8b43e4d49de343dd7bfb8b808a..3d8fbbc39fa7254442d56b6b5103bfd10b42fbe2 100644
--- a/VistaCoreLibs/VistaTools/CMakeLists.txt
+++ b/VistaCoreLibs/VistaTools/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id$
+
 
 vista_adopt_version( VistaTools VistaCoreLibs )
 
diff --git a/VistaCoreLibs/VistaTools/EncodeBinary.h b/VistaCoreLibs/VistaTools/EncodeBinary.h
index f3ee1c2baa9b06eee22f4a8035016ea2671c936b..bf843957098a522252e48f790555212029f1c426 100644
--- a/VistaCoreLibs/VistaTools/EncodeBinary.h
+++ b/VistaCoreLibs/VistaTools/EncodeBinary.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /**
 *		NOTE:	Due to the usage of sizeof(...) you might encouter problems, when using
diff --git a/VistaCoreLibs/VistaTools/VistaBase64.cpp b/VistaCoreLibs/VistaTools/VistaBase64.cpp
index 7f45d64bb0ba8aafd646d5f91605bf16b5fb62fd..19615eec07d2915d2d2aa48d29d70ebb0fe173ac 100644
--- a/VistaCoreLibs/VistaTools/VistaBase64.cpp
+++ b/VistaCoreLibs/VistaTools/VistaBase64.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaBase64.h"
 #include <VistaBase/VistaExceptionBase.h>
diff --git a/VistaCoreLibs/VistaTools/VistaBase64.h b/VistaCoreLibs/VistaTools/VistaBase64.h
index 651a4785e96a04316db8cb7f1c2d142869bf0c89..eeb4c1ad99ea5f7a80c4737d388502b7b211509b 100644
--- a/VistaCoreLibs/VistaTools/VistaBase64.h
+++ b/VistaCoreLibs/VistaTools/VistaBase64.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTABASE64_H
 #define _VISTABASE64_H
diff --git a/VistaCoreLibs/VistaTools/VistaBasicProfiler.cpp b/VistaCoreLibs/VistaTools/VistaBasicProfiler.cpp
index 83d0b3836c96bce472343f5762fd51bf0cfdb6bc..dbdfd29c1c745a391019363afb3356fd6aef6673 100644
--- a/VistaCoreLibs/VistaTools/VistaBasicProfiler.cpp
+++ b/VistaCoreLibs/VistaTools/VistaBasicProfiler.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaBasicProfiler.h"
 
diff --git a/VistaCoreLibs/VistaTools/VistaBasicProfiler.h b/VistaCoreLibs/VistaTools/VistaBasicProfiler.h
index a8a9be1a400f938f26c43e46609c7aec95cb5a42..d52186cf5ca68944b806aad56704cbddee52f1b5 100644
--- a/VistaCoreLibs/VistaTools/VistaBasicProfiler.h
+++ b/VistaCoreLibs/VistaTools/VistaBasicProfiler.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTABASICPROFILER_H
 #define _VISTABASICPROFILER_H
diff --git a/VistaCoreLibs/VistaTools/VistaCPUInfo.cpp b/VistaCoreLibs/VistaTools/VistaCPUInfo.cpp
index f73148f02c9099ab52e9b01b4dc233aacd80839c..877668add08a816c07c667eb18da888338d4efe9 100644
--- a/VistaCoreLibs/VistaTools/VistaCPUInfo.cpp
+++ b/VistaCoreLibs/VistaTools/VistaCPUInfo.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaCPUInfo.h" 
 
diff --git a/VistaCoreLibs/VistaTools/VistaCPUInfo.h b/VistaCoreLibs/VistaTools/VistaCPUInfo.h
index 2189b3c5563583375e1fe20f5ff978b4e0305c10..e330199e0e0c0c3ca7ac06dd7411b4dd6b709faa 100644
--- a/VistaCoreLibs/VistaTools/VistaCPUInfo.h
+++ b/VistaCoreLibs/VistaTools/VistaCPUInfo.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTACPUINFO_H
 #define _VISTACPUINFO_H
diff --git a/VistaCoreLibs/VistaTools/VistaCRC32.cpp b/VistaCoreLibs/VistaTools/VistaCRC32.cpp
index e39c6c052b1a2d1ee67d080d65d3e1e6628fb629..cc34166632f382d2f1d342fa4b68e47116e729d9 100644
--- a/VistaCoreLibs/VistaTools/VistaCRC32.cpp
+++ b/VistaCoreLibs/VistaTools/VistaCRC32.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaCRC32.h" 
 
diff --git a/VistaCoreLibs/VistaTools/VistaCRC32.h b/VistaCoreLibs/VistaTools/VistaCRC32.h
index 4f65c39a379ad88d7cb72430a64e894bc3415bd9..67c4d9987d0fbf46a73b0b6a4ed737d0bd78b2ea 100644
--- a/VistaCoreLibs/VistaTools/VistaCRC32.h
+++ b/VistaCoreLibs/VistaTools/VistaCRC32.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTACRC32_H
 #define _VISTACRC32_H
diff --git a/VistaCoreLibs/VistaTools/VistaDLL.cpp b/VistaCoreLibs/VistaTools/VistaDLL.cpp
index 38467e0e5fa8aee0390b552fcd299a9dddd4fd81..66ff0040e3b9ece0d580f3478e931f95db41a602 100644
--- a/VistaCoreLibs/VistaTools/VistaDLL.cpp
+++ b/VistaCoreLibs/VistaTools/VistaDLL.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaDLL.h" 
 #include <string>
diff --git a/VistaCoreLibs/VistaTools/VistaDLL.h b/VistaCoreLibs/VistaTools/VistaDLL.h
index 587444a580dd7d810b3d622c70bdc66062e1a3fc..f28477bbcda3c418576a2dd8914f056457f1803d 100644
--- a/VistaCoreLibs/VistaTools/VistaDLL.h
+++ b/VistaCoreLibs/VistaTools/VistaDLL.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTADLL_H
 #define _VISTADLL_H
diff --git a/VistaCoreLibs/VistaTools/VistaEnvironment.cpp b/VistaCoreLibs/VistaTools/VistaEnvironment.cpp
index 55f33119057647ca65a7011b9f3618fc7ce8815f..ebcbb12437b0f0d248e3c8e3b79deb95ca03b944 100644
--- a/VistaCoreLibs/VistaTools/VistaEnvironment.cpp
+++ b/VistaCoreLibs/VistaTools/VistaEnvironment.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaEnvironment.h"
 
diff --git a/VistaCoreLibs/VistaTools/VistaEnvironment.h b/VistaCoreLibs/VistaTools/VistaEnvironment.h
index a3c5ce6c2773cb1aa5c7a1012b41ce02a722ac95..ccc08154b15bfd9038337776cfbe536533820e11 100644
--- a/VistaCoreLibs/VistaTools/VistaEnvironment.h
+++ b/VistaCoreLibs/VistaTools/VistaEnvironment.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if !defined(_VISTAENVIRONMENT_H)
 #define _VISTAENVIRONMENT_H
diff --git a/VistaCoreLibs/VistaTools/VistaFastMeshAdaptor.cpp b/VistaCoreLibs/VistaTools/VistaFastMeshAdaptor.cpp
index d13bde6f82bb7229f958369527aff0674a99daa5..3cb518976ddc895705bfea907750397f9bca3af3 100644
--- a/VistaCoreLibs/VistaTools/VistaFastMeshAdaptor.cpp
+++ b/VistaCoreLibs/VistaTools/VistaFastMeshAdaptor.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaFastMeshAdaptor.h" 
 
diff --git a/VistaCoreLibs/VistaTools/VistaFastMeshAdaptor.h b/VistaCoreLibs/VistaTools/VistaFastMeshAdaptor.h
index d0022aa152bcb10f10682f9a14885ea971a63175..d06d092abeee251fcc677c8c318459727ac25e60 100644
--- a/VistaCoreLibs/VistaTools/VistaFastMeshAdaptor.h
+++ b/VistaCoreLibs/VistaTools/VistaFastMeshAdaptor.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAFASTMESHADAPTORGUARD_H
 #define _VISTAFASTMESHADAPTORGUARD_H
@@ -175,7 +175,7 @@ public:
 	class ConstFaceIter
 	{
 		public:
-			ConstFaceIter() : m_pFastMeshAdaptor(0)
+			ConstFaceIter() : m_pFastMeshAdaptor(0), m_iCurrentIndex(0)
 			{}
 			ConstFaceIter(const VistaFastMeshAdaptor* const cAdaptor, const unsigned int iIndex)
 						 : m_pFastMeshAdaptor(cAdaptor),
@@ -255,7 +255,7 @@ public:
 	class ConstFaceVertexIter
 	{
 		public:
-			ConstFaceVertexIter() : m_pFastMeshAdaptor(0)
+			ConstFaceVertexIter() : m_pFastMeshAdaptor(0), m_bIterated( false )
 			{}
 			ConstFaceVertexIter(const VistaFastMeshAdaptor* cAdaptor, const FaceHandle hFace)
 							   : m_pFastMeshAdaptor(cAdaptor),
diff --git a/VistaCoreLibs/VistaTools/VistaFileDataSet.cpp b/VistaCoreLibs/VistaTools/VistaFileDataSet.cpp
index 40ee1745060c1589c2ea4b5131e9849028ae857b..ee5e27715ba673563cc7f798bbe88380ed897f8e 100644
--- a/VistaCoreLibs/VistaTools/VistaFileDataSet.cpp
+++ b/VistaCoreLibs/VistaTools/VistaFileDataSet.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaTools/VistaFileDataSet.h b/VistaCoreLibs/VistaTools/VistaFileDataSet.h
index 7eb594dee3967584f2d493f8ec5da5251a4c3e56..bdb73818ce97b141a609f0907ff6110764f7d512 100644
--- a/VistaCoreLibs/VistaTools/VistaFileDataSet.h
+++ b/VistaCoreLibs/VistaTools/VistaFileDataSet.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /**
  *      Purpose  :  Access to "FileDataSets". A dataset is an
diff --git a/VistaCoreLibs/VistaTools/VistaFileSystemDirectory.cpp b/VistaCoreLibs/VistaTools/VistaFileSystemDirectory.cpp
index 5e556a049976286ab1da9e73c193d4688ab738f5..4547241f56423767085a87af28eb80819c5e6030 100644
--- a/VistaCoreLibs/VistaTools/VistaFileSystemDirectory.cpp
+++ b/VistaCoreLibs/VistaTools/VistaFileSystemDirectory.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
@@ -76,9 +76,9 @@ using namespace std;
 
 VistaFileSystemDirectory::VistaFileSystemDirectory(const string &dir_name) :
 VistaFileSystemNode(dir_name),
-m_bIsParsed(false)
+m_bIsParsed(false),
+m_sPattern("*")
 {
-	m_sPattern = "*";
 }
 
 VistaFileSystemDirectory::~VistaFileSystemDirectory()
diff --git a/VistaCoreLibs/VistaTools/VistaFileSystemDirectory.h b/VistaCoreLibs/VistaTools/VistaFileSystemDirectory.h
index bd585e8742e82b7b0a437c4f57605578da4dea5c..2dc46af938c5732888349196a6976ec1637e406a 100644
--- a/VistaCoreLibs/VistaTools/VistaFileSystemDirectory.h
+++ b/VistaCoreLibs/VistaTools/VistaFileSystemDirectory.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef VISTAFILESYSTEMDIRECTORY_H
 #define VISTAFILESYSTEMDIRECTORY_H
diff --git a/VistaCoreLibs/VistaTools/VistaFileSystemFile.cpp b/VistaCoreLibs/VistaTools/VistaFileSystemFile.cpp
index 7fc94cd62c6dd5b8e3c4e3838513c23c2c3a7bac..ec1666f195018ad4d04b3a8570be803b558ea07b 100644
--- a/VistaCoreLibs/VistaTools/VistaFileSystemFile.cpp
+++ b/VistaCoreLibs/VistaTools/VistaFileSystemFile.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 
 /*============================================================================*/
diff --git a/VistaCoreLibs/VistaTools/VistaFileSystemFile.h b/VistaCoreLibs/VistaTools/VistaFileSystemFile.h
index 7da503208959589fffd04e95203a5836b7576ced..38d762174df82daad74a95795c8c472635e3ba19 100644
--- a/VistaCoreLibs/VistaTools/VistaFileSystemFile.h
+++ b/VistaCoreLibs/VistaTools/VistaFileSystemFile.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAFILESYSTEMFILE_H
 #define _VISTAFILESYSTEMFILE_H
diff --git a/VistaCoreLibs/VistaTools/VistaFileSystemNode.cpp b/VistaCoreLibs/VistaTools/VistaFileSystemNode.cpp
index cda8b435d26819afbe9c6390079a8eac222eb8f0..4bf9d62244d2c73b2a8259e7937d650236d3a866 100644
--- a/VistaCoreLibs/VistaTools/VistaFileSystemNode.cpp
+++ b/VistaCoreLibs/VistaTools/VistaFileSystemNode.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*============================================================================*/
 /* DEFINITIONS                                                                */
diff --git a/VistaCoreLibs/VistaTools/VistaFileSystemNode.h b/VistaCoreLibs/VistaTools/VistaFileSystemNode.h
index dca903ea8a98abfb4282bdb75f3d05609aa2f492..947b2a4314af96f8a06a6bc6578a48516d759cb6 100644
--- a/VistaCoreLibs/VistaTools/VistaFileSystemNode.h
+++ b/VistaCoreLibs/VistaTools/VistaFileSystemNode.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAFILESYSTEMNODE_H
 #define _VISTAFILESYSTEMNODE_H
diff --git a/VistaCoreLibs/VistaTools/VistaHalfedgeAdaptor.cpp b/VistaCoreLibs/VistaTools/VistaHalfedgeAdaptor.cpp
index 5c5e2423119b14ae30d2fd37e36b0b16f2b9c3aa..99724729a21acd1c2907fc388c6296e40ea3e7c8 100644
--- a/VistaCoreLibs/VistaTools/VistaHalfedgeAdaptor.cpp
+++ b/VistaCoreLibs/VistaTools/VistaHalfedgeAdaptor.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaHalfedgeAdaptor.h" 
 
diff --git a/VistaCoreLibs/VistaTools/VistaHalfedgeAdaptor.h b/VistaCoreLibs/VistaTools/VistaHalfedgeAdaptor.h
index ea48479e3c1924b2b5856b068a923e028d1dd8ff..ffdea4c3217dd797e31e928d7c80c2550ddb883a 100644
--- a/VistaCoreLibs/VistaTools/VistaHalfedgeAdaptor.h
+++ b/VistaCoreLibs/VistaTools/VistaHalfedgeAdaptor.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAHALFEDGEADAPTORGUARD_H
 #define _VISTAHALFEDGEADAPTORGUARD_H
@@ -179,7 +179,7 @@ public:
 	class ConstFaceIter
 	{
 		public:
-			ConstFaceIter() : m_pHalfedgeAdaptor(0)
+			ConstFaceIter() : m_pHalfedgeAdaptor(0), m_iCurrentIndex( 0 )
 			{}
 			ConstFaceIter(const VistaHalfedgeAdaptor* const cAdaptor, const  int iIndex)
 						 : m_pHalfedgeAdaptor(cAdaptor),
@@ -256,7 +256,7 @@ public:
 	class ConstVertexFaceIter
 	{
 		public:
-			ConstVertexFaceIter() : m_pHalfedgeAdaptor(0)
+			ConstVertexFaceIter() : m_pHalfedgeAdaptor(0), m_bIterated( false )
 			{}
 			ConstVertexFaceIter(const VistaHalfedgeAdaptor* cAdaptor, const VertexHandle hVertex)
 							   : m_pHalfedgeAdaptor(cAdaptor),
@@ -343,7 +343,7 @@ public:
 	class ConstFaceVertexIter
 	{
 		public:
-			ConstFaceVertexIter() : m_pHalfedgeAdaptor(0)
+			ConstFaceVertexIter() : m_pHalfedgeAdaptor(0), m_bIterated( false )
 			{}
 			ConstFaceVertexIter(const VistaHalfedgeAdaptor* cAdaptor, const FaceHandle hFace)
 							   : m_pHalfedgeAdaptor(cAdaptor),
@@ -426,7 +426,7 @@ public:
 	class ConstFaceHalfedgeIter
 	{
 		public:
-			ConstFaceHalfedgeIter() : m_pHalfedgeAdaptor(0)
+			ConstFaceHalfedgeIter() : m_pHalfedgeAdaptor(0), m_bIterated( false )
 			{}
 			ConstFaceHalfedgeIter(const VistaHalfedgeAdaptor* cAdaptor, const FaceHandle hFace)
 							   : m_pHalfedgeAdaptor(cAdaptor),
@@ -514,7 +514,7 @@ public:
 	class ConstFaceEdgeIter
 	{
 		public:
-			ConstFaceEdgeIter() : m_pHalfedgeAdaptor(0)
+			ConstFaceEdgeIter() : m_pHalfedgeAdaptor(0), m_bIterated( false )
 			{}
 			ConstFaceEdgeIter(const VistaHalfedgeAdaptor* const pAdaptor, const FaceHandle hFace)
 							   : m_pHalfedgeAdaptor(pAdaptor),
diff --git a/VistaCoreLibs/VistaTools/VistaIniFileParser.cpp b/VistaCoreLibs/VistaTools/VistaIniFileParser.cpp
index c4cff85327beeaddcce0ace999f9146e1608b092..0bb9ab1326a0416870654bb3f2d9bbc8369e8e68 100644
--- a/VistaCoreLibs/VistaTools/VistaIniFileParser.cpp
+++ b/VistaCoreLibs/VistaTools/VistaIniFileParser.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaIniFileParser.h"
 
diff --git a/VistaCoreLibs/VistaTools/VistaIniFileParser.h b/VistaCoreLibs/VistaTools/VistaIniFileParser.h
index b1f14eb5638dddc30ea55cb3908b51662dfd6580..e833dfcbd386c1e64ecbd2c07159e482c2db3076 100644
--- a/VistaCoreLibs/VistaTools/VistaIniFileParser.h
+++ b/VistaCoreLibs/VistaTools/VistaIniFileParser.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAINIFILEPARSER_H
 #define _VISTAINIFILEPARSER_H
diff --git a/VistaCoreLibs/VistaTools/VistaMemoryInfo.cpp b/VistaCoreLibs/VistaTools/VistaMemoryInfo.cpp
index 3bae12017b29a980f60e662dedd8d43aec9aba65..a03813ca216989ce8166dd45b4537bc580eb95ca 100644
--- a/VistaCoreLibs/VistaTools/VistaMemoryInfo.cpp
+++ b/VistaCoreLibs/VistaTools/VistaMemoryInfo.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaMemoryInfo.h"
 
diff --git a/VistaCoreLibs/VistaTools/VistaMemoryInfo.h b/VistaCoreLibs/VistaTools/VistaMemoryInfo.h
index 7088f1e74cc33305b6c623a01e8a01adcf8f8b0f..d13ac9824f2b52ec09202ebde7c32a04a6f38043 100644
--- a/VistaCoreLibs/VistaTools/VistaMemoryInfo.h
+++ b/VistaCoreLibs/VistaTools/VistaMemoryInfo.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAMEMORYINFO_H
 #define _VISTAMEMORYINFO_H
diff --git a/VistaCoreLibs/VistaTools/VistaOctree.cpp b/VistaCoreLibs/VistaTools/VistaOctree.cpp
index 0c9fbf8c6f690607f9e67d4aa2dbca4cb81f7b9f..8b893f378e8b9c7494858fd0258f7d23137090d8 100644
--- a/VistaCoreLibs/VistaTools/VistaOctree.cpp
+++ b/VistaCoreLibs/VistaTools/VistaOctree.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include <list>
 #include "VistaOctree.h"
diff --git a/VistaCoreLibs/VistaTools/VistaOctree.h b/VistaCoreLibs/VistaTools/VistaOctree.h
index 96942375dbc234729e2ae136ae09a3628fde2830..6f3a86b9147bdfc674541a63cc5579b1af25247c 100644
--- a/VistaCoreLibs/VistaTools/VistaOctree.h
+++ b/VistaCoreLibs/VistaTools/VistaOctree.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef CVISTAOCTREE_H
 #define CVISTAOCTREE_H
diff --git a/VistaCoreLibs/VistaTools/VistaProfiler.cpp b/VistaCoreLibs/VistaTools/VistaProfiler.cpp
index 8e06a310c8796732256ec0369e7acf95fa1eeef3..b11e4ce657c9df9610c6365ad879b13c06d8fddf 100644
--- a/VistaCoreLibs/VistaTools/VistaProfiler.cpp
+++ b/VistaCoreLibs/VistaTools/VistaProfiler.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaToolsStd.h"
 #include "VistaProfiler.h"
diff --git a/VistaCoreLibs/VistaTools/VistaProfiler.h b/VistaCoreLibs/VistaTools/VistaProfiler.h
index 313ae6aa7317f3b0f993b67e4d91c797dde8210b..63101b8efa8af9c51db2330188ec7437854f9e2d 100644
--- a/VistaCoreLibs/VistaTools/VistaProfiler.h
+++ b/VistaCoreLibs/VistaTools/VistaProfiler.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTAPROFILER_H
 #define _VISTAPROFILER_H
diff --git a/VistaCoreLibs/VistaTools/VistaProgressBar.cpp b/VistaCoreLibs/VistaTools/VistaProgressBar.cpp
index 002bc06c2484ad948c6cd601d0c89066491f72f7..9db33fa88b3b26eb5a13287c2c32b8433151d793 100644
--- a/VistaCoreLibs/VistaTools/VistaProgressBar.cpp
+++ b/VistaCoreLibs/VistaTools/VistaProgressBar.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaProgressBar.h"
 
diff --git a/VistaCoreLibs/VistaTools/VistaProgressBar.h b/VistaCoreLibs/VistaTools/VistaProgressBar.h
index a98c03d905ffaa3ed7d90c65aabcb33692a6029b..45929c02c4cea0ea0757bc18770d6232868841ad 100644
--- a/VistaCoreLibs/VistaTools/VistaProgressBar.h
+++ b/VistaCoreLibs/VistaTools/VistaProgressBar.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if !defined(_VISTAPROGRESSBAR_H)
 #define _VISTAPROGRESSBAR_H
diff --git a/VistaCoreLibs/VistaTools/VistaProtocol.cpp b/VistaCoreLibs/VistaTools/VistaProtocol.cpp
index abbb2dfb5b66b760c0ded84d4e5dc2f56fe4dff4..aabf4e529359cdd71def5bee33b712fb919b50b1 100644
--- a/VistaCoreLibs/VistaTools/VistaProtocol.cpp
+++ b/VistaCoreLibs/VistaTools/VistaProtocol.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaProtocol.h"
 
@@ -293,7 +293,7 @@ bool VistaProtocol::WriteProtocol()
 				 << "[Interval-length (s)]\n";
 		}
 
-			for(i = m_mpMeasureMap.begin();i != m_mpMeasureMap.end();i++)
+			for(i = m_mpMeasureMap.begin(); i != m_mpMeasureMap.end(); ++i)
 			{
 				if(i->second.dBegin != 0 && i->second.dEnd != 0)
 				{
@@ -309,11 +309,11 @@ bool VistaProtocol::WriteProtocol()
 				}
 			}
 
-			if(m_mpMeasureMap.size()>0) // mark line
+			if( !m_mpMeasureMap.empty() ) // mark line
 				Protocol << std::endl;
 
 			std::map<int, TimeInterval>::const_iterator it;
-			for(it = m_mpMsrMap.begin();it != m_mpMsrMap.end();it++)
+			for(it = m_mpMsrMap.begin(); it != m_mpMsrMap.end(); ++it)
 			{
 				if(it->second.dBegin != 0 && it->second.dEnd != 0)
 				{
diff --git a/VistaCoreLibs/VistaTools/VistaProtocol.h b/VistaCoreLibs/VistaTools/VistaProtocol.h
index 46bc48090cf16b55c433c9ff448f63106fb25580..7228ffd3d981881946042cceda69b3d34a7f73e8 100644
--- a/VistaCoreLibs/VistaTools/VistaProtocol.h
+++ b/VistaCoreLibs/VistaTools/VistaProtocol.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #if !defined(_VISTAPROTOCOL_H)
 #define _VISTAPROTOCOL_H
diff --git a/VistaCoreLibs/VistaTools/VistaRandomNumberGenerator.cpp b/VistaCoreLibs/VistaTools/VistaRandomNumberGenerator.cpp
index db724d82f58d9f84828a2b0fd4b024748ff44612..e40d173e599d9dfabc20bbfd40cc158d7b593faa 100644
--- a/VistaCoreLibs/VistaTools/VistaRandomNumberGenerator.cpp
+++ b/VistaCoreLibs/VistaTools/VistaRandomNumberGenerator.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*============================================================================*/
 /* INCLUDES                                                                   */
diff --git a/VistaCoreLibs/VistaTools/VistaRandomNumberGenerator.h b/VistaCoreLibs/VistaTools/VistaRandomNumberGenerator.h
index 684aa24a8c014eca5d40e317eaafc3022b6df116..b33f52e464c1ae8486753c5e92cb3459d33e771b 100644
--- a/VistaCoreLibs/VistaTools/VistaRandomNumberGenerator.h
+++ b/VistaCoreLibs/VistaTools/VistaRandomNumberGenerator.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTARANDOMNUMBERGENERATOR_H
 #define _VISTARANDOMNUMBERGENERATOR_H
diff --git a/VistaCoreLibs/VistaTools/VistaRingBuffer.h b/VistaCoreLibs/VistaTools/VistaRingBuffer.h
index 68007f87fadedb0c9573678ae4be3e8bbec692a8..9c445800ec10edc6776dde9318546f99b917a042 100644
--- a/VistaCoreLibs/VistaTools/VistaRingBuffer.h
+++ b/VistaCoreLibs/VistaTools/VistaRingBuffer.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTARINGBUFFER_H
 #define _VISTARINGBUFFER_H
diff --git a/VistaCoreLibs/VistaTools/VistaStackWalker.cpp b/VistaCoreLibs/VistaTools/VistaStackWalker.cpp
index 836314e267c8e39effeefdc29a10d9ed57ded817..885c2b7315517bcb2303b1b304f40fae1841f374 100644
--- a/VistaCoreLibs/VistaTools/VistaStackWalker.cpp
+++ b/VistaCoreLibs/VistaTools/VistaStackWalker.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaStackWalker.cpp$
+
 //We have different implementations for Windows and Unix. Thus:
 
 #include "VistaStackWalker.h"
@@ -72,7 +72,7 @@ namespace
 		CHAR loadedImageName[VISTA_STACKWALK_MAX_NAMELENGTH];
 	} InternalStackEntry;
 
-	bool WINAPI GetCallStackEntry( DWORD64 *pAddrPCOffset, PSYMBOL_INFO pSym,
+	bool WINAPI GetCallStackEntry( DWORD64 nAddrPCOffset, PSYMBOL_INFO pSym,
 									VistaStackWalker::CallStackEntry& oEntry )
 	{
 		InternalStackEntry oCallStackEntry;
@@ -86,7 +86,7 @@ namespace
 		f_64Module.SizeOfStruct = sizeof(f_64Module);
 
 		//Getting CallstackEntry
-		oCallStackEntry.offset = *pAddrPCOffset;
+		oCallStackEntry.offset = nAddrPCOffset;
 		oCallStackEntry.name[0] = 0;
 		oCallStackEntry.undName[0] = 0;
 		oCallStackEntry.undFullName[0] = 0;
@@ -97,32 +97,28 @@ namespace
 		oCallStackEntry.loadedImageName[0] = 0;
 		oCallStackEntry.moduleName[0] = 0;
 
-		if ( pAddrPCOffset != 0 )
+		if (SymFromAddr(GetCurrentProcess(), nAddrPCOffset, &(oCallStackEntry.offsetFromSmybol), pSym) != false)
 		{
-			if (SymFromAddr(GetCurrentProcess(), *pAddrPCOffset, &(oCallStackEntry.offsetFromSmybol), pSym) != false)
-			{
-				strcpy_s(oCallStackEntry.name, pSym->Name);
-				UnDecorateSymbolName( pSym->Name, oCallStackEntry.undName, VISTA_STACKWALK_MAX_NAMELENGTH, UNDNAME_NAME_ONLY );
-				UnDecorateSymbolName( pSym->Name, oCallStackEntry.undFullName, VISTA_STACKWALK_MAX_NAMELENGTH, UNDNAME_COMPLETE );
-			}
+			strcpy_s(oCallStackEntry.name, pSym->Name);
+			UnDecorateSymbolName( pSym->Name, oCallStackEntry.undName, VISTA_STACKWALK_MAX_NAMELENGTH, UNDNAME_NAME_ONLY );
+			UnDecorateSymbolName( pSym->Name, oCallStackEntry.undFullName, VISTA_STACKWALK_MAX_NAMELENGTH, UNDNAME_COMPLETE );
+		}
 
-			if (SymGetLineFromAddr64 != NULL )
+		if (SymGetLineFromAddr64 != NULL )
+		{
+			if (SymGetLineFromAddr64(GetCurrentProcess(), nAddrPCOffset, &(oCallStackEntry.offsetFromLine), &f_64Line) != false)
 			{
-				if (SymGetLineFromAddr64(GetCurrentProcess(), *pAddrPCOffset, &(oCallStackEntry.offsetFromLine), &f_64Line) != false)
-				{
-					oCallStackEntry.lineNumber = f_64Line.LineNumber;
-					strcpy(oCallStackEntry.lineFileName, f_64Line.FileName);
-				}
+				oCallStackEntry.lineNumber = f_64Line.LineNumber;
+				strcpy(oCallStackEntry.lineFileName, f_64Line.FileName);
 			}
-
-			
+		}
+						
 		
-		if ((bool)(SymGetModuleInfo64(GetCurrentProcess(),  *pAddrPCOffset, &f_64Module) != false))
-		  {
-			strcpy(oCallStackEntry.moduleName, f_64Module.ModuleName);
-			oCallStackEntry.baseOfImage = f_64Module.BaseOfImage;
-			strcpy(oCallStackEntry.loadedImageName, f_64Module.LoadedImageName);
-		  }
+		if ((bool)(SymGetModuleInfo64(GetCurrentProcess(),  nAddrPCOffset, &f_64Module) != false))
+		{
+		strcpy(oCallStackEntry.moduleName, f_64Module.ModuleName);
+		oCallStackEntry.baseOfImage = f_64Module.BaseOfImage;
+		strcpy(oCallStackEntry.loadedImageName, f_64Module.LoadedImageName);
 		}
 
 		//Actually writes information to output!
@@ -152,7 +148,7 @@ namespace
 		}
 
 		//Reached last StackEntry
-		if (&pAddrPCOffset == 0)
+		if ( nAddrPCOffset == 0 )
 		{
 			SetLastError(ERROR_SUCCESS);
 			return false;
@@ -323,7 +319,7 @@ bool VistaStackWalker::GetCallstack( std::vector<VistaStackWalker::CallStackEntr
 						SymFunctionTableAccess64, SymGetModuleBase64, NULL ) )
 	{
 		//Print the Current Stack Entry in the Stream
-		if ( !GetCallStackEntry( &(f_StackFrame.AddrPC.Offset), pSym, oEntry ) )
+		if ( !GetCallStackEntry( f_StackFrame.AddrPC.Offset, pSym, oEntry ) )
 		{
 			break;
 		}
diff --git a/VistaCoreLibs/VistaTools/VistaStackWalker.h b/VistaCoreLibs/VistaTools/VistaStackWalker.h
index 2911f0e9554345e7d018ed986885217b1159c495..68a5e4405abddd8c9f952e00a3ca93394226ebfc 100644
--- a/VistaCoreLibs/VistaTools/VistaStackWalker.h
+++ b/VistaCoreLibs/VistaTools/VistaStackWalker.h
@@ -25,7 +25,7 @@
 /*    http://www.codeproject.com/KB/threads/StackWalker.aspx                  */
 /*                                                                            */
 /*============================================================================*/
-// $Id: VistaStackWalker.h$
+
 
 #ifndef _VISTASTACKWALKER_H
 #define _VISTASTACKWALKER_H
diff --git a/VistaCoreLibs/VistaTools/VistaStreams.cpp b/VistaCoreLibs/VistaTools/VistaStreams.cpp
index 5106b3a58930b8c143366aef4abe7a5088fe538d..cc91eaccbbfef032713f62ae2ec63041205fedba 100644
--- a/VistaCoreLibs/VistaTools/VistaStreams.cpp
+++ b/VistaCoreLibs/VistaTools/VistaStreams.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "VistaStreams.h"
 
@@ -507,7 +507,7 @@ VistaColorOutstream::CONSOLE_COLOR VistaColorOutstream::GetConsoleColorFromStrin
 	std::string sCleanedName = VistaConversion::StringToUpper( sName );
 	for( int nColorIndex = 0; nColorIndex < CC_NUM_COLORS; ++nColorIndex )
 	{
-		if( sName == S_aColorNames[nColorIndex] )
+		if( sCleanedName == S_aColorNames[nColorIndex] )
 			return CONSOLE_COLOR( nColorIndex );
 	}
 	return CONSOLE_COLOR( -1 );
@@ -747,7 +747,7 @@ std::string VistaPrefixOutstream::GetPrefixString() const
 	return m_pBuffer->GetPrefix();
 }
 
-void VistaPrefixOutstream::SetPrefixString( const std::string sPrefix )
+void VistaPrefixOutstream::SetPrefixString( const std::string& sPrefix )
 {
 	m_pBuffer->SetPrefix( sPrefix );
 }
diff --git a/VistaCoreLibs/VistaTools/VistaStreams.h b/VistaCoreLibs/VistaTools/VistaStreams.h
index ba8a3dba777800885aae5e6a0b25dd9138b0a2cf..84c198ce0d62b32d79e94dca2f3c88b70cc2a84c 100644
--- a/VistaCoreLibs/VistaTools/VistaStreams.h
+++ b/VistaCoreLibs/VistaTools/VistaStreams.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTASTREAMS_H
 #define _VISTASTREAMS_H
@@ -185,7 +185,7 @@ public:
 	void SetPrefixWithIndent( const bool bSet );
 
 	std::string GetPrefixString() const;
-	void SetPrefixString( const std::string sPrefix );
+	void SetPrefixString( const std::string& sPrefix );
 
 	std::ostream* GetOriginalStream() const;
 	void SetOriginalStream( std::ostream* pStream );
diff --git a/VistaCoreLibs/VistaTools/VistaToolsConfig.h b/VistaCoreLibs/VistaTools/VistaToolsConfig.h
index 73166e50500c8ee891f00b4ae4dbdfc4ee22596c..27adface43ae4d193d8551e63d01376cdf608fbe 100644
--- a/VistaCoreLibs/VistaTools/VistaToolsConfig.h
+++ b/VistaCoreLibs/VistaTools/VistaToolsConfig.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATOOLSCONFIG_H
 #define _VISTATOOLSCONFIG_H
diff --git a/VistaCoreLibs/VistaTools/VistaToolsStd.h b/VistaCoreLibs/VistaTools/VistaToolsStd.h
index ca3f19f605ce0f66bfc5f41cec779626dd188d64..decca3a985cae3e3a84e8b3ee0e2d0e92916a2f9 100644
--- a/VistaCoreLibs/VistaTools/VistaToolsStd.h
+++ b/VistaCoreLibs/VistaTools/VistaToolsStd.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATOOLSSTD_H
 #define _VISTATOOLSSTD_H
diff --git a/VistaCoreLibs/VistaTools/VistaTopologyGraph.h b/VistaCoreLibs/VistaTools/VistaTopologyGraph.h
index 8d20728abbe686f636db842e5311fbf309a48389..0f43260591f98cb0032f312fd1bb696e3f0aeb5b 100644
--- a/VistaCoreLibs/VistaTools/VistaTopologyGraph.h
+++ b/VistaCoreLibs/VistaTools/VistaTopologyGraph.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VISTATOPOLOGYGRAPH_H
 #define _VISTATOPOLOGYGRAPH_H
diff --git a/VistaCoreLibs/VistaTools/VistaVoxelOctree.h b/VistaCoreLibs/VistaTools/VistaVoxelOctree.h
index e14035b14df3b32c9ba77e6aac2e2c751479c950..09fd76c60bd00659afb72a5879c706125a1b6bea 100644
--- a/VistaCoreLibs/VistaTools/VistaVoxelOctree.h
+++ b/VistaCoreLibs/VistaTools/VistaVoxelOctree.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef	CVISTAVOXELOCTREE_H
 #define CVISTAVOXELOCTREE_H
diff --git a/VistaCoreLibs/VistaTools/_SourceFiles.cmake b/VistaCoreLibs/VistaTools/_SourceFiles.cmake
index 25f5733aa920d1381a4b0aa81f2e6261dbfa346e..b0109f7cc8c5b21c8f343fc5ef6007139d67fd39 100644
--- a/VistaCoreLibs/VistaTools/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaTools/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaCoreLibs/VistaTools/tinyXML/_SourceFiles.cmake b/VistaCoreLibs/VistaTools/tinyXML/_SourceFiles.cmake
index 217aa000bad57677892ded45d7310d9e5dcbd3e9..c7003ba09940c465b2fd714b35141ac95e820f2b 100644
--- a/VistaCoreLibs/VistaTools/tinyXML/_SourceFiles.cmake
+++ b/VistaCoreLibs/VistaTools/tinyXML/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "./tinyXML" )
 set( RelativeSourceGroup "Source Files\\tinyXML" )
diff --git a/VistaCoreLibs/VistaTools/tinyXML/tinystr.cpp b/VistaCoreLibs/VistaTools/tinyXML/tinystr.cpp
index c716c9156d7163e488b731bc805efea50f7d334c..ab0e1b5cfd7eebad21e3d2d9561e375ad2d88add 100644
--- a/VistaCoreLibs/VistaTools/tinyXML/tinystr.cpp
+++ b/VistaCoreLibs/VistaTools/tinyXML/tinystr.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*
 www.sourceforge.net/projects/tinyxml
diff --git a/VistaCoreLibs/VistaTools/tinyXML/tinystr.h b/VistaCoreLibs/VistaTools/tinyXML/tinystr.h
index 45c45c6e143469d0358a98f3b5482b5d75d9a3e1..964ee748f26a8b903400dbf0bdc61362a5219158 100644
--- a/VistaCoreLibs/VistaTools/tinyXML/tinystr.h
+++ b/VistaCoreLibs/VistaTools/tinyXML/tinystr.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*
 www.sourceforge.net/projects/tinyxml
diff --git a/VistaCoreLibs/VistaTools/tinyXML/tinyxml.cpp b/VistaCoreLibs/VistaTools/tinyXML/tinyxml.cpp
index 4caf74a6cc797384302a6730e13a00b5c8945f1c..9f2fe7b62dcda6d85976dd47386b1db902a98625 100644
--- a/VistaCoreLibs/VistaTools/tinyXML/tinyxml.cpp
+++ b/VistaCoreLibs/VistaTools/tinyXML/tinyxml.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*
 www.sourceforge.net/projects/tinyxml
diff --git a/VistaCoreLibs/VistaTools/tinyXML/tinyxml.h b/VistaCoreLibs/VistaTools/tinyXML/tinyxml.h
index 8d98c42356691cb35163b6d0c7a1024c0d358c95..c52ac0dd58988e826c2502cd6acbadbbc3837244 100644
--- a/VistaCoreLibs/VistaTools/tinyXML/tinyxml.h
+++ b/VistaCoreLibs/VistaTools/tinyXML/tinyxml.h
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*
 www.sourceforge.net/projects/tinyxml
diff --git a/VistaCoreLibs/VistaTools/tinyXML/tinyxmlerror.cpp b/VistaCoreLibs/VistaTools/tinyXML/tinyxmlerror.cpp
index 23b9d5724b897ef910e3a805a082030b2803c128..d5e3da52ac7265190e9074585bb86ff25663824c 100644
--- a/VistaCoreLibs/VistaTools/tinyXML/tinyxmlerror.cpp
+++ b/VistaCoreLibs/VistaTools/tinyXML/tinyxmlerror.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*
 www.sourceforge.net/projects/tinyxml
diff --git a/VistaCoreLibs/VistaTools/tinyXML/tinyxmlparser.cpp b/VistaCoreLibs/VistaTools/tinyXML/tinyxmlparser.cpp
index 930687f204792d0a77971338d839a77335950ede..35b147efd42c1aaf46db70788f4b80280c538ee6 100644
--- a/VistaCoreLibs/VistaTools/tinyXML/tinyxmlparser.cpp
+++ b/VistaCoreLibs/VistaTools/tinyXML/tinyxmlparser.cpp
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 /*
 www.sourceforge.net/projects/tinyxml
diff --git a/VistaDemo/01KeyboardDemo/CMakeLists.txt b/VistaDemo/01KeyboardDemo/CMakeLists.txt
index 9997f4fdb5289745ee3a49207106fac7ddd98004..84b78f349b7ffaee5f60b9515020d2d472e86198 100644
--- a/VistaDemo/01KeyboardDemo/CMakeLists.txt
+++ b/VistaDemo/01KeyboardDemo/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id$
 
 cmake_minimum_required( VERSION 2.8 )
 if( NOT VISTADEMO_COMMON_BUILD )
@@ -6,12 +5,10 @@ if( NOT VISTADEMO_COMMON_BUILD )
 
 	list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
 	include( VistaCommon )
-	
-	vista_use_package( VistaCoreLibs HEAD REQUIRED VistaKernel FIND_DEPENDENCIES )
-else()
-	vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 endif()
 
+vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
+
 # Including the source files of all source subfolders recursively
 include( "./_SourceFiles.cmake" )
 
@@ -19,9 +16,11 @@ add_executable( 01KeyboardDemo ${ProjectSources} )
 target_link_libraries( 01KeyboardDemo
 	${VISTA_USE_PACKAGE_LIBRARIES} # contains all libraries from vista_use_package() calls
 )
-#vista_configure_app( 01KeyboardDemo COPY_EXECUTABLE_TO "${CMAKE_INSTALL_PREFIX}/bin" )
+
 vista_configure_app( 01KeyboardDemo )
 vista_install( 01KeyboardDemo )
 vista_create_default_info_file( 01KeyboardDemo )
-
-
+if( VISTA_COMMON_BUILD )
+	set_target_properties( 01KeyboardDemo PROPERTIES FOLDER "VistaDemo" )
+	add_dependencies( 01KeyboardDemo VistaKernel )
+endif()
diff --git a/VistaDemo/01KeyboardDemo/_SourceFiles.cmake b/VistaDemo/01KeyboardDemo/_SourceFiles.cmake
index 1497e621e2eef3a5f144b7c35036e78a93143da8..b5f5dadd1e2dabe2674f0e5a3ac0879b9b689e4f 100644
--- a/VistaDemo/01KeyboardDemo/_SourceFiles.cmake
+++ b/VistaDemo/01KeyboardDemo/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id: $
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaDemo/01KeyboardDemo/main.cpp b/VistaDemo/01KeyboardDemo/main.cpp
index 9213bbe2fa5bbfd3257f185f60e8706a6d830069..a7a80c24b2d25abf99c4b3d5c891cf21a425908c 100644
--- a/VistaDemo/01KeyboardDemo/main.cpp
+++ b/VistaDemo/01KeyboardDemo/main.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include <VistaKernel/VistaSystem.h>
 #include <VistaKernel/InteractionManager/VistaKeyboardSystemControl.h>
diff --git a/VistaDemo/02GeometryDemo/CMakeLists.txt b/VistaDemo/02GeometryDemo/CMakeLists.txt
index c0e32b6e66ddb7155397dd0ff4ba48410f2dea8c..d846244eb8c7d4897eafad40030d936ef159b728 100644
--- a/VistaDemo/02GeometryDemo/CMakeLists.txt
+++ b/VistaDemo/02GeometryDemo/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id$
 
 cmake_minimum_required( VERSION 2.8 )
 if( NOT VISTADEMO_COMMON_BUILD )
@@ -6,11 +5,9 @@ if( NOT VISTADEMO_COMMON_BUILD )
 
 	list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
 	include( VistaCommon )
-	
-	vista_use_package( VistaCoreLibs HEAD REQUIRED VistaKernel FIND_DEPENDENCIES )
-else()
-	vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
-endif( )
+endif()
+
+vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 
 
 # Including the source files of all source subfolders recursively
@@ -24,4 +21,7 @@ target_link_libraries( 02GeometryDemo
 vista_configure_app( 02GeometryDemo )
 vista_install( 02GeometryDemo )
 vista_create_default_info_file( 02GeometryDemo )
-
+if( VISTA_COMMON_BUILD )
+	set_target_properties( 02GeometryDemo PROPERTIES FOLDER "VistaDemo" )
+	add_dependencies( 02GeometryDemo VistaKernel )
+endif()
diff --git a/VistaDemo/02GeometryDemo/GeometryDemoAppl.cpp b/VistaDemo/02GeometryDemo/GeometryDemoAppl.cpp
index 137a0e21a28d5c11636b4b99dc75a3a2d1552e52..2be05481e00bda209830d271603122fe86ec5bca 100644
--- a/VistaDemo/02GeometryDemo/GeometryDemoAppl.cpp
+++ b/VistaDemo/02GeometryDemo/GeometryDemoAppl.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "GeometryDemoAppl.h"
 
@@ -47,6 +45,14 @@
 /*============================================================================*/
 GeometryDemoAppl::GeometryDemoAppl()
 : m_pVistaSystem( NULL )
+, m_pPlane( NULL )
+, m_pBox( NULL )
+, m_pDisk( NULL )
+, m_pCone( NULL )
+, m_pTorus( NULL )
+, m_pEllipsoid( NULL )
+, m_pSphere( NULL )
+, m_pTriangle( NULL )
 {
 }
 
diff --git a/VistaDemo/02GeometryDemo/GeometryDemoAppl.h b/VistaDemo/02GeometryDemo/GeometryDemoAppl.h
index 6bf3a1a76944c603e68229012eb0de6018b3dd55..d25fb5b40d8e2808f69bbdaa61a0daaa2117c2a7 100644
--- a/VistaDemo/02GeometryDemo/GeometryDemoAppl.h
+++ b/VistaDemo/02GeometryDemo/GeometryDemoAppl.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 /*============================================================================*/
 /*                                                                            */
diff --git a/VistaDemo/02GeometryDemo/_SourceFiles.cmake b/VistaDemo/02GeometryDemo/_SourceFiles.cmake
index 0fd9882d3e31efedff931e4848c48be5fd00aa08..982189b06240f4a47c97b636988adb4bed0affe1 100644
--- a/VistaDemo/02GeometryDemo/_SourceFiles.cmake
+++ b/VistaDemo/02GeometryDemo/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id: $
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaDemo/02GeometryDemo/main.cpp b/VistaDemo/02GeometryDemo/main.cpp
index 1b64778e4db01e4914bcd9e4f9b71c3b7262a1bb..ce1f9eb51254766646c94a775bfc834fc8478964 100644
--- a/VistaDemo/02GeometryDemo/main.cpp
+++ b/VistaDemo/02GeometryDemo/main.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "GeometryDemoAppl.h"
 
diff --git a/VistaDemo/03TextDemo/CMakeLists.txt b/VistaDemo/03TextDemo/CMakeLists.txt
index c4a40f81e1dbed46b9baf06b73c13deff0606569..8ef90ac012dc1318101228fe58dbd2bb74d44f2f 100644
--- a/VistaDemo/03TextDemo/CMakeLists.txt
+++ b/VistaDemo/03TextDemo/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id$
 
 cmake_minimum_required( VERSION 2.8 )
 if( NOT VISTADEMO_COMMON_BUILD )
@@ -6,12 +5,9 @@ if( NOT VISTADEMO_COMMON_BUILD )
 
 	list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
 	include( VistaCommon )
-	
-	vista_use_package( VistaCoreLibs HEAD REQUIRED VistaKernel FIND_DEPENDENCIES )
-else()
-	vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
-endif( )
+endif()
 
+vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 
 # Including the source files of all source subfolders recursively
 include( "./_SourceFiles.cmake" )
@@ -24,3 +20,7 @@ target_link_libraries( 03TextDemo
 vista_configure_app( 03TextDemo )
 vista_install( 03TextDemo )
 vista_create_default_info_file( 03TextDemo )
+if( VISTA_COMMON_BUILD )
+	set_target_properties( 03TextDemo PROPERTIES FOLDER "VistaDemo" )
+	add_dependencies( 03TextDemo VistaKernel )
+endif()
\ No newline at end of file
diff --git a/VistaDemo/03TextDemo/TextDemoAppl.cpp b/VistaDemo/03TextDemo/TextDemoAppl.cpp
index f106ade50bb10f3091b1b8569ea64f40a470c590..a93c17bfcaa965e8108029c8e5f859a2e9b427f6 100644
--- a/VistaDemo/03TextDemo/TextDemoAppl.cpp
+++ b/VistaDemo/03TextDemo/TextDemoAppl.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -54,23 +54,12 @@ TextDemoAppl::TextDemoAppl()
 
 TextDemoAppl::~TextDemoAppl()
 {
-	if (m_pOverlay3D != nullptr)
-		delete m_pOverlay3D;
-
-	if (m_pSimpleTextOverlay != nullptr)
-		delete m_pSimpleTextOverlay;
-
-	if (m_pTextEntity1 != nullptr)
-		delete m_pTextEntity1;
-
-	if (m_pTextEntity2 != nullptr)
-		delete m_pTextEntity2;
-
-	if (m_pTextEntity3 != nullptr)
-		delete m_pTextEntity3;
-
-	if (m_pVistaSystem != nullptr)
-		delete m_pVistaSystem;
+	delete m_pOverlay3D;
+	delete m_pSimpleTextOverlay;
+	delete m_pTextEntity1;
+	delete m_pTextEntity2;
+	delete m_pTextEntity3;
+	delete m_pVistaSystem;
 }
 
 /*============================================================================*/
@@ -78,7 +67,7 @@ TextDemoAppl::~TextDemoAppl()
 /*============================================================================*/
 bool TextDemoAppl::Init( int argc, char  *argv[] )
 {
-	m_pVistaSystem = new VistaSystem;
+	m_pVistaSystem = new VistaSystem();
 
 	std::list<std::string> liSearchPaths;
 
diff --git a/VistaDemo/03TextDemo/TextDemoAppl.h b/VistaDemo/03TextDemo/TextDemoAppl.h
index 3e97dbaa005eddbe48176f6f4adf6913eb13b4b1..d0b94fb3fa18f73e1868bc86bcb8355ffd8bd675 100644
--- a/VistaDemo/03TextDemo/TextDemoAppl.h
+++ b/VistaDemo/03TextDemo/TextDemoAppl.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 /*============================================================================*/
 /*                                                                            */
diff --git a/VistaDemo/03TextDemo/_SourceFiles.cmake b/VistaDemo/03TextDemo/_SourceFiles.cmake
index f42738021c9c8f8d3b09c8d1eddd3a9170ca2da1..5eda59f836ccbf5cffaba891d77ff3f498edf6e3 100644
--- a/VistaDemo/03TextDemo/_SourceFiles.cmake
+++ b/VistaDemo/03TextDemo/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id: $
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaDemo/03TextDemo/main.cpp b/VistaDemo/03TextDemo/main.cpp
index 34e4e16ef6d8fa4bd952a5f25bf2a3ebae2e6112..a207ba2aca5b14777fb3ef75fea35e8092efc061 100644
--- a/VistaDemo/03TextDemo/main.cpp
+++ b/VistaDemo/03TextDemo/main.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
-* $Id$
-*/
+
 
 #include "TextDemoAppl.h"
 
diff --git a/VistaDemo/04LoadDemo/CMakeLists.txt b/VistaDemo/04LoadDemo/CMakeLists.txt
index bbe581c08c1504b454d2cc1b69f9b24aee18b79e..f272b63a79c55abf2acd30471f821137ea6774c8 100644
--- a/VistaDemo/04LoadDemo/CMakeLists.txt
+++ b/VistaDemo/04LoadDemo/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id$
 
 cmake_minimum_required( VERSION 2.8 )
 if( NOT VISTADEMO_COMMON_BUILD )
@@ -6,12 +5,9 @@ if( NOT VISTADEMO_COMMON_BUILD )
 
 	list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
 	include( VistaCommon )
-	
-	vista_use_package( VistaCoreLibs HEAD REQUIRED VistaKernel FIND_DEPENDENCIES )
-else()
-	vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
-endif( )
+endif()
 
+vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 
 # Including the source files of all source subfolders recursively
 include( "./_SourceFiles.cmake" )
@@ -24,3 +20,7 @@ target_link_libraries( 04LoadDemo
 vista_configure_app( 04LoadDemo )
 vista_install( 04LoadDemo )
 vista_create_default_info_file( 04LoadDemo )
+if( VISTA_COMMON_BUILD )
+	set_target_properties( 04LoadDemo PROPERTIES FOLDER "VistaDemo" )
+	add_dependencies( 04LoadDemo VistaKernel )
+endif()
diff --git a/VistaDemo/04LoadDemo/_SourceFiles.cmake b/VistaDemo/04LoadDemo/_SourceFiles.cmake
index 1497e621e2eef3a5f144b7c35036e78a93143da8..b5f5dadd1e2dabe2674f0e5a3ac0879b9b689e4f 100644
--- a/VistaDemo/04LoadDemo/_SourceFiles.cmake
+++ b/VistaDemo/04LoadDemo/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id: $
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaDemo/04LoadDemo/main.cpp b/VistaDemo/04LoadDemo/main.cpp
index e69fe68c37123da971e9bbae5d098afdb84a1174..a3a43714740e91adc504bf5feaba4308d028d641 100644
--- a/VistaDemo/04LoadDemo/main.cpp
+++ b/VistaDemo/04LoadDemo/main.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 // include header here
 
diff --git a/VistaDemo/05InteractionDemo/CMakeLists.txt b/VistaDemo/05InteractionDemo/CMakeLists.txt
index 6c5efd843e7dfede7e896dfa3abecf101a09ffcb..85dc5833d4de68de588327c9ab0e82feaecf49c8 100644
--- a/VistaDemo/05InteractionDemo/CMakeLists.txt
+++ b/VistaDemo/05InteractionDemo/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id$
 
 cmake_minimum_required( VERSION 2.8 )
 if( NOT VISTADEMO_COMMON_BUILD )
@@ -6,19 +5,13 @@ if( NOT VISTADEMO_COMMON_BUILD )
 
 	list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
 	include( VistaCommon )
-endif( NOT VISTADEMO_COMMON_BUILD )
+endif()
+
+vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 
 #include the sener sub-app into the build
 add_subdirectory( Sender )
 
-
-if( NOT VISTADEMO_COMMON_BUILD )
-	vista_use_package( VistaCoreLibs HEAD REQUIRED VistaKernel FIND_DEPENDENCIES )
-else()
-	vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
-endif()
-
-
 # Including the source files of all source subfolders recursively
 include( "./_SourceFiles.cmake" )
 
@@ -30,4 +23,7 @@ target_link_libraries( 05InteractionDemo
 vista_configure_app( 05InteractionDemo )
 vista_install( 05InteractionDemo )
 vista_create_default_info_file( 05InteractionDemo )
-
+if( VISTA_COMMON_BUILD )
+	set_target_properties( 05InteractionDemo PROPERTIES FOLDER "VistaDemo" )
+	add_dependencies( 05InteractionDemo VistaKernel )
+endif()
diff --git a/VistaDemo/05InteractionDemo/KeyboardInteraction.cpp b/VistaDemo/05InteractionDemo/KeyboardInteraction.cpp
index 8e1e1c462775685af4ef03471b1e1c1f3ec03a43..4f925181e9458569ab095cccb83dfe94aafe2942 100644
--- a/VistaDemo/05InteractionDemo/KeyboardInteraction.cpp
+++ b/VistaDemo/05InteractionDemo/KeyboardInteraction.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 // STL stuff
 #include <iostream>
diff --git a/VistaDemo/05InteractionDemo/KeyboardInteraction.h b/VistaDemo/05InteractionDemo/KeyboardInteraction.h
index 46fa8b51dd7888dabeb301f19320320c0473f74b..8a4e284773487e615a54786f175a21ab65dc2953 100644
--- a/VistaDemo/05InteractionDemo/KeyboardInteraction.h
+++ b/VistaDemo/05InteractionDemo/KeyboardInteraction.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef _KEYBOARDINTERACTION_H
 #define _KEYBOARDINTERACTION_H
diff --git a/VistaDemo/05InteractionDemo/MsgPortUser.cpp b/VistaDemo/05InteractionDemo/MsgPortUser.cpp
index b72441371bd39ab38ac952a6d858992df36cd7d9..7124a64d8cfeeb9d485ccc35a14a8637558bd42a 100644
--- a/VistaDemo/05InteractionDemo/MsgPortUser.cpp
+++ b/VistaDemo/05InteractionDemo/MsgPortUser.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
-* $Id$
-*/
+
 
 // STL stuff
 #include <iostream>
diff --git a/VistaDemo/05InteractionDemo/MsgPortUser.h b/VistaDemo/05InteractionDemo/MsgPortUser.h
index bc95d54c976052af0f7a51c2bfa8a4b2d6d22bf9..77895ececaecdaf701f507b0b5c094772b15a20d 100644
--- a/VistaDemo/05InteractionDemo/MsgPortUser.h
+++ b/VistaDemo/05InteractionDemo/MsgPortUser.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 #ifndef _MSGPORTUSER_H
 #define _MSGPORTUSER_H
 
diff --git a/VistaDemo/05InteractionDemo/Sender/CMakeLists.txt b/VistaDemo/05InteractionDemo/Sender/CMakeLists.txt
index dd5df96b32af04bb707d7fa193ad58b2b173e42b..dbe4955aee334239a7f711c7be25eafb17c8f3d3 100644
--- a/VistaDemo/05InteractionDemo/Sender/CMakeLists.txt
+++ b/VistaDemo/05InteractionDemo/Sender/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id$
 
 cmake_minimum_required( VERSION 2.8 )
 if( NOT VISTADEMO_COMMON_BUILD )
@@ -6,12 +5,9 @@ if( NOT VISTADEMO_COMMON_BUILD )
 
 	list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
 	include( VistaCommon )
-	
-	vista_use_package( VistaCoreLibs HEAD REQUIRED VistaKernel FIND_DEPENDENCIES )
-else()
-	vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 endif()
 
+vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 
 # Including the source files of all source subfolders recursively
 include( "./_SourceFiles.cmake" )
@@ -23,5 +19,8 @@ target_link_libraries( 05InteractionDemoSender
 
 vista_configure_app( 05InteractionDemoSender )
 vista_create_default_info_file( 05InteractionDemoSender )
-
+if( VISTA_COMMON_BUILD )
+	set_target_properties( 05InteractionDemoSender PROPERTIES FOLDER "VistaDemo" )
+	add_dependencies( 05InteractionDemoSender VistaKernel )
+endif()
 
diff --git a/VistaDemo/05InteractionDemo/Sender/_SourceFiles.cmake b/VistaDemo/05InteractionDemo/Sender/_SourceFiles.cmake
index 59184080e0b1bbcc0e479cec933bdd2d9ff45d6e..a3211785752b5ff44b03c8cf5b317ba27ce524ca 100644
--- a/VistaDemo/05InteractionDemo/Sender/_SourceFiles.cmake
+++ b/VistaDemo/05InteractionDemo/Sender/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id: $
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaDemo/05InteractionDemo/Sender/sender.cpp b/VistaDemo/05InteractionDemo/Sender/sender.cpp
index 168512de1cd7b30aff796c0f6910b6bf9caef8bd..5f789684c7c774cf6ee4647b56214273d2d2248c 100644
--- a/VistaDemo/05InteractionDemo/Sender/sender.cpp
+++ b/VistaDemo/05InteractionDemo/Sender/sender.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
-* $Id$
-*/
+
 #include <VistaInterProcComm/Connections/VistaMsgChannel.h>
 #include <VistaInterProcComm/Connections/VistaConnectionIP.h>
 
diff --git a/VistaDemo/05InteractionDemo/_SourceFiles.cmake b/VistaDemo/05InteractionDemo/_SourceFiles.cmake
index 8a48a35a1dd086b9ff0f204455199e9086683a8e..76adcc38f365fd314acb999def45a778f512218b 100644
--- a/VistaDemo/05InteractionDemo/_SourceFiles.cmake
+++ b/VistaDemo/05InteractionDemo/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id: $
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaDemo/05InteractionDemo/configfiles/display_desktop.ini b/VistaDemo/05InteractionDemo/configfiles/display_desktop.ini
index dc207ac6d719cdbed7e4fc4e3cc292b4e6bc0392..8948ef4d333793dcccc6e6bcc0e921fb8ea7ca5e 100644
--- a/VistaDemo/05InteractionDemo/configfiles/display_desktop.ini
+++ b/VistaDemo/05InteractionDemo/configfiles/display_desktop.ini
@@ -1,4 +1,4 @@
-# $Id$
+
 # =============
 # DISPLAYSYSTEM
 # =============
diff --git a/VistaDemo/05InteractionDemo/configfiles/interaction_desktop.ini b/VistaDemo/05InteractionDemo/configfiles/interaction_desktop.ini
index 683486503f3def56f96b880ca4be94cf8e6b57d2..ae94cefbadc8114f3f9789bee9b5b801e36ee065 100644
--- a/VistaDemo/05InteractionDemo/configfiles/interaction_desktop.ini
+++ b/VistaDemo/05InteractionDemo/configfiles/interaction_desktop.ini
@@ -1,4 +1,4 @@
-# $Id$
+
 [SYSTEM]
 # DRIVERPLUGINDIRS describes where the plugin dlls for drivers can be found
 # Usually, the VISTACORELIBS_DRIVER_PLUGIN_DIRS environment variable can be used,
diff --git a/VistaDemo/05InteractionDemo/configfiles/vista.ini b/VistaDemo/05InteractionDemo/configfiles/vista.ini
index 9bd82f9f7dbebc10d3cc46315a265b38be23e566..80c73c23f3f29099ff5d8edb98c0e4cd2b149880 100644
--- a/VistaDemo/05InteractionDemo/configfiles/vista.ini
+++ b/VistaDemo/05InteractionDemo/configfiles/vista.ini
@@ -1,7 +1,7 @@
 #######################################################################
 #        V I S T A     I N I T I A L I Z A T I O N     F I L E        #
 #######################################################################
-# $Id$
+
 #######################################################################
 [SYSTEM]
 # include other ini files
diff --git a/VistaDemo/05InteractionDemo/configfiles/xml/keyboard_standardinput.xml b/VistaDemo/05InteractionDemo/configfiles/xml/keyboard_standardinput.xml
index 6534fe9273794b47d2431d4e7b8135040e3eb787..79239b534383e97786c5d683e8c799a091ea6a76 100644
--- a/VistaDemo/05InteractionDemo/configfiles/xml/keyboard_standardinput.xml
+++ b/VistaDemo/05InteractionDemo/configfiles/xml/keyboard_standardinput.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
+
 <module>
 	<nodespace>
 	</nodespace>
diff --git a/VistaDemo/05InteractionDemo/configfiles/xml/mouse_trackball.xml b/VistaDemo/05InteractionDemo/configfiles/xml/mouse_trackball.xml
index 2e9a3d48912a30ecc9a988d2878dd07012aeedd8..fe8d63393c57ef022e18de6a46ad4aa1fa05f768 100644
--- a/VistaDemo/05InteractionDemo/configfiles/xml/mouse_trackball.xml
+++ b/VistaDemo/05InteractionDemo/configfiles/xml/mouse_trackball.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
+
 <!--=========================================================================-->
 <!-- This nodes implements the default mouse navigation with trackball,      -->
 <!-- panning and zooming. The behavior is continous. You can scale the speed -->
diff --git a/VistaDemo/05InteractionDemo/configfiles/xml/mouse_trackball_continuous.xml b/VistaDemo/05InteractionDemo/configfiles/xml/mouse_trackball_continuous.xml
index 92d6a1f7c62fa69755bbb39bd6ba70682b8f000e..e65a849d4018f7b16bb55a9f6165badd902cbec7 100644
--- a/VistaDemo/05InteractionDemo/configfiles/xml/mouse_trackball_continuous.xml
+++ b/VistaDemo/05InteractionDemo/configfiles/xml/mouse_trackball_continuous.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
+
 <!--=========================================================================-->
 <!-- This nodes implements the default mouse navigation with trackball,      -->
 <!-- panning and zooming. The behavior is continous. You can scale the speed -->
diff --git a/VistaDemo/05InteractionDemo/configfiles/xml/navigator_flystick.xml b/VistaDemo/05InteractionDemo/configfiles/xml/navigator_flystick.xml
index a38aab22fc1671bdde74e1727d6d7b698a81f8bc..edf840a0cf3890283266ded2406f081f21df7237 100644
--- a/VistaDemo/05InteractionDemo/configfiles/xml/navigator_flystick.xml
+++ b/VistaDemo/05InteractionDemo/configfiles/xml/navigator_flystick.xml
@@ -1,4 +1,4 @@
-<!-- $Id: navigator_flystick.xml 22882 2011-08-08 15:54:40Z dr165799 $ -->
+
 <module>
 	<nodespace>
 	</nodespace>
diff --git a/VistaDemo/05InteractionDemo/configfiles/xml/spacenavigator_navigation.xml b/VistaDemo/05InteractionDemo/configfiles/xml/spacenavigator_navigation.xml
index c3b531d9817c6fb7c7456f4d7efc6d9fa860368d..1505fa45a166370bca33a9237f68d9adf90284a6 100644
--- a/VistaDemo/05InteractionDemo/configfiles/xml/spacenavigator_navigation.xml
+++ b/VistaDemo/05InteractionDemo/configfiles/xml/spacenavigator_navigation.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
+
 <module>
 	<nodespace></nodespace>
 	<graph>
diff --git a/VistaDemo/05InteractionDemo/configfiles/xml/ucp_cave.xml b/VistaDemo/05InteractionDemo/configfiles/xml/ucp_cave.xml
index 8f3fbb14bb147c08d8761df9cfeec609e1f00204..daae8cd07a8e21c77a2015ebe29e85658033afdd 100644
--- a/VistaDemo/05InteractionDemo/configfiles/xml/ucp_cave.xml
+++ b/VistaDemo/05InteractionDemo/configfiles/xml/ucp_cave.xml
@@ -1,4 +1,4 @@
-<!-- $Id: ucp_cave.xml 22882 2011-08-08 15:54:40Z dr165799 $ -->
+
 <module>
 	<nodespace>
 	</nodespace>
diff --git a/VistaDemo/05InteractionDemo/configfiles/xml/ucp_picasso.xml b/VistaDemo/05InteractionDemo/configfiles/xml/ucp_picasso.xml
index 8595b87305b85ce87accd8cdf6692d9881a124c7..2cc1c5ab0cc73cc13d497a3f5f3ebc43cfd7897e 100644
--- a/VistaDemo/05InteractionDemo/configfiles/xml/ucp_picasso.xml
+++ b/VistaDemo/05InteractionDemo/configfiles/xml/ucp_picasso.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
+
 <module>
 	<nodespace>
 	</nodespace>
diff --git a/VistaDemo/05InteractionDemo/main.cpp b/VistaDemo/05InteractionDemo/main.cpp
index 58963bc42381430fe1a9f0f48703fad20f0ae102..c4740b5c0e9ce891a8a27e28c5994a49d3431a1d 100644
--- a/VistaDemo/05InteractionDemo/main.cpp
+++ b/VistaDemo/05InteractionDemo/main.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 
 /*============================================================================*/
diff --git a/VistaDemo/06CameraControlDemo/CMakeLists.txt b/VistaDemo/06CameraControlDemo/CMakeLists.txt
index 1ef9ebc88582aab5f2a0553b7b7992b9b071a2a6..1108e3248f062857dfc43e4d78f974be227052e7 100644
--- a/VistaDemo/06CameraControlDemo/CMakeLists.txt
+++ b/VistaDemo/06CameraControlDemo/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id$
 
 cmake_minimum_required( VERSION 2.8 )
 if( NOT VISTADEMO_COMMON_BUILD )
@@ -6,12 +5,10 @@ if( NOT VISTADEMO_COMMON_BUILD )
 
 	list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
 	include( VistaCommon )
-	
-	vista_use_package( VistaCoreLibs HEAD REQUIRED VistaKernel FIND_DEPENDENCIES )
-else()
-	vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 endif()
 
+vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
+
 
 # Including the source files of all source subfolders recursively
 include( "./_SourceFiles.cmake" )
@@ -24,4 +21,7 @@ target_link_libraries( 06CameraControlDemo
 vista_configure_app( 06CameraControlDemo )
 vista_install( 06CameraControlDemo )
 vista_create_default_info_file( 06CameraControlDemo )
-
+if( VISTA_COMMON_BUILD )
+	set_target_properties( 06CameraControlDemo PROPERTIES FOLDER "VistaDemo" )
+	add_dependencies( 06CameraControlDemo VistaKernel )
+endif()
diff --git a/VistaDemo/06CameraControlDemo/_SourceFiles.cmake b/VistaDemo/06CameraControlDemo/_SourceFiles.cmake
index 1497e621e2eef3a5f144b7c35036e78a93143da8..b5f5dadd1e2dabe2674f0e5a3ac0879b9b689e4f 100644
--- a/VistaDemo/06CameraControlDemo/_SourceFiles.cmake
+++ b/VistaDemo/06CameraControlDemo/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id: $
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaDemo/06CameraControlDemo/main.cpp b/VistaDemo/06CameraControlDemo/main.cpp
index 7c5a5375d62563e2ec3a1ea4e9c289fe0c54ed59..6c8c97b190a236470ac4b7c96070fbb68318cc31 100644
--- a/VistaDemo/06CameraControlDemo/main.cpp
+++ b/VistaDemo/06CameraControlDemo/main.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 // include header here
 
diff --git a/VistaDemo/07OverlayDemo/CMakeLists.txt b/VistaDemo/07OverlayDemo/CMakeLists.txt
index 26223d72898cf0c519e19e7d47502c792646e8d9..f363f66332dc86fb784c4f42d610e2cfd955cfb5 100644
--- a/VistaDemo/07OverlayDemo/CMakeLists.txt
+++ b/VistaDemo/07OverlayDemo/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id$
 
 cmake_minimum_required( VERSION 2.8 )
 if( NOT VISTADEMO_COMMON_BUILD )
@@ -6,12 +5,9 @@ if( NOT VISTADEMO_COMMON_BUILD )
 
 	list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
 	include( VistaCommon )
-	
-	vista_use_package( VistaCoreLibs HEAD REQUIRED VistaKernel FIND_DEPENDENCIES )
-else()
-	vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 endif()
 
+vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 
 # Including the source files of all source subfolders recursively
 include( "./_SourceFiles.cmake" )
@@ -24,4 +20,7 @@ target_link_libraries( 07OverlayDemo
 vista_configure_app( 07OverlayDemo )
 vista_install( 07OverlayDemo )
 vista_create_default_info_file( 07OverlayDemo )
-
+if( VISTA_COMMON_BUILD )
+	set_target_properties( 07OverlayDemo PROPERTIES FOLDER "VistaDemo" )
+	add_dependencies( 07OverlayDemo VistaKernel )
+endif()
diff --git a/VistaDemo/07OverlayDemo/_SourceFiles.cmake b/VistaDemo/07OverlayDemo/_SourceFiles.cmake
index 1497e621e2eef3a5f144b7c35036e78a93143da8..b5f5dadd1e2dabe2674f0e5a3ac0879b9b689e4f 100644
--- a/VistaDemo/07OverlayDemo/_SourceFiles.cmake
+++ b/VistaDemo/07OverlayDemo/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id: $
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaDemo/07OverlayDemo/main.cpp b/VistaDemo/07OverlayDemo/main.cpp
index 13c0c0bf46739d65afe19312ba809b1e64188445..e2dd70172f39d1af026683e0ddd91b745dc745ae 100644
--- a/VistaDemo/07OverlayDemo/main.cpp
+++ b/VistaDemo/07OverlayDemo/main.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 // include header here
 
@@ -135,7 +133,7 @@ class YawIndicatorOverlay : public IVistaSceneOverlay
 public:
 	YawIndicatorOverlay( VistaVirtualPlatform *pPlatform,
 							VistaDisplayManager* pDispManager,
-							const std::string sViewportName = "")
+							const std::string& sViewportName = "" )
 	: IVistaSceneOverlay( pDispManager, sViewportName )
 	, m_pPlatform(pPlatform)
 	, m_bEnabled( true )
diff --git a/VistaDemo/09EventDemo/CMakeLists.txt b/VistaDemo/09EventDemo/CMakeLists.txt
index 8179d8b3eee69a121fe984023e441f670b04da39..2cf807315c1fd5ff6525eaf621dcd876ebe69d68 100644
--- a/VistaDemo/09EventDemo/CMakeLists.txt
+++ b/VistaDemo/09EventDemo/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id$
 
 cmake_minimum_required( VERSION 2.8 )
 if( NOT VISTADEMO_COMMON_BUILD )
@@ -6,12 +5,9 @@ if( NOT VISTADEMO_COMMON_BUILD )
 
 	list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
 	include( VistaCommon )
-	
-	vista_use_package( VistaCoreLibs HEAD REQUIRED VistaKernel FIND_DEPENDENCIES )
-else()
-	vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 endif()
 
+vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 
 # Including the source files of all source subfolders recursively
 include( "./_SourceFiles.cmake" )
@@ -24,4 +20,7 @@ target_link_libraries( 09EventDemo
 vista_configure_app( 09EventDemo )
 vista_install( 09EventDemo )
 vista_create_default_info_file( 09EventDemo )
-
+if( VISTA_COMMON_BUILD )
+	set_target_properties( 09EventDemo PROPERTIES FOLDER "VistaDemo" )
+	add_dependencies( 09EventDemo VistaKernel )
+endif()
diff --git a/VistaDemo/09EventDemo/DemoEvent.cpp b/VistaDemo/09EventDemo/DemoEvent.cpp
index 78267e21107401bb7013062bb7956b3a37eb13f4..960ddc6dbfe481ac08809cef26ac558915a09549 100644
--- a/VistaDemo/09EventDemo/DemoEvent.cpp
+++ b/VistaDemo/09EventDemo/DemoEvent.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "DemoEvent.h"
 #include <iostream>
diff --git a/VistaDemo/09EventDemo/DemoEvent.h b/VistaDemo/09EventDemo/DemoEvent.h
index 01fed89ad525b5832a4be5b277838a83a6e2ee85..156e450396c022afe6e2bafabd4190854ab5a570 100644
--- a/VistaDemo/09EventDemo/DemoEvent.h
+++ b/VistaDemo/09EventDemo/DemoEvent.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef _DEMOEVENT_H
 #define _DEMOEVENT_H
diff --git a/VistaDemo/09EventDemo/DemoHandler.cpp b/VistaDemo/09EventDemo/DemoHandler.cpp
index d62740b4daead16001410091059b50f5f85adffc..4b4ba4aea95c7686a7ba4a76892c8e4ce2c65266 100644
--- a/VistaDemo/09EventDemo/DemoHandler.cpp
+++ b/VistaDemo/09EventDemo/DemoHandler.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "DemoHandler.h"
 #include "DemoEvent.h"
diff --git a/VistaDemo/09EventDemo/DemoHandler.h b/VistaDemo/09EventDemo/DemoHandler.h
index f28ec87dbf62ad1044e4682f16760a346e9013f4..e3dee629e2cb70936537c63e46f04a4acf26616a 100644
--- a/VistaDemo/09EventDemo/DemoHandler.h
+++ b/VistaDemo/09EventDemo/DemoHandler.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef _DEMOHANDLER_H
 #define _DEMOHANDLER_H
diff --git a/VistaDemo/09EventDemo/EventDemoAppl.cpp b/VistaDemo/09EventDemo/EventDemoAppl.cpp
index fbef6f23999f780ff389fe405c6646fb5fa2cd88..12f2d81db52ed352828480efdbe962bd621ca9e3 100644
--- a/VistaDemo/09EventDemo/EventDemoAppl.cpp
+++ b/VistaDemo/09EventDemo/EventDemoAppl.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include <VistaKernel/GraphicsManager/VistaGraphicsManager.h>
 #include <VistaKernel/GraphicsManager/VistaSceneGraph.h>
@@ -34,6 +32,7 @@
 #include <VistaKernel/EventManager/VistaSystemEvent.h>
 #include <VistaKernel/EventManager/VistaCentralEventHandler.h>
 #include <VistaKernel/EventManager/VistaEventObserver.h>
+#include <VistaKernel/EventManager/VistaEventManager.h>
 
 #include <VistaKernel/InteractionManager/VistaKeyboardSystemControl.h>
 #include <VistaKernel/InteractionManager/VistaInteractionManager.h>
@@ -48,6 +47,7 @@
 #include "ObserverRegisterCallback.h"
 #include "DemoEvent.h"
 #include "GreedyObserver.h"
+#include "DemoHandler.h"
 
 using namespace std;
 
@@ -95,7 +95,7 @@ EventDemoAppl::EventDemoAppl( int argc, char * argv[] )
 	pCtrl->BindAction('d', new ProcessCallback( ProcessCallback::DEMO_EVENT, m_pEventManager ),
 		"sending a demo event..." );
 
-	m_pEventHandler = new DemoHandler;
+	m_pEventHandler = new DemoHandler();
 	m_pEventManager->AddEventHandler( m_pEventHandler, iDemoEventType, iDemoEventId );
 
 	pCtrl->BindAction('t', new ObserverRegisterCallback(
@@ -103,10 +103,10 @@ EventDemoAppl::EventDemoAppl( int argc, char * argv[] )
 		VistaSystemEvent::GetTypeId() ),
 		"toggle time observer" );
 
-	// Register the GreedyObserver wich is always acitve
+	// Register the GreedyObserver which is always active
 	// NOTE: this observer fetches all events but do NOT print
 	// out a line for each event because this will be too much
-	m_pGreedyObserver = new GreedyObserver;
+	m_pGreedyObserver = new GreedyObserver();
 	m_pEventManager->RegisterObserver(m_pGreedyObserver, VistaEventManager::NVET_ALL);
 
 	if (m_pVistaSystem.GetDisplayManager()->GetDisplaySystem(0)==0)
diff --git a/VistaDemo/09EventDemo/EventDemoAppl.h b/VistaDemo/09EventDemo/EventDemoAppl.h
index bb6493f0f7dec1782dfb9ba05a1020a6b607b5b2..d4438f168d160e19940051ca3405bb76ee541ad4 100644
--- a/VistaDemo/09EventDemo/EventDemoAppl.h
+++ b/VistaDemo/09EventDemo/EventDemoAppl.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef _EVENTDEMOAPPL_H
 #define _EVENTDEMOAPPL_H
@@ -35,44 +33,30 @@
 /* INCLUDES                                                                   */
 /*============================================================================*/
 #include <VistaKernel/VistaSystem.h>
-#include <VistaKernel/EventManager/VistaEventManager.h>
-#include <VistaKernel/EventManager/VistaCentralEventHandler.h>
-#include "DemoHandler.h"
 
 /*============================================================================*/
 /* FORWARD DECLARATIONS                                                       */
 /*============================================================================*/
 class GreedyObserver;
+class DemoHandler;
 
 /*============================================================================*/
 /* CLASS DEFINITIONS                                                          */
 /*============================================================================*/
-/**
- * EventDemoAppl is only a template for own aplications based on ViSTA
- * 
- * @AUTHOR  Andreas Gerndt
- * @DATE    07.09.2001
- */    
 class EventDemoAppl
 {
 public:
-    // CONSTRUCTORS / DESTRUCTOR
-    EventDemoAppl( int argc = 0, char  *argv[] = NULL );
-    virtual ~EventDemoAppl();
-
-    // IMPLEMENTATION
-    void   Run  ();
-
-    // ANOTHER
-    void   CreateScene ();
-
+	EventDemoAppl( int argc = 0, char* argv[] = NULL );
+	virtual ~EventDemoAppl();
 
-// MEMBERS
+	void Run();
+	void CreateScene();
+	
 private:
-        VistaSystem					m_pVistaSystem;
-        DemoHandler*				m_pEventHandler;
-        VistaEventManager*			m_pEventManager;
-        GreedyObserver*				m_pGreedyObserver;
+	VistaSystem					m_pVistaSystem;
+	DemoHandler*				m_pEventHandler;
+	VistaEventManager*			m_pEventManager;
+	GreedyObserver*				m_pGreedyObserver;
 };
 
 
diff --git a/VistaDemo/09EventDemo/GreedyObserver.cpp b/VistaDemo/09EventDemo/GreedyObserver.cpp
index 94eb5ea639b926db3d7e85501c8873e7be0bf6ef..e7da07a61ff4086f7bc1bbba50eab9591b0e6424 100644
--- a/VistaDemo/09EventDemo/GreedyObserver.cpp
+++ b/VistaDemo/09EventDemo/GreedyObserver.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "GreedyObserver.h"
 #include <VistaKernel/InteractionManager/VistaInteractionEvent.h>
diff --git a/VistaDemo/09EventDemo/GreedyObserver.h b/VistaDemo/09EventDemo/GreedyObserver.h
index 2c93e517b10a98a82d80cea4bad96daa4be8e8ec..a34e4189d7dee16c1f80b439fca31bc4d038ba8c 100644
--- a/VistaDemo/09EventDemo/GreedyObserver.h
+++ b/VistaDemo/09EventDemo/GreedyObserver.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef _GREEDYOBSERVER_H
 #define _GREEDYOBSERVER_H
diff --git a/VistaDemo/09EventDemo/ObserverRegisterCallback.cpp b/VistaDemo/09EventDemo/ObserverRegisterCallback.cpp
index d7d829233f1c016d930ad85c2e75bc446a408ab3..ab61f7003b0dbf77e97750a14a4fa37f16a5656c 100644
--- a/VistaDemo/09EventDemo/ObserverRegisterCallback.cpp
+++ b/VistaDemo/09EventDemo/ObserverRegisterCallback.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "ObserverRegisterCallback.h"
 #include <VistaTools/VistaMemoryInfo.h>
diff --git a/VistaDemo/09EventDemo/ObserverRegisterCallback.h b/VistaDemo/09EventDemo/ObserverRegisterCallback.h
index 8cd38c30b32f8344ed58e48b951d665a014e8712..316aaa50b3b50d9a439e758caf65dcd4fd16f0af 100644
--- a/VistaDemo/09EventDemo/ObserverRegisterCallback.h
+++ b/VistaDemo/09EventDemo/ObserverRegisterCallback.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef _COBSERVERREGISTERCALLBACK_H
 #define _COBSERVERREGISTERCALLBACK_H
diff --git a/VistaDemo/09EventDemo/ProcessCallback.cpp b/VistaDemo/09EventDemo/ProcessCallback.cpp
index fc339c32ad7def89f07119e69e7e7eb2b55ca3ba..ca5e92486e82f96f54b5b866b4ae24bc12c958a7 100644
--- a/VistaDemo/09EventDemo/ProcessCallback.cpp
+++ b/VistaDemo/09EventDemo/ProcessCallback.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "ProcessCallback.h"
 #include <cmath>
@@ -38,8 +36,8 @@
 /*  CONSTRUCTORS / DESTRUCTOR                                                 */
 /*============================================================================*/
 ProcessCallback::ProcessCallback(int iEventType, VistaEventManager* pEventManager)
-	: m_iEventType(iEventType),
-		m_pEventManager(pEventManager)
+: m_iEventType(iEventType)
+, m_pEventManager(pEventManager)
 {
 }
 
@@ -66,10 +64,9 @@ bool ProcessCallback::Do()
 		m_pEventManager->ProcessEvent( NULL );
 		break;
 	case DEMO_EVENT:
-		m_pEvent = new DemoEvent();
-		m_pEventManager->ProcessEvent( m_pEvent );
-		delete m_pEvent;
-		m_pEvent = NULL;
+		VistaEvent* pEvent = new DemoEvent();
+		m_pEventManager->ProcessEvent( pEvent );
+		delete pEvent;
 		break;
 	}
 	
diff --git a/VistaDemo/09EventDemo/ProcessCallback.h b/VistaDemo/09EventDemo/ProcessCallback.h
index 067023db03a87fe4147483bb5edd95993dc35d77..09444702ce9e9653693557c2f44c9532de31798d 100644
--- a/VistaDemo/09EventDemo/ProcessCallback.h
+++ b/VistaDemo/09EventDemo/ProcessCallback.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef _CPROCESS_CALLBACK_H
 #define _CPROCESS_CALLBACK_H
@@ -62,7 +60,6 @@ public:
 private:
 	VistaEventManager*		m_pEventManager;
 	int						m_iEventType;
-	VistaEvent*				m_pEvent;
 };
 
 #endif
diff --git a/VistaDemo/09EventDemo/TimeObserver.cpp b/VistaDemo/09EventDemo/TimeObserver.cpp
index a3f7105ac4cb8f6bcc9d9fb055a84f8c2693f5e1..1269d8b5c2db600750fbfebb0e602bcb9cd51b43 100644
--- a/VistaDemo/09EventDemo/TimeObserver.cpp
+++ b/VistaDemo/09EventDemo/TimeObserver.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "TimeObserver.h"
 #include "DemoEvent.h"
diff --git a/VistaDemo/09EventDemo/TimeObserver.h b/VistaDemo/09EventDemo/TimeObserver.h
index ec6c044968bbb15de0000101fc6f2850152e5057..499e41faa6bca55fcd31e99cc35137bfff17fa43 100644
--- a/VistaDemo/09EventDemo/TimeObserver.h
+++ b/VistaDemo/09EventDemo/TimeObserver.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
-* $Id$
-*/
+
 
 #ifndef _TIMEOBSERVER_H
 #define _TIMEOBSERVER_H
diff --git a/VistaDemo/09EventDemo/_SourceFiles.cmake b/VistaDemo/09EventDemo/_SourceFiles.cmake
index 319321a80ad751a46b7c2c75ac24c0d2e5fd3adb..fc22d79ea2f735fe40659529e740ee666b5a4ed8 100644
--- a/VistaDemo/09EventDemo/_SourceFiles.cmake
+++ b/VistaDemo/09EventDemo/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id: $
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaDemo/09EventDemo/main.cpp b/VistaDemo/09EventDemo/main.cpp
index ffff0d7993c32c6d15868aa0919da6eddafd4d89..86758f2016c6ca2f93931926d7f8b2399900dd4c 100644
--- a/VistaDemo/09EventDemo/main.cpp
+++ b/VistaDemo/09EventDemo/main.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "EventDemoAppl.h"
 #include <VistaBase/VistaExceptionBase.h>
@@ -31,7 +29,7 @@ int	main (int argc, char *argv[])
 {
 	try
 	{
-                // create a new instance of this demo here
+	// create a new instance of this demo here
 		EventDemoAppl demoAppl( argc, argv );
 		// start universe as an endless loop
 		demoAppl.Run ();
diff --git a/VistaDemo/10DisplayDemo/CMakeLists.txt b/VistaDemo/10DisplayDemo/CMakeLists.txt
index 8ccdbeeac5176127728552f1716085a1dd2054ab..76f838ca203c36ca005e408742eb6dd02c411b89 100644
--- a/VistaDemo/10DisplayDemo/CMakeLists.txt
+++ b/VistaDemo/10DisplayDemo/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id$
 
 cmake_minimum_required( VERSION 2.8 )
 if( NOT VISTADEMO_COMMON_BUILD )
@@ -6,12 +5,9 @@ if( NOT VISTADEMO_COMMON_BUILD )
 
 	list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
 	include( VistaCommon )
-	
-	vista_use_package( VistaCoreLibs HEAD REQUIRED VistaKernel FIND_DEPENDENCIES )
-else()
-	vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 endif()
 
+vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 
 # Including the source files of all source subfolders recursively
 include( "./_SourceFiles.cmake" )
@@ -24,4 +20,8 @@ target_link_libraries( 10DisplayDemo
 vista_configure_app( 10DisplayDemo )
 vista_install( 10DisplayDemo )
 vista_create_default_info_file( 10DisplayDemo )
+if( VISTA_COMMON_BUILD )
+	set_target_properties( 10DisplayDemo PROPERTIES FOLDER "VistaDemo" )
+	add_dependencies( 10DisplayDemo VistaKernel )
+endif()
 
diff --git a/VistaDemo/10DisplayDemo/DisplayDemoAppl.cpp b/VistaDemo/10DisplayDemo/DisplayDemoAppl.cpp
index 0f80cd20f6e0dc295ca8d3962203f8af4c6991cd..9f8a692616bef0fca340b852ea1cb3013949dc9c 100644
--- a/VistaDemo/10DisplayDemo/DisplayDemoAppl.cpp
+++ b/VistaDemo/10DisplayDemo/DisplayDemoAppl.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 // App stuff
 #include "DisplayDemoAppl.h"
diff --git a/VistaDemo/10DisplayDemo/DisplayDemoAppl.h b/VistaDemo/10DisplayDemo/DisplayDemoAppl.h
index dfc7866e534e3448af8019a9ee4d603a1dc2731a..8d1b448df8e40e76ff6d697869567b7a6520b1b7 100644
--- a/VistaDemo/10DisplayDemo/DisplayDemoAppl.h
+++ b/VistaDemo/10DisplayDemo/DisplayDemoAppl.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
-* $Id$
-*/
+
 #include <VistaKernel/VistaSystem.h>
 #include <VistaKernel/GraphicsManager/VistaAxes.h>
 
diff --git a/VistaDemo/10DisplayDemo/_SourceFiles.cmake b/VistaDemo/10DisplayDemo/_SourceFiles.cmake
index 8a7c2095564018c26ac6e68fb24166ac59ed890f..d9c14589e5704d38f3c8c7db23e80b2f641e6bd3 100644
--- a/VistaDemo/10DisplayDemo/_SourceFiles.cmake
+++ b/VistaDemo/10DisplayDemo/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id: $
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaDemo/10DisplayDemo/main.cpp b/VistaDemo/10DisplayDemo/main.cpp
index d7612e62c86b2d42196b0377a0c43c6cb7458d9d..4ccc704334e4b51cf018110f76b1296c8ab6af22 100644
--- a/VistaDemo/10DisplayDemo/main.cpp
+++ b/VistaDemo/10DisplayDemo/main.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "DisplayDemoAppl.h"
 
diff --git a/VistaDemo/11OGLDemo/CMakeLists.txt b/VistaDemo/11OGLDemo/CMakeLists.txt
index 5f3dd62117b7476fe714dbc8c7c9a62f2c2f45d9..38050e222db8679de6049199a8e840b613146a58 100644
--- a/VistaDemo/11OGLDemo/CMakeLists.txt
+++ b/VistaDemo/11OGLDemo/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id$
 
 cmake_minimum_required( VERSION 2.8 )
 if( NOT VISTADEMO_COMMON_BUILD )
@@ -6,12 +5,9 @@ if( NOT VISTADEMO_COMMON_BUILD )
 
 	list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
 	include( VistaCommon )
-	
-	vista_use_package( VistaCoreLibs HEAD REQUIRED VistaKernel FIND_DEPENDENCIES )
-else()
-	vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 endif()
 
+vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 
 # Including the source files of all source subfolders recursively
 include( "./_SourceFiles.cmake" )
@@ -24,4 +20,8 @@ target_link_libraries( 11OGLDemo
 vista_configure_app( 11OGLDemo )
 vista_install( 11OGLDemo )
 vista_create_default_info_file( 11OGLDemo )
+if( VISTA_COMMON_BUILD )
+	set_target_properties( 11OGLDemo PROPERTIES FOLDER "VistaDemo" )
+	add_dependencies( 11OGLDemo VistaKernel )
+endif()
 
diff --git a/VistaDemo/11OGLDemo/OglDemoAppl.cpp b/VistaDemo/11OGLDemo/OglDemoAppl.cpp
index 1cd80f42b93e5d1fe372de44c79177dc15290916..95d6379347c31d7e9070eaa38ba7f471a8261532 100644
--- a/VistaDemo/11OGLDemo/OglDemoAppl.cpp
+++ b/VistaDemo/11OGLDemo/OglDemoAppl.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "OglDemoAppl.h"
 #include "OglDrawObject.h"
diff --git a/VistaDemo/11OGLDemo/OglDemoAppl.h b/VistaDemo/11OGLDemo/OglDemoAppl.h
index 8f1520e208693781fde1ebfbf205eefade813f02..d306dab893916fa2414fd2818ba5ff2582341a89 100644
--- a/VistaDemo/11OGLDemo/OglDemoAppl.h
+++ b/VistaDemo/11OGLDemo/OglDemoAppl.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef _OGLDEMOAPPL_H
 #define _OGLDEMOAPPL_H
diff --git a/VistaDemo/11OGLDemo/OglDrawObject.cpp b/VistaDemo/11OGLDemo/OglDrawObject.cpp
index 7ec35b15ee24a67c4e5aeddc4879ea39f4fbd841..c47aa5d2b834ceae801117accf4f72ef67b60075 100644
--- a/VistaDemo/11OGLDemo/OglDrawObject.cpp
+++ b/VistaDemo/11OGLDemo/OglDrawObject.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "OglDrawObject.h"
 
diff --git a/VistaDemo/11OGLDemo/OglDrawObject.h b/VistaDemo/11OGLDemo/OglDrawObject.h
index ee97c10aa9ea8e20a99fa8ca823e4f539b50e92d..e80710e1412f97572696f8d54ff9684532a61380 100644
--- a/VistaDemo/11OGLDemo/OglDrawObject.h
+++ b/VistaDemo/11OGLDemo/OglDrawObject.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef _OGLDRAWOBJECT_H
 #define _OGLDRAWOBJECT_H
diff --git a/VistaDemo/11OGLDemo/_SourceFiles.cmake b/VistaDemo/11OGLDemo/_SourceFiles.cmake
index 8b03a295fcbbd4e2653c3b7af801f67776b26522..1871e442085909a0e2a4aeac7a13698173041180 100644
--- a/VistaDemo/11OGLDemo/_SourceFiles.cmake
+++ b/VistaDemo/11OGLDemo/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id: $
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaDemo/11OGLDemo/main.cpp b/VistaDemo/11OGLDemo/main.cpp
index 5cd7b59f3c8b38f7c82217af7e0e351382618f28..8938d7f754f17da9413934838d8a1fecef6f4c87 100644
--- a/VistaDemo/11OGLDemo/main.cpp
+++ b/VistaDemo/11OGLDemo/main.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "OglDemoAppl.h"
 
diff --git a/VistaDemo/12IntentionSelectDemo/CMakeLists.txt b/VistaDemo/12IntentionSelectDemo/CMakeLists.txt
index 5501f2c54c5acffefc1bd4aede9666abee690d54..d2a391230aeff5755c3b50ecd9114abe0ab9e275 100644
--- a/VistaDemo/12IntentionSelectDemo/CMakeLists.txt
+++ b/VistaDemo/12IntentionSelectDemo/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id$
 
 cmake_minimum_required( VERSION 2.8 )
 if( NOT VISTADEMO_COMMON_BUILD )
@@ -6,12 +5,9 @@ if( NOT VISTADEMO_COMMON_BUILD )
 
 	list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
 	include( VistaCommon )
-	
-	vista_use_package( VistaCoreLibs HEAD REQUIRED VistaKernel FIND_DEPENDENCIES )
-else()
-	vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 endif()
 
+vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 
 # Including the source files of all source subfolders recursively
 include( "./_SourceFiles.cmake" )
@@ -24,4 +20,8 @@ target_link_libraries( 12IntentionSelectDemo
 vista_configure_app( 12IntentionSelectDemo )
 vista_install( 12IntentionSelectDemo )
 vista_create_default_info_file( 12IntentionSelectDemo )
+if( VISTA_COMMON_BUILD )
+	set_target_properties( 12IntentionSelectDemo PROPERTIES FOLDER "VistaDemo" )
+	add_dependencies( 12IntentionSelectDemo VistaKernel )
+endif()
 
diff --git a/VistaDemo/12IntentionSelectDemo/_SourceFiles.cmake b/VistaDemo/12IntentionSelectDemo/_SourceFiles.cmake
index 1497e621e2eef3a5f144b7c35036e78a93143da8..b5f5dadd1e2dabe2674f0e5a3ac0879b9b689e4f 100644
--- a/VistaDemo/12IntentionSelectDemo/_SourceFiles.cmake
+++ b/VistaDemo/12IntentionSelectDemo/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id: $
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaDemo/12IntentionSelectDemo/main.cpp b/VistaDemo/12IntentionSelectDemo/main.cpp
index ffae33d7e5ffd47aa7a0a7ae990cb1be74b14567..4b2a7f1eb40b07018a504a7a80c17922acd22b89 100644
--- a/VistaDemo/12IntentionSelectDemo/main.cpp
+++ b/VistaDemo/12IntentionSelectDemo/main.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 // include header here
 
@@ -197,7 +195,8 @@ public:
     ~SelectionHandler()
     {
 		// unregister and delete all adapters
-		for( int i = 0; const int nCount = (int)m_vecStaticAdapters.size(); ++i )
+		const int nCount = (int)m_vecStaticAdapters.size();
+		for( int i = 0; i < nCount; ++i )
 		{
 			m_pSelection->UnregisterNode( m_vecStaticAdapters[i] );
 			delete m_vecStaticAdapters[i];
@@ -485,7 +484,7 @@ int main(int argc, char **argv)
 			oVistaSystem.Run();
 		}
 	}
-	catch ( VistaExceptionBase &eException )
+	catch ( const VistaExceptionBase& eException )
 	{
 		eException.PrintException();
 	}
diff --git a/VistaDemo/13KernelOpenSGExtDemo/CMakeLists.txt b/VistaDemo/13KernelOpenSGExtDemo/CMakeLists.txt
index 488392a9ff66ada705bcce687993315faa128d1a..f3db87d2b0c741143ab912dd20058dc92ec77bd3 100644
--- a/VistaDemo/13KernelOpenSGExtDemo/CMakeLists.txt
+++ b/VistaDemo/13KernelOpenSGExtDemo/CMakeLists.txt
@@ -1,4 +1,7 @@
-# $Id$
 
+if( NOT VISTACORELIBS_BUILD_KERNELOPENSGEXT )
+	message( FATAL_ERROR "13KernelOpenSGExtDemo cannot be built - VistaCorelibs component VistaKernelOpenSGExt is not activated" )
+endif()
+		
 add_subdirectory( ParticlesDemo )
 add_subdirectory( ShadowDemo )
diff --git a/VistaDemo/13KernelOpenSGExtDemo/ParticlesDemo/CMakeLists.txt b/VistaDemo/13KernelOpenSGExtDemo/ParticlesDemo/CMakeLists.txt
index 9286b9b2969fbc6cc4cd4b32632d6d67f61dd855..68625c9eb28035b0c51223848e7577f6e5b643f1 100644
--- a/VistaDemo/13KernelOpenSGExtDemo/ParticlesDemo/CMakeLists.txt
+++ b/VistaDemo/13KernelOpenSGExtDemo/ParticlesDemo/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id$
 
 cmake_minimum_required( VERSION 2.8 )
 if( NOT VISTADEMO_COMMON_BUILD )
@@ -6,13 +5,10 @@ if( NOT VISTADEMO_COMMON_BUILD )
 
 	list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
 	include( VistaCommon )
-	
-	vista_use_package( VistaCoreLibs HEAD REQUIRED VistaKernelOpenSGExt FIND_DEPENDENCIES )
-else()
-	vista_use_package( VistaCoreLibs REQUIRED VistaKernelOpenSGExt FIND_DEPENDENCIES )
 endif()
 
-
+vista_use_package( VistaCoreLibs REQUIRED VistaKernel VistaKernelOpenSGExt FIND_DEPENDENCIES )
+	
 # Including the source files of all source subfolders recursively
 include( "./_SourceFiles.cmake" )
 
@@ -24,4 +20,7 @@ target_link_libraries( 13KernelOpenSGExtParticlesDemo
 vista_configure_app( 13KernelOpenSGExtParticlesDemo )
 vista_install( 13KernelOpenSGExtParticlesDemo )
 vista_create_default_info_file( 13KernelOpenSGExtParticlesDemo )
-
+if( VISTA_COMMON_BUILD )
+	set_target_properties( 13KernelOpenSGExtParticlesDemo PROPERTIES FOLDER "VistaDemo" )
+	add_dependencies( 13KernelOpenSGExtParticlesDemo VistaKernelOpenSGExt )
+endif()
diff --git a/VistaDemo/13KernelOpenSGExtDemo/ParticlesDemo/RollingBalls.h b/VistaDemo/13KernelOpenSGExtDemo/ParticlesDemo/RollingBalls.h
index 9926aac4e3abd4676cbc2321187db3535da377c4..763770634f096112aad0e761217a300e4bc88f9c 100644
--- a/VistaDemo/13KernelOpenSGExtDemo/ParticlesDemo/RollingBalls.h
+++ b/VistaDemo/13KernelOpenSGExtDemo/ParticlesDemo/RollingBalls.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _CROLLINGBALLS_H_
 #define _CROLLINGBALLS_H_
diff --git a/VistaDemo/13KernelOpenSGExtDemo/ParticlesDemo/Smoke.h b/VistaDemo/13KernelOpenSGExtDemo/ParticlesDemo/Smoke.h
index ff19de838b20f0affc783838caf9c63b1d8a1b52..b09dec07fafdea0e898b7a76f9d65d4ee66a47b5 100644
--- a/VistaDemo/13KernelOpenSGExtDemo/ParticlesDemo/Smoke.h
+++ b/VistaDemo/13KernelOpenSGExtDemo/ParticlesDemo/Smoke.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _CSMOKE_H_
 #define _CSMOKE_H_
diff --git a/VistaDemo/13KernelOpenSGExtDemo/ParticlesDemo/VistaParticlesDemo.cpp b/VistaDemo/13KernelOpenSGExtDemo/ParticlesDemo/VistaParticlesDemo.cpp
index e8e52524f7f9743f28250e8062dd0c6a8c2942a3..88afbe7fe2d43c8b62491e444c6b8ba27ddb67b0 100644
--- a/VistaDemo/13KernelOpenSGExtDemo/ParticlesDemo/VistaParticlesDemo.cpp
+++ b/VistaDemo/13KernelOpenSGExtDemo/ParticlesDemo/VistaParticlesDemo.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
-* $Id$
-*/
+
 
 /*
 
diff --git a/VistaDemo/13KernelOpenSGExtDemo/ParticlesDemo/_SourceFiles.cmake b/VistaDemo/13KernelOpenSGExtDemo/ParticlesDemo/_SourceFiles.cmake
index 47f5a1e1d4b3b1c5a997e0e34002a99fd34c34b6..3d1be9ff30821d98f5f086092e01761ae2ef9d4e 100644
--- a/VistaDemo/13KernelOpenSGExtDemo/ParticlesDemo/_SourceFiles.cmake
+++ b/VistaDemo/13KernelOpenSGExtDemo/ParticlesDemo/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id: $
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/CMakeLists.txt b/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/CMakeLists.txt
index 2a2ea06e8068ea8223dcc979f380df6ebc556e8b..80521f6e2931f5e219b8bc38f995a2d5525f9515 100644
--- a/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/CMakeLists.txt
+++ b/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/CMakeLists.txt
@@ -1,17 +1,13 @@
-# $Id$
 
 cmake_minimum_required( VERSION 2.8 )
 if( NOT VISTADEMO_COMMON_BUILD )
 	project( 13KernelOpenSGExtShadowDemo )
 
 	list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
-	include( VistaCommon )
-	
-	vista_use_package( VistaCoreLibs HEAD REQUIRED VistaKernelOpenSGExt FIND_DEPENDENCIES )
-else()
-	vista_use_package( VistaCoreLibs REQUIRED VistaKernelOpenSGExt FIND_DEPENDENCIES )
+	include( VistaCommon )	
 endif()
 
+vista_use_package( VistaCoreLibs REQUIRED VistaKernel VistaKernelOpenSGExt FIND_DEPENDENCIES )
 
 # Including the source files of all source subfolders recursively
 include( "./_SourceFiles.cmake" )
@@ -24,4 +20,7 @@ target_link_libraries( 13KernelOpenSGExtShadowDemo
 vista_configure_app( 13KernelOpenSGExtShadowDemo )
 vista_install( 13KernelOpenSGExtShadowDemo )
 vista_create_default_info_file( 13KernelOpenSGExtShadowDemo )
-
+if( VISTA_COMMON_BUILD )
+	set_target_properties( 13KernelOpenSGExtShadowDemo PROPERTIES FOLDER "VistaDemo" )
+	add_dependencies( 13KernelOpenSGExtShadowDemo VistaKernelOpenSGExt )
+endif()
diff --git a/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/ShadowDemo.cpp b/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/ShadowDemo.cpp
index deb081a0163b1079b406b41ccf97d9f2e75414d6..f042842ab278cfb241fd33df6dbc30ed62a01396 100644
--- a/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/ShadowDemo.cpp
+++ b/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/ShadowDemo.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 
 
diff --git a/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/ShadowDemo.h b/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/ShadowDemo.h
index 427456075325e28680b7b1409c337132e45bef0b..003cbaba9f92ccaed07056e31cce161eb94d2c54 100644
--- a/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/ShadowDemo.h
+++ b/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/ShadowDemo.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
-* $Id$
-*/
+
 
 #ifndef _SHADOWDEMO_H
 #define _SHADOWDEMO_H
diff --git a/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/SwitchMapResolutionCallback.cpp b/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/SwitchMapResolutionCallback.cpp
index 96d776df3dceefecaf1aa6e0e32b89810fa4c69c..a5bcc69b87470ba2153b1a064d72abd7a5fdec56 100644
--- a/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/SwitchMapResolutionCallback.cpp
+++ b/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/SwitchMapResolutionCallback.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id: SwitchMapResolutionCallback.cpp 23634 2011-09-30 11:30:22Z dr165799 $
- */
+
 
 #include "SwitchMapResolutionCallback.h"
 #include "ShadowDemo.h"
diff --git a/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/SwitchMapResolutionCallback.h b/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/SwitchMapResolutionCallback.h
index 50fb7c811cae8626c8d5bda7318837d6a1273538..2e56099708cd5fec9967f98536decc1497bf9a27 100644
--- a/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/SwitchMapResolutionCallback.h
+++ b/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/SwitchMapResolutionCallback.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id: SwitchMapResolutionCallback.h 23634 2011-09-30 11:30:22Z dr165799 $
- */
+
 
 #ifndef _SWITCHMAPRESOLUTIONCALLBACK_H
 #define _SWITCHMAPRESOLUTIONCALLBACK_H
diff --git a/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/SwitchShadowCallback.cpp b/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/SwitchShadowCallback.cpp
index ea3343885d782eae677b78985c50fa13d10ae7fa..d3ad0b5dbe403b6a455b38c3455a548b2998dba6 100644
--- a/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/SwitchShadowCallback.cpp
+++ b/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/SwitchShadowCallback.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "SwitchShadowCallback.h"
 #include "ShadowDemo.h"
diff --git a/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/SwitchShadowCallback.h b/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/SwitchShadowCallback.h
index 3b0259a3e664150f6237a4e26966a61460a9f722..e5e4ecab351cafd9224a0d7642c03a45d61d8d5f 100644
--- a/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/SwitchShadowCallback.h
+++ b/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/SwitchShadowCallback.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef _SWITCHSHADOWCALLBACK_H
 #define _SWITCHSHADOWCALLBACK_H
diff --git a/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/ToggleShadowCallback.cpp b/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/ToggleShadowCallback.cpp
index fea79046ea6d4782b5ffde2e059eb402dc2d310d..07cfa119a215c3d9b37c599468e3e873ceff97aa 100644
--- a/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/ToggleShadowCallback.cpp
+++ b/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/ToggleShadowCallback.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "ToggleShadowCallback.h"
 #include "ShadowDemo.h"
diff --git a/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/ToggleShadowCallback.h b/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/ToggleShadowCallback.h
index 62089dec287b3e6a4e03f35e07213f761f96bd6d..1734de62da4f1005d0ed8701640a577975bfe35c 100644
--- a/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/ToggleShadowCallback.h
+++ b/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/ToggleShadowCallback.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef _TOGGLESHADOWCALLBACK_H
 #define _TOGGLESHADOWCALLBACK_H
diff --git a/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/_SourceFiles.cmake b/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/_SourceFiles.cmake
index 0a76ea46665a117dc9c080063cb24c17012cde4d..3f0cfc71eaff2ab096d9d516ce314b02dbf05b41 100644
--- a/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/_SourceFiles.cmake
+++ b/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id: $
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/main.cpp b/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/main.cpp
index 2a898c13fa51f4e4de4db731cca79ede856aff17..ac4cc2077b8065817678c57df9b6d51bac918df3 100644
--- a/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/main.cpp
+++ b/VistaDemo/13KernelOpenSGExtDemo/ShadowDemo/main.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include <VistaKernel/VistaSystem.h>
 
@@ -51,7 +49,7 @@ int	main (int argc, char *argv[])
 		ShadowDemo demoAppl(argc, argv);
 		demoAppl.Run ();
 	}
-	catch(VistaExceptionBase oExceptionBase)
+	catch(const VistaExceptionBase& oExceptionBase)
 	{
 		oExceptionBase.PrintException();
 		oExceptionBase.PrintBacktrace();
diff --git a/VistaDemo/14DataFlowNetDemo/ApplyColorActionObject.cpp b/VistaDemo/14DataFlowNetDemo/ApplyColorActionObject.cpp
index 84ff86ce739409515468931145bba9e791277c12..2605f7abf8141b2a4181aa76094c1a523231dbd3 100644
--- a/VistaDemo/14DataFlowNetDemo/ApplyColorActionObject.cpp
+++ b/VistaDemo/14DataFlowNetDemo/ApplyColorActionObject.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 #include "ApplyColorActionObject.h" 
 
 #include <VistaKernel/GraphicsManager/VistaGeometry.h>
diff --git a/VistaDemo/14DataFlowNetDemo/ApplyColorActionObject.h b/VistaDemo/14DataFlowNetDemo/ApplyColorActionObject.h
index c4d4152532054bb0c0fa27cf65e99d34f4ef5147..cf4529a5e97a31cb339f71a6dd96a02c65bf7d70 100644
--- a/VistaDemo/14DataFlowNetDemo/ApplyColorActionObject.h
+++ b/VistaDemo/14DataFlowNetDemo/ApplyColorActionObject.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef _APPLYCOLORACTIONOBJECT_H
 #define _APPLYCOLORACTIONOBJECT_H
diff --git a/VistaDemo/14DataFlowNetDemo/CMakeLists.txt b/VistaDemo/14DataFlowNetDemo/CMakeLists.txt
index e5a98867c2d2f70e074aafdd451f28ca9012ffd4..f41b5331439ea430f215ee76c20c00e3f9a7747d 100644
--- a/VistaDemo/14DataFlowNetDemo/CMakeLists.txt
+++ b/VistaDemo/14DataFlowNetDemo/CMakeLists.txt
@@ -1,17 +1,13 @@
-# $Id$
 
 cmake_minimum_required( VERSION 2.8 )
 if( NOT VISTADEMO_COMMON_BUILD )
 	project( 14DataFlowNetDemo )
 
 	list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
-	include( VistaCommon )
-	
-	vista_use_package( VistaCoreLibs HEAD REQUIRED VistaKernel FIND_DEPENDENCIES )
-else()
-	vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
+	include( VistaCommon )	
 endif()
 
+vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 
 # Including the source files of all source subfolders recursively
 include( "./_SourceFiles.cmake" )
@@ -24,4 +20,8 @@ target_link_libraries( 14DataFlowNetDemo
 vista_configure_app( 14DataFlowNetDemo )
 vista_install( 14DataFlowNetDemo )
 vista_create_default_info_file( 14DataFlowNetDemo )
+if( VISTA_COMMON_BUILD )
+	set_target_properties( 14DataFlowNetDemo PROPERTIES FOLDER "VistaDemo" )
+	add_dependencies( 14DataFlowNetDemo VistaKernel )
+endif()
 
diff --git a/VistaDemo/14DataFlowNetDemo/ColorChangerDfnNode.cpp b/VistaDemo/14DataFlowNetDemo/ColorChangerDfnNode.cpp
index e458a4671c819d11dfa229459998ffbb518c7b1e..e6c46803f242f12ee03848c3f186893a5e10f8b9 100644
--- a/VistaDemo/14DataFlowNetDemo/ColorChangerDfnNode.cpp
+++ b/VistaDemo/14DataFlowNetDemo/ColorChangerDfnNode.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "ColorChangerDfnNode.h"
 
diff --git a/VistaDemo/14DataFlowNetDemo/ColorChangerDfnNode.h b/VistaDemo/14DataFlowNetDemo/ColorChangerDfnNode.h
index 190b1d9cc7e49404367672c3b1823bfa3656364d..b47cb62d7f4deb9c93f03ccd7acb99c7c77caffd 100644
--- a/VistaDemo/14DataFlowNetDemo/ColorChangerDfnNode.h
+++ b/VistaDemo/14DataFlowNetDemo/ColorChangerDfnNode.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _COLORCHANGERDFNNODE_H
 #define _COLORCHANGERDFNNODE_H
diff --git a/VistaDemo/14DataFlowNetDemo/RandomNumberDfnNode.cpp b/VistaDemo/14DataFlowNetDemo/RandomNumberDfnNode.cpp
index 8f67f59f15d29f893ea4c92e716fcbf105231dfe..f55a03a54ff21419d9172e6e6b1324a07accd58b 100644
--- a/VistaDemo/14DataFlowNetDemo/RandomNumberDfnNode.cpp
+++ b/VistaDemo/14DataFlowNetDemo/RandomNumberDfnNode.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #include "RandomNumberDfnNode.h"
 
diff --git a/VistaDemo/14DataFlowNetDemo/RandomNumberDfnNode.h b/VistaDemo/14DataFlowNetDemo/RandomNumberDfnNode.h
index be574f1b04fddafca79af6445d8454eb0ea2aebd..8af922a36b31eaddcdc78b05eab5459c17ecb274 100644
--- a/VistaDemo/14DataFlowNetDemo/RandomNumberDfnNode.h
+++ b/VistaDemo/14DataFlowNetDemo/RandomNumberDfnNode.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _RANDOMNUMBERDFNNODE_H
 #define _RANDOMNUMBERDFNNODE_H
diff --git a/VistaDemo/14DataFlowNetDemo/SetPositionActionObject.cpp b/VistaDemo/14DataFlowNetDemo/SetPositionActionObject.cpp
index 9a7d3ff9d617b1750ea0ac341df5359f74765fc1..230807e9716a3a8a5e3238747c572eb2b0588ebf 100644
--- a/VistaDemo/14DataFlowNetDemo/SetPositionActionObject.cpp
+++ b/VistaDemo/14DataFlowNetDemo/SetPositionActionObject.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 #include "SetPositionActionObject.h" 
 
 #include <VistaKernel/GraphicsManager/VistaTransformNode.h>
diff --git a/VistaDemo/14DataFlowNetDemo/SetPositionActionObject.h b/VistaDemo/14DataFlowNetDemo/SetPositionActionObject.h
index d7cec2db39c5abf3a67e18d0511d5b8cd0607445..56e3c2e5d6940752b4728f4b42b78362415591c9 100644
--- a/VistaDemo/14DataFlowNetDemo/SetPositionActionObject.h
+++ b/VistaDemo/14DataFlowNetDemo/SetPositionActionObject.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef _SETPOSITIONACTIONOBJECT_H
 #define _SETPOSITIONACTIONOBJECT_H
diff --git a/VistaDemo/14DataFlowNetDemo/_SourceFiles.cmake b/VistaDemo/14DataFlowNetDemo/_SourceFiles.cmake
index 81d4e009daa9b9f40819a8f63eebf80b50d2a7da..4f604ce7f0376ab16ef4d7ef1c343cc76ff102e9 100644
--- a/VistaDemo/14DataFlowNetDemo/_SourceFiles.cmake
+++ b/VistaDemo/14DataFlowNetDemo/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id: $
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaDemo/14DataFlowNetDemo/configfiles/display.ini b/VistaDemo/14DataFlowNetDemo/configfiles/display.ini
index de52bc7d97b5243911b08c831133746a920b5f67..a355ccb430e64876b6e26a8cb2eb0b3dbb29d18c 100644
--- a/VistaDemo/14DataFlowNetDemo/configfiles/display.ini
+++ b/VistaDemo/14DataFlowNetDemo/configfiles/display.ini
@@ -1,4 +1,4 @@
-# $Id$
+
 # =============
 # DISPLAYSYSTEM
 # =============
diff --git a/VistaDemo/14DataFlowNetDemo/configfiles/interaction.ini b/VistaDemo/14DataFlowNetDemo/configfiles/interaction.ini
index b202cee84dcbb4e0c26489b4875592e52760557e..989c94e0057a639af0bc16e38f29882212eede02 100644
--- a/VistaDemo/14DataFlowNetDemo/configfiles/interaction.ini
+++ b/VistaDemo/14DataFlowNetDemo/configfiles/interaction.ini
@@ -1,4 +1,4 @@
-# $Id$
+
 [SYSTEM]
 DRIVERPLUGINDIRS	= ${VISTACORELIBS_DRIVER_PLUGIN_DIRS}
 DEVICEDRIVERS 		= KEYBOARD, MOUSE
diff --git a/VistaDemo/14DataFlowNetDemo/configfiles/vista.ini b/VistaDemo/14DataFlowNetDemo/configfiles/vista.ini
index 8f4a946a96fd7da78d3ede6314b91a3a81a827ad..f00f8cefcae9ddd1c9dc2d605c6e67ffd9062cd0 100644
--- a/VistaDemo/14DataFlowNetDemo/configfiles/vista.ini
+++ b/VistaDemo/14DataFlowNetDemo/configfiles/vista.ini
@@ -1,7 +1,7 @@
 #######################################################################
 #        V I S T A     I N I T I A L I Z A T I O N     F I L E        #
 #######################################################################
-# $Id$
+
 #######################################################################
 [SYSTEM]
 MSGPORT			= FALSE
diff --git a/VistaDemo/14DataFlowNetDemo/configfiles/xml/keyboard_standardinput.xml b/VistaDemo/14DataFlowNetDemo/configfiles/xml/keyboard_standardinput.xml
index 6534fe9273794b47d2431d4e7b8135040e3eb787..79239b534383e97786c5d683e8c799a091ea6a76 100644
--- a/VistaDemo/14DataFlowNetDemo/configfiles/xml/keyboard_standardinput.xml
+++ b/VistaDemo/14DataFlowNetDemo/configfiles/xml/keyboard_standardinput.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
+
 <module>
 	<nodespace>
 	</nodespace>
diff --git a/VistaDemo/14DataFlowNetDemo/configfiles/xml/spherecolor.xml b/VistaDemo/14DataFlowNetDemo/configfiles/xml/spherecolor.xml
index 654ae6bb6462ad57a44b124ae68cbfc620911eb8..cfea03a16290e074aee057a470c945fb5d77fadb 100644
--- a/VistaDemo/14DataFlowNetDemo/configfiles/xml/spherecolor.xml
+++ b/VistaDemo/14DataFlowNetDemo/configfiles/xml/spherecolor.xml
@@ -1,4 +1,4 @@
-<!-- $Id$ -->
+
 <module>
 	<nodespace>
 	</nodespace>
diff --git a/VistaDemo/14DataFlowNetDemo/configfiles/xml/sphereposition.xml b/VistaDemo/14DataFlowNetDemo/configfiles/xml/sphereposition.xml
index 9315357cd9e79bc328020cbf11278e242df7fad1..9a7b3988f381ef2badbc50e46a6c0932a944822c 100644
--- a/VistaDemo/14DataFlowNetDemo/configfiles/xml/sphereposition.xml
+++ b/VistaDemo/14DataFlowNetDemo/configfiles/xml/sphereposition.xml
@@ -1,4 +1,4 @@
-<!-- $Id$ -->
+
 <!-- 
 	We want to create a graph that reads sensor data from the mouse, converts it
 	to a 3D position, and feeds it to the SetPositionActionObject we created in
diff --git a/VistaDemo/14DataFlowNetDemo/main.cpp b/VistaDemo/14DataFlowNetDemo/main.cpp
index 14aeaa50a59211b66ae6ed6803b43a655cfff786..e28932f9dae2b1f9048764954980cb8a9c9cddd3 100644
--- a/VistaDemo/14DataFlowNetDemo/main.cpp
+++ b/VistaDemo/14DataFlowNetDemo/main.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "ColorChangerDfnNode.h"
 #include "RandomNumberDfnNode.h"
diff --git a/VistaDemo/15VtkDemo/CMakeLists.txt b/VistaDemo/15VtkDemo/CMakeLists.txt
index ce16faf62faef418fb8e2fb8dcce9b5e19e9d6ed..f84ecce062a9845f392b5b07f5068449e83d4847 100644
--- a/VistaDemo/15VtkDemo/CMakeLists.txt
+++ b/VistaDemo/15VtkDemo/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id$
 
 cmake_minimum_required( VERSION 2.8 )
 if( NOT VISTADEMO_COMMON_BUILD )
@@ -6,12 +5,10 @@ if( NOT VISTADEMO_COMMON_BUILD )
 
 	list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
 	include( VistaCommon )
-	
-	vista_use_package( VistaCoreLibs HEAD REQUIRED VistaKernel FIND_DEPENDENCIES )
-else()
-	vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 endif()
-vista_use_package( VTK REQUIRED FIND_DEPENDENCIES )
+
+vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
+vista_use_package( VTK           REQUIRED             FIND_DEPENDENCIES )
 
 
 # Including the source files of all source subfolders recursively
@@ -19,10 +16,14 @@ include( "./_SourceFiles.cmake" )
 
 add_executable( 15VtkDemo ${ProjectSources} )
 target_link_libraries( 15VtkDemo
-	${VISTA_USE_PACKAGE_LIBRARIES} # contains all libraries from vista_use_package() calls
+	${VISTA_USE_PACKAGE_LIBRARIES}
 )
 
 vista_configure_app( 15VtkDemo )
 vista_install( 15VtkDemo )
 vista_create_default_info_file( 15VtkDemo )
+if( VISTA_COMMON_BUILD )
+	set_target_properties( 15VtkDemo PROPERTIES FOLDER "VistaDemo" )
+	add_dependencies( 15VtkDemo VistaKernel )
+endif()
 
diff --git a/VistaDemo/15VtkDemo/VtkDemoAppl.cpp b/VistaDemo/15VtkDemo/VtkDemoAppl.cpp
index dd8949fad13446406379645cb343f0cdedd2533a..64b70bc99e12681b76a620c6dd713ebb0a67b967 100644
--- a/VistaDemo/15VtkDemo/VtkDemoAppl.cpp
+++ b/VistaDemo/15VtkDemo/VtkDemoAppl.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "VtkDrawObject.h"
 #include "VtkDemoAppl.h"
diff --git a/VistaDemo/15VtkDemo/VtkDemoAppl.h b/VistaDemo/15VtkDemo/VtkDemoAppl.h
index 6f0d86fec700bf38cfcb15326d35966fe30ca160..9e51ea2d555e2fbe442d7c224053b5227201e6b0 100644
--- a/VistaDemo/15VtkDemo/VtkDemoAppl.h
+++ b/VistaDemo/15VtkDemo/VtkDemoAppl.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id$
+
 
 #ifndef _VTKDEMOAPPL_H
 #define _VTKDEMOAPPL_H
diff --git a/VistaDemo/15VtkDemo/VtkDrawObject.cpp b/VistaDemo/15VtkDemo/VtkDrawObject.cpp
index 80e4e76fcfccfdc3c5d480f7ae61162cb7c88abd..248fcc79e1370961027e4643dd9af67ff07e0278 100644
--- a/VistaDemo/15VtkDemo/VtkDrawObject.cpp
+++ b/VistaDemo/15VtkDemo/VtkDrawObject.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
-* $Id$
-*/
+
 
 #include <vtkPolyDataMapper.h>
 #include <vtkConeSource.h>
diff --git a/VistaDemo/15VtkDemo/VtkDrawObject.h b/VistaDemo/15VtkDemo/VtkDrawObject.h
index e1f9ead6e2b3dcdef2a36807cf56c7485f77b6c2..415a25d79cff41d9f6669128e598c4f3b5b6efa0 100644
--- a/VistaDemo/15VtkDemo/VtkDrawObject.h
+++ b/VistaDemo/15VtkDemo/VtkDrawObject.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef _VTKDRAWOBJECT_H
 #define _VTKDRAWOBJECT_H
diff --git a/VistaDemo/15VtkDemo/_SourceFiles.cmake b/VistaDemo/15VtkDemo/_SourceFiles.cmake
index ecb899361b904f3c852d458f711fa06ae3c6bd29..dc8fd06c29d8dc9f91a9d1fd62706f831a87594e 100644
--- a/VistaDemo/15VtkDemo/_SourceFiles.cmake
+++ b/VistaDemo/15VtkDemo/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id: $
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaDemo/15VtkDemo/main.cpp b/VistaDemo/15VtkDemo/main.cpp
index 87a9550c2c6e1abbecd3617df01a043499881b19..e6dd04aed0df36a4427415366511dcd819fd1a4b 100644
--- a/VistaDemo/15VtkDemo/main.cpp
+++ b/VistaDemo/15VtkDemo/main.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "VtkDemoAppl.h"
 
diff --git a/VistaDemo/16PhantomDemo/BoundingboxGeometry.cpp b/VistaDemo/16PhantomDemo/BoundingboxGeometry.cpp
index cacaeeb2822ccdecd1809adaad19c133c7cc35e5..7c85a0db57d65635031b579cd890c83602cedb27 100644
--- a/VistaDemo/16PhantomDemo/BoundingboxGeometry.cpp
+++ b/VistaDemo/16PhantomDemo/BoundingboxGeometry.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 #include "BoundingboxGeometry.h"
 
 #include <VistaKernel/GraphicsManager/VistaSceneGraph.h>
diff --git a/VistaDemo/16PhantomDemo/BoundingboxGeometry.h b/VistaDemo/16PhantomDemo/BoundingboxGeometry.h
index 8f37cf552bc9c9670b3f46183b4099f82619e9e4..0071d4bc0427da75eb5d3c56193fddb6898834f0 100644
--- a/VistaDemo/16PhantomDemo/BoundingboxGeometry.h
+++ b/VistaDemo/16PhantomDemo/BoundingboxGeometry.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef _BOUNDBOXGEOMETRY
 #define _BOUNDBOXGEOMETRY
diff --git a/VistaDemo/16PhantomDemo/CMakeLists.txt b/VistaDemo/16PhantomDemo/CMakeLists.txt
index 81d862f42de69d0673b2d6e1396eb20f8db0eb5c..76af7893597da914ac0e02e77409a7ad972587fa 100644
--- a/VistaDemo/16PhantomDemo/CMakeLists.txt
+++ b/VistaDemo/16PhantomDemo/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id$
 
 cmake_minimum_required( VERSION 2.8 )
 if( NOT VISTADEMO_COMMON_BUILD )
@@ -6,11 +5,9 @@ if( NOT VISTADEMO_COMMON_BUILD )
 
 	list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
 	include( VistaCommon )
-	
-	vista_use_package( VistaCoreLibs HEAD REQUIRED VistaKernel FIND_DEPENDENCIES )
-else()
-	vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 endif()
+
+vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 vista_use_package( OpenHaptics REQUIRED ) # for dll's of phantom driver
 
 # Including the source files of all source subfolders recursively
@@ -24,4 +21,7 @@ target_link_libraries( 16PhantomDemo
 vista_configure_app( 16PhantomDemo )
 vista_install( 16PhantomDemo )
 vista_create_default_info_file( 16PhantomDemo )
-
+if( VISTA_COMMON_BUILD )
+	set_target_properties( 16PhantomDemo PROPERTIES FOLDER "VistaDemo" )
+	add_dependencies( 16PhantomDemo VistaKernel )
+endif()
diff --git a/VistaDemo/16PhantomDemo/PhantomWorkspaceHandler.cpp b/VistaDemo/16PhantomDemo/PhantomWorkspaceHandler.cpp
index 7a31fc70fdd67e28bbc20802db64dcee4c3d5dca..f4a6ac18d8c9c3190d038bfb49ddf359ad5a9a21 100644
--- a/VistaDemo/16PhantomDemo/PhantomWorkspaceHandler.cpp
+++ b/VistaDemo/16PhantomDemo/PhantomWorkspaceHandler.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include <VistaDataFlowNet/VdfnObjectRegistry.h>
 #include <VistaDataFlowNet/VdfnReadWorkspaceNode.h>
diff --git a/VistaDemo/16PhantomDemo/PhantomWorkspaceHandler.h b/VistaDemo/16PhantomDemo/PhantomWorkspaceHandler.h
index 6129c817ad504838242c1dd79b3e81c4c0ee481a..47caf77fe68918bedca552e7258382f63f9afe8b 100644
--- a/VistaDemo/16PhantomDemo/PhantomWorkspaceHandler.h
+++ b/VistaDemo/16PhantomDemo/PhantomWorkspaceHandler.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef _PHANTOMWORKSPACEHANDLER_H
 #define _PHANTOMWORKSPACEHANDLER_H
diff --git a/VistaDemo/16PhantomDemo/VdfnPlaneConstraintNode.cpp b/VistaDemo/16PhantomDemo/VdfnPlaneConstraintNode.cpp
index 91150d30477292ea7d314b4244ae4061d5064fe1..e9dd259f1636cefe3facc2b8270db5457fb01eb1 100644
--- a/VistaDemo/16PhantomDemo/VdfnPlaneConstraintNode.cpp
+++ b/VistaDemo/16PhantomDemo/VdfnPlaneConstraintNode.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id:																	    $
- */
+
 
 #include "VdfnPlaneConstraintNode.h"
 
@@ -38,6 +36,7 @@ VdfnPlaneConstraintNode::VdfnPlaneConstraintNode( IVistaDriverForceFeedbackAspec
 : IVdfnNode(),
   m_pForceFeedback(pAsp),
   m_pOrigin(NULL),
+  m_pDamping(NULL),
   m_pNormal(NULL),
   m_pInternalForce(NULL),
   m_pStiffness(NULL),
diff --git a/VistaDemo/16PhantomDemo/VdfnPlaneConstraintNode.h b/VistaDemo/16PhantomDemo/VdfnPlaneConstraintNode.h
index cb422f277825aacf03647faff2db4327f91194cf..e34260f2778047f3c17fbef134508ea1608158e3 100644
--- a/VistaDemo/16PhantomDemo/VdfnPlaneConstraintNode.h
+++ b/VistaDemo/16PhantomDemo/VdfnPlaneConstraintNode.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id:																	    $
- */
+
 
 #ifndef CVDFNPLANECONSTRAINTNODE_H_
 #define CVDFNPLANECONSTRAINTNODE_H_
diff --git a/VistaDemo/16PhantomDemo/WorkspaceActionObject.cpp b/VistaDemo/16PhantomDemo/WorkspaceActionObject.cpp
index 51c3eb929fd18fe66f3f53537284276363736aa7..bf1c027c3d6b3c8af588bc46b1f5d52f65267720 100644
--- a/VistaDemo/16PhantomDemo/WorkspaceActionObject.cpp
+++ b/VistaDemo/16PhantomDemo/WorkspaceActionObject.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "WorkspaceActionObject.h"
 #include "BoundingboxGeometry.h"
@@ -44,6 +42,13 @@ WorkspaceActionObject::WorkspaceActionObject( VistaGroupNode * pParent, IVistaTr
 : m_pParent( pParent )
 , m_pVistaSceneGraph( pSG )
 , m_pHandle( pHandle )
+, minx( 0 )
+, maxx( 0 )
+, miny( 0 )
+, maxy( 0 )
+, minz( 0 )
+, maxz( 0 )
+, m_scale( 1 )
 {
 }
 
diff --git a/VistaDemo/16PhantomDemo/WorkspaceActionObject.h b/VistaDemo/16PhantomDemo/WorkspaceActionObject.h
index 49838143da56b5e710bfebf28645e3be3ea99bd0..ca5a732ad2a08c1945e7499917f1cea1cab6d1eb 100644
--- a/VistaDemo/16PhantomDemo/WorkspaceActionObject.h
+++ b/VistaDemo/16PhantomDemo/WorkspaceActionObject.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef WORKSPACEACTIONOBJECT_H_
 #define WORKSPACEACTIONOBJECT_H_
diff --git a/VistaDemo/16PhantomDemo/_SourceFiles.cmake b/VistaDemo/16PhantomDemo/_SourceFiles.cmake
index d56eee385c11daee13315761fd27a4b407b7b1b1..0878d43481a79f3072d120a41befd6454c597bf1 100644
--- a/VistaDemo/16PhantomDemo/_SourceFiles.cmake
+++ b/VistaDemo/16PhantomDemo/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id: $
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaDemo/16PhantomDemo/configfiles/display_desktop.ini b/VistaDemo/16PhantomDemo/configfiles/display_desktop.ini
index 0a182a4384d2ae868d9d1be5b97377d3f7a4e1c6..1d1848971f24a5b55272a9bf2408e815ae420ca4 100644
--- a/VistaDemo/16PhantomDemo/configfiles/display_desktop.ini
+++ b/VistaDemo/16PhantomDemo/configfiles/display_desktop.ini
@@ -1,4 +1,4 @@
-# $Id$
+
 # =============
 # DISPLAYSYSTEM
 # =============
diff --git a/VistaDemo/16PhantomDemo/configfiles/display_picasso.ini b/VistaDemo/16PhantomDemo/configfiles/display_picasso.ini
index a0961eafce9d857ba973c7033615a5b943788cca..1c7a3006debcc70a5ec6c7d2ab503846f73a607e 100644
--- a/VistaDemo/16PhantomDemo/configfiles/display_picasso.ini
+++ b/VistaDemo/16PhantomDemo/configfiles/display_picasso.ini
@@ -1,6 +1,6 @@
 # display system initialization file for the PI-casso workstation
 # in the CCC VR-Lab
-# $Id$
+
 
 [SYSTEM]
 DISPLAYSYSTEMS 		= MAIN
diff --git a/VistaDemo/16PhantomDemo/main.cpp b/VistaDemo/16PhantomDemo/main.cpp
index e230b1aed8f3ff72f119e9907604a903a0caf323..d5be6409b04d702b21abb6ab1f3b9efec679a483 100644
--- a/VistaDemo/16PhantomDemo/main.cpp
+++ b/VistaDemo/16PhantomDemo/main.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include <VistaKernel/VistaSystem.h>
 
@@ -83,7 +81,7 @@ PhantomWorkspaceHandler	*m_pWorkspaceHandler;
  */
 int main( int argc, char ** argv )
 {
-	int ret;
+	int ret = 0xdead;
 
 	try
 	{
@@ -96,8 +94,6 @@ int main( int argc, char ** argv )
 		liPathes.push_back("configfiles/");
 		pVistaSystem.SetIniSearchPaths(liPathes);
 
-		int ret = 0xdead;
-
 		// initialize the VistaSystem
 		if(pVistaSystem.Init(argc,argv))
 		{
diff --git a/VistaDemo/17MsgPortDemo/Alice_shellDemo/Alice.cpp b/VistaDemo/17MsgPortDemo/Alice_shellDemo/Alice.cpp
index f0aeecdf4524586dfa7b171c9d99073743395387..802823586fe45cd5e143589e0dd418a79340f335 100644
--- a/VistaDemo/17MsgPortDemo/Alice_shellDemo/Alice.cpp
+++ b/VistaDemo/17MsgPortDemo/Alice_shellDemo/Alice.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 /*============================================================================*/
 /* INCLUDES & DEFINES                                                         */
@@ -36,8 +34,7 @@
 #include <VistaKernel/VistaSystem.h>
 #include <VistaKernel/InteractionManager/VistaKeyboardSystemControl.h>
 #include <VistaBase/VistaExceptionBase.h>
-#include <VistaTools/VistaProfiler.h>
-
+#include <VistaTools/VistaIniFileParser.h>
 
 // we use a cout in here...
 #include <iostream>
@@ -49,32 +46,27 @@
 /*============================================================================*/
 Alice::Alice(VistaKeyboardSystemControl *pCtrl, const std::string & sIniPath)
 {
-	//Fetch hostname and portnumber from VistaProfiler (vista.ini)
-	/*
-	Please note that we introduced the following section specially for this demo!
-		
-	[ALICE_DEMO]
-	MSGCHANNELIP = 127.0.0.1
-	MSGCHANNELPORT = 6666
-
-	*/
-
-	VistaProfiler LocalProfiler;
-	std::string sHostname = LocalProfiler.GetTheProfileString("ALICE_DEMO","MSGCHANNELIP","127.0.0.1",sIniPath);
-	std::string sPortNumber = LocalProfiler.GetTheProfileString("ALICE_DEMO","MSGCHANNELPORT","6666",sIniPath);
+	// Fetch hostname and portnumber frominifile
+	// Please note that we introduced the following section specially for this demo!
+	// [ALICE_DEMO]
+	// MSGCHANNELIP = 127.0.0.1
+	// MSGCHANNELPORT = 6666
+	VistaPropertyList oIniFile = VistaIniFileParser::ReadProplistFromFile( sIniPath );
+	std::string sHostname = oIniFile.GetValueInSubListOrDefault< std::string >( "MSGCHANNELIP", "ALICE_DEMO", "127.0.0.1" );
+	int nPortNumber = oIniFile.GetValueInSubListOrDefault< int >( "MSGCHANNELPORT", "ALICE_DEMO", 6666 );
 	
 	//Create MessageChannel via IP Connection.
 	m_pChannel = new VistaMsgChannel;
 	VistaConnectionIP* pConn = new VistaConnectionIP( VistaConnectionIP::CT_TCP );
-	pConn->SetHostNameAndPort( sHostname, atoi( sPortNumber.c_str() ) );
+	pConn->SetHostNameAndPort( sHostname, nPortNumber );
 	if( pConn->Open() == false )
 	{
-		std::cout << "Alice could not connect to " << sHostname << " on port " << sPortNumber << std::endl;
+		std::cout << "Alice could not connect to " << sHostname << " on port " << nPortNumber << std::endl;
 		VISTA_THROW( "No connection", -1 );	
 	}
 	else
 	{
-		std::cout << "Alice connected to " << sHostname << " on port " << sPortNumber << std::endl;
+		std::cout << "Alice connected to " << sHostname << " on port " << nPortNumber << std::endl;
 		pConn->SetIsBlocking( true );
 		m_pChannel->SetConnection( pConn );
 	}
diff --git a/VistaDemo/17MsgPortDemo/Alice_shellDemo/Alice.h b/VistaDemo/17MsgPortDemo/Alice_shellDemo/Alice.h
index 6750c1d7701b3a55e096a7cd8940de113eb35854..ef7321d0c68c851a9281eef3838fbce1737f1601 100644
--- a/VistaDemo/17MsgPortDemo/Alice_shellDemo/Alice.h
+++ b/VistaDemo/17MsgPortDemo/Alice_shellDemo/Alice.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
diff --git a/VistaDemo/17MsgPortDemo/Alice_shellDemo/CMakeLists.txt b/VistaDemo/17MsgPortDemo/Alice_shellDemo/CMakeLists.txt
index e350e823861a4d602d9dd053d96952c88509f103..a2f52e5d6ab17b7fc9137c322e0ae632819a12f0 100644
--- a/VistaDemo/17MsgPortDemo/Alice_shellDemo/CMakeLists.txt
+++ b/VistaDemo/17MsgPortDemo/Alice_shellDemo/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id$
 
 cmake_minimum_required( VERSION 2.8 )
 if( NOT VISTADEMO_COMMON_BUILD )
@@ -6,12 +5,9 @@ if( NOT VISTADEMO_COMMON_BUILD )
 
 	list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
 	include( VistaCommon )
-	
-	vista_use_package( VistaCoreLibs HEAD REQUIRED VistaKernel FIND_DEPENDENCIES )
-else()
-	vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 endif()
 
+vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 
 # Including the source files of all source subfolders recursively
 include( "./_SourceFiles.cmake" )
@@ -24,4 +20,8 @@ target_link_libraries( 17MsgPortAlice
 vista_configure_app( 17MsgPortAlice )
 vista_install( 17MsgPortAlice )
 vista_create_default_info_file( 17MsgPortAlice )
+if( VISTA_COMMON_BUILD )
+	set_target_properties( 17MsgPortAlice PROPERTIES FOLDER "VistaDemo" )
+	add_dependencies( 17MsgPortAlice VistaKernel )
+endif()
 
diff --git a/VistaDemo/17MsgPortDemo/Alice_shellDemo/_SourceFiles.cmake b/VistaDemo/17MsgPortDemo/Alice_shellDemo/_SourceFiles.cmake
index 90d7a2bb94170fdd1329328f3404dc1f5731b4c3..8b650dba6fd929bff3559a5c713ff19913c987c1 100644
--- a/VistaDemo/17MsgPortDemo/Alice_shellDemo/_SourceFiles.cmake
+++ b/VistaDemo/17MsgPortDemo/Alice_shellDemo/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id: $
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/display_desktop.ini b/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/display_desktop.ini
index dc207ac6d719cdbed7e4fc4e3cc292b4e6bc0392..8948ef4d333793dcccc6e6bcc0e921fb8ea7ca5e 100644
--- a/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/display_desktop.ini
+++ b/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/display_desktop.ini
@@ -1,4 +1,4 @@
-# $Id$
+
 # =============
 # DISPLAYSYSTEM
 # =============
diff --git a/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/interaction_desktop.ini b/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/interaction_desktop.ini
index 683486503f3def56f96b880ca4be94cf8e6b57d2..ae94cefbadc8114f3f9789bee9b5b801e36ee065 100644
--- a/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/interaction_desktop.ini
+++ b/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/interaction_desktop.ini
@@ -1,4 +1,4 @@
-# $Id$
+
 [SYSTEM]
 # DRIVERPLUGINDIRS describes where the plugin dlls for drivers can be found
 # Usually, the VISTACORELIBS_DRIVER_PLUGIN_DIRS environment variable can be used,
diff --git a/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/vista.ini b/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/vista.ini
index 30931c19883f92170fff2879cb602671521ab28e..5dd19680ad3874befaa1c06c50dba150fc4b52cc 100644
--- a/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/vista.ini
+++ b/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/vista.ini
@@ -1,7 +1,7 @@
 #######################################################################
 #        V I S T A     I N I T I A L I Z A T I O N     F I L E        #
 #######################################################################
-# $Id$
+
 #######################################################################
 [SYSTEM]
 # include other ini files
diff --git a/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/xml/keyboard_standardinput.xml b/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/xml/keyboard_standardinput.xml
index 6534fe9273794b47d2431d4e7b8135040e3eb787..79239b534383e97786c5d683e8c799a091ea6a76 100644
--- a/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/xml/keyboard_standardinput.xml
+++ b/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/xml/keyboard_standardinput.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
+
 <module>
 	<nodespace>
 	</nodespace>
diff --git a/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/xml/mouse_trackball.xml b/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/xml/mouse_trackball.xml
index 2e9a3d48912a30ecc9a988d2878dd07012aeedd8..fe8d63393c57ef022e18de6a46ad4aa1fa05f768 100644
--- a/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/xml/mouse_trackball.xml
+++ b/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/xml/mouse_trackball.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
+
 <!--=========================================================================-->
 <!-- This nodes implements the default mouse navigation with trackball,      -->
 <!-- panning and zooming. The behavior is continous. You can scale the speed -->
diff --git a/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/xml/mouse_trackball_continuous.xml b/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/xml/mouse_trackball_continuous.xml
index 92d6a1f7c62fa69755bbb39bd6ba70682b8f000e..e65a849d4018f7b16bb55a9f6165badd902cbec7 100644
--- a/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/xml/mouse_trackball_continuous.xml
+++ b/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/xml/mouse_trackball_continuous.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
+
 <!--=========================================================================-->
 <!-- This nodes implements the default mouse navigation with trackball,      -->
 <!-- panning and zooming. The behavior is continous. You can scale the speed -->
diff --git a/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/xml/spacenavigator_navigation.xml b/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/xml/spacenavigator_navigation.xml
index c3b531d9817c6fb7c7456f4d7efc6d9fa860368d..1505fa45a166370bca33a9237f68d9adf90284a6 100644
--- a/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/xml/spacenavigator_navigation.xml
+++ b/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/xml/spacenavigator_navigation.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
+
 <module>
 	<nodespace></nodespace>
 	<graph>
diff --git a/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/xml/ucp_picasso.xml b/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/xml/ucp_picasso.xml
index 8595b87305b85ce87accd8cdf6692d9881a124c7..2cc1c5ab0cc73cc13d497a3f5f3ebc43cfd7897e 100644
--- a/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/xml/ucp_picasso.xml
+++ b/VistaDemo/17MsgPortDemo/Alice_shellDemo/configfiles/xml/ucp_picasso.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
+
 <module>
 	<nodespace>
 	</nodespace>
diff --git a/VistaDemo/17MsgPortDemo/Alice_shellDemo/main.cpp b/VistaDemo/17MsgPortDemo/Alice_shellDemo/main.cpp
index fffe28b116c3e9b2dc55cb42942e38d75aceeea8..dff9954eb023d0805f32d2d228af1413b3347304 100644
--- a/VistaDemo/17MsgPortDemo/Alice_shellDemo/main.cpp
+++ b/VistaDemo/17MsgPortDemo/Alice_shellDemo/main.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 /*
 Okay. What does Alice do?
diff --git a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/Bob.cpp b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/Bob.cpp
index c26ef9f09fde109e20b2076a33d17c8395fd696a..cdc7c5621f15d054320dc413a6740014ea0f30f3 100644
--- a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/Bob.cpp
+++ b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/Bob.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 // include header here
 #include "Bob.h"
@@ -62,9 +60,8 @@
 /*============================================================================*/
 
 Bob::Bob(VistaSystem *pVistaSystem)
+: m_pVistaSystem( pVistaSystem )
 {
-
-
 	//Loading Scene content
 	VistaGraphicsManager *pMgr = pVistaSystem->GetGraphicsManager();
 	VistaSceneGraph *pSG = pMgr->GetSceneGraph();
diff --git a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/Bob.h b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/Bob.h
index 9c4bc70993eb3f5ef4e29dd96242968e626770f8..d98927f4bf6eec8c9e7868d19929b948733e3f80 100644
--- a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/Bob.h
+++ b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/Bob.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 #ifndef __BOB_H
 #define __BOB_H
 
diff --git a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/CMakeLists.txt b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/CMakeLists.txt
index bca58fccb7bcafb63579f031da40d889fafa1147..7edff89178bef9cc025c7152e7b5d422c420c48b 100644
--- a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/CMakeLists.txt
+++ b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id$
 
 cmake_minimum_required( VERSION 2.8 )
 if( NOT VISTADEMO_COMMON_BUILD )
@@ -6,12 +5,9 @@ if( NOT VISTADEMO_COMMON_BUILD )
 
 	list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
 	include( VistaCommon )
-	
-	vista_use_package( VistaCoreLibs HEAD REQUIRED VistaKernel FIND_DEPENDENCIES )
-else()
-	vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 endif()
 
+vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 
 # Including the source files of all source subfolders recursively
 include( "./_SourceFiles.cmake" )
@@ -24,4 +20,7 @@ target_link_libraries( 17MsgPortBob
 vista_configure_app( 17MsgPortBob )
 vista_install( 17MsgPortBob )
 vista_create_default_info_file( 17MsgPortBob )
-
+if( VISTA_COMMON_BUILD )
+	set_target_properties( 17MsgPortBob PROPERTIES FOLDER "VistaDemo" )
+	add_dependencies( 17MsgPortBob VistaKernel )
+endif()
diff --git a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/CommandHandler.cpp b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/CommandHandler.cpp
index feccc2080a5e494f22a049579ae18f39744eded1..c5c0276a9fb8e0505178a6cf2f64b8d67d1354a9 100644
--- a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/CommandHandler.cpp
+++ b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/CommandHandler.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 /*============================================================================*/
 /* INCLUDES & DEFINES                                                         */
diff --git a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/CommandHandler.h b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/CommandHandler.h
index 994ac02e6cd2b50ea2244eedce3e678c7a55859a..6aeb58a6046c0ef220062b870318ce697aae5f41 100644
--- a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/CommandHandler.h
+++ b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/CommandHandler.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef __COMMANDHANDLER_H
 #define __COMMANDHANDLER_H
diff --git a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/_SourceFiles.cmake b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/_SourceFiles.cmake
index d2c8ae00c9503f02175f818a8944b81a329093a1..23104cca7d3390670ae6f89c847239b111797f17 100644
--- a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/_SourceFiles.cmake
+++ b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id: $
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/display_desktop.ini b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/display_desktop.ini
index dc207ac6d719cdbed7e4fc4e3cc292b4e6bc0392..8948ef4d333793dcccc6e6bcc0e921fb8ea7ca5e 100644
--- a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/display_desktop.ini
+++ b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/display_desktop.ini
@@ -1,4 +1,4 @@
-# $Id$
+
 # =============
 # DISPLAYSYSTEM
 # =============
diff --git a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/interaction_desktop.ini b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/interaction_desktop.ini
index 683486503f3def56f96b880ca4be94cf8e6b57d2..ae94cefbadc8114f3f9789bee9b5b801e36ee065 100644
--- a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/interaction_desktop.ini
+++ b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/interaction_desktop.ini
@@ -1,4 +1,4 @@
-# $Id$
+
 [SYSTEM]
 # DRIVERPLUGINDIRS describes where the plugin dlls for drivers can be found
 # Usually, the VISTACORELIBS_DRIVER_PLUGIN_DIRS environment variable can be used,
diff --git a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/vista.ini b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/vista.ini
index 9bd82f9f7dbebc10d3cc46315a265b38be23e566..80c73c23f3f29099ff5d8edb98c0e4cd2b149880 100644
--- a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/vista.ini
+++ b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/vista.ini
@@ -1,7 +1,7 @@
 #######################################################################
 #        V I S T A     I N I T I A L I Z A T I O N     F I L E        #
 #######################################################################
-# $Id$
+
 #######################################################################
 [SYSTEM]
 # include other ini files
diff --git a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/xml/keyboard_standardinput.xml b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/xml/keyboard_standardinput.xml
index 6534fe9273794b47d2431d4e7b8135040e3eb787..79239b534383e97786c5d683e8c799a091ea6a76 100644
--- a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/xml/keyboard_standardinput.xml
+++ b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/xml/keyboard_standardinput.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
+
 <module>
 	<nodespace>
 	</nodespace>
diff --git a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/xml/mouse_trackball.xml b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/xml/mouse_trackball.xml
index 2e9a3d48912a30ecc9a988d2878dd07012aeedd8..fe8d63393c57ef022e18de6a46ad4aa1fa05f768 100644
--- a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/xml/mouse_trackball.xml
+++ b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/xml/mouse_trackball.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
+
 <!--=========================================================================-->
 <!-- This nodes implements the default mouse navigation with trackball,      -->
 <!-- panning and zooming. The behavior is continous. You can scale the speed -->
diff --git a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/xml/mouse_trackball_continuous.xml b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/xml/mouse_trackball_continuous.xml
index 92d6a1f7c62fa69755bbb39bd6ba70682b8f000e..e65a849d4018f7b16bb55a9f6165badd902cbec7 100644
--- a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/xml/mouse_trackball_continuous.xml
+++ b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/xml/mouse_trackball_continuous.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
+
 <!--=========================================================================-->
 <!-- This nodes implements the default mouse navigation with trackball,      -->
 <!-- panning and zooming. The behavior is continous. You can scale the speed -->
diff --git a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/xml/spacenavigator_navigation.xml b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/xml/spacenavigator_navigation.xml
index c3b531d9817c6fb7c7456f4d7efc6d9fa860368d..1505fa45a166370bca33a9237f68d9adf90284a6 100644
--- a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/xml/spacenavigator_navigation.xml
+++ b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/xml/spacenavigator_navigation.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
+
 <module>
 	<nodespace></nodespace>
 	<graph>
diff --git a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/xml/ucp_picasso.xml b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/xml/ucp_picasso.xml
index 8595b87305b85ce87accd8cdf6692d9881a124c7..2cc1c5ab0cc73cc13d497a3f5f3ebc43cfd7897e 100644
--- a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/xml/ucp_picasso.xml
+++ b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/configfiles/xml/ucp_picasso.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
+
 <module>
 	<nodespace>
 	</nodespace>
diff --git a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/main.cpp b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/main.cpp
index c52ae431635cdc2ef3183a73c52996dd54131cdf..f02bbe253794d6ef3c1ced9d6b233a48383f129d 100644
--- a/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/main.cpp
+++ b/VistaDemo/17MsgPortDemo/Bob_ApplicationDemo/main.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 /*
 
diff --git a/VistaDemo/17MsgPortDemo/CMakeLists.txt b/VistaDemo/17MsgPortDemo/CMakeLists.txt
index e51d453e265cbe567564098a18c6f53bbdd108b3..0c5a15e936a516eb0c7ba30db641059a08f4c3be 100644
--- a/VistaDemo/17MsgPortDemo/CMakeLists.txt
+++ b/VistaDemo/17MsgPortDemo/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id$
 
 add_subdirectory( Alice_shellDemo )
 add_subdirectory( Bob_ApplicationDemo )
\ No newline at end of file
diff --git a/VistaDemo/18DebuggingToolsDemo/CMakeLists.txt b/VistaDemo/18DebuggingToolsDemo/CMakeLists.txt
index 2df80df6dd4ecd115b852827b630e35f7164efa4..4f9e2c0cf42cca8a50c9c9a216174f326ce43c1d 100644
--- a/VistaDemo/18DebuggingToolsDemo/CMakeLists.txt
+++ b/VistaDemo/18DebuggingToolsDemo/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id$
 
 cmake_minimum_required( VERSION 2.8 )
 if( NOT VISTADEMO_COMMON_BUILD )
@@ -6,12 +5,9 @@ if( NOT VISTADEMO_COMMON_BUILD )
 
 	list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
 	include( VistaCommon )
-	
-	vista_use_package( VistaCoreLibs HEAD REQUIRED VistaKernel FIND_DEPENDENCIES )
-else()
-	vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 endif()
 
+vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 
 # Including the source files of all source subfolders recursively
 include( "./_SourceFiles.cmake" )
@@ -24,4 +20,7 @@ target_link_libraries( 18DebuggingToolsDemo
 vista_configure_app( 18DebuggingToolsDemo )
 vista_install( 18DebuggingToolsDemo )
 vista_create_default_info_file( 18DebuggingToolsDemo )
-
+if( VISTA_COMMON_BUILD )
+	set_target_properties( 18DebuggingToolsDemo PROPERTIES FOLDER "VistaDemo" )
+	add_dependencies( 18DebuggingToolsDemo VistaKernel )
+endif()
diff --git a/VistaDemo/18DebuggingToolsDemo/DebuggingToolsDemo.cpp b/VistaDemo/18DebuggingToolsDemo/DebuggingToolsDemo.cpp
index 8d44037c5aa6d296d8abb7d4d31888b879160ce5..a1bd72584ab4a498cd331ea65afdee0a6d5497ce 100644
--- a/VistaDemo/18DebuggingToolsDemo/DebuggingToolsDemo.cpp
+++ b/VistaDemo/18DebuggingToolsDemo/DebuggingToolsDemo.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id: StackWalkerGeomDemo.cpp$
- */
+
 
 /**
  * Description:
diff --git a/VistaDemo/18DebuggingToolsDemo/DebuggingToolsDemo.h b/VistaDemo/18DebuggingToolsDemo/DebuggingToolsDemo.h
index ab12a859972baf489d5661cd74b86282dba790dd..62fecd45fa1b87fa77a4be48a3afaaae2901b706 100644
--- a/VistaDemo/18DebuggingToolsDemo/DebuggingToolsDemo.h
+++ b/VistaDemo/18DebuggingToolsDemo/DebuggingToolsDemo.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef _DEBUGGINGTOOLSDEMOAPPL_H
 #define _DEBUGGINGTOOLSDEMOAPPL_H
diff --git a/VistaDemo/18DebuggingToolsDemo/_SourceFiles.cmake b/VistaDemo/18DebuggingToolsDemo/_SourceFiles.cmake
index bf3ce0f565fc1d34ffab677aab186dba727dc7c9..3c131d07a97f132855d6d5d6426ce6ecd45c4c49 100644
--- a/VistaDemo/18DebuggingToolsDemo/_SourceFiles.cmake
+++ b/VistaDemo/18DebuggingToolsDemo/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id: $
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaDemo/18DebuggingToolsDemo/main.cpp b/VistaDemo/18DebuggingToolsDemo/main.cpp
index be7ac8f76bc19ea50371e07c8d9b2bb617e4236f..26ef004e81cca78f5895f2030521536d55fa3040 100644
--- a/VistaDemo/18DebuggingToolsDemo/main.cpp
+++ b/VistaDemo/18DebuggingToolsDemo/main.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id: main.cpp$
- */
+
 
 /**
  * Description:
diff --git a/VistaDemo/19TimeDemo/CMakeLists.txt b/VistaDemo/19TimeDemo/CMakeLists.txt
index 79497326a49c9969425426f73fcbfab0cd71534f..49a436f8a852ba54c61023023b140231e2646e79 100644
--- a/VistaDemo/19TimeDemo/CMakeLists.txt
+++ b/VistaDemo/19TimeDemo/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id$
 
 cmake_minimum_required( VERSION 2.8 )
 if( NOT VISTADEMO_COMMON_BUILD )
@@ -6,12 +5,9 @@ if( NOT VISTADEMO_COMMON_BUILD )
 
 	list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
 	include( VistaCommon )
-	
-	vista_use_package( VistaCoreLibs HEAD REQUIRED VistaKernel FIND_DEPENDENCIES )
-else()
-	vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 endif()
 
+vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 
 # Including the source files of all source subfolders recursively
 include( "./_SourceFiles.cmake" )
@@ -24,4 +20,8 @@ target_link_libraries( 19TimeDemo
 vista_configure_app( 19TimeDemo )
 vista_install( 19TimeDemo )
 vista_create_default_info_file( 19TimeDemo )
+if( VISTA_COMMON_BUILD )
+	set_target_properties( 19TimeDemo PROPERTIES FOLDER "VistaDemo" )
+	add_dependencies( 19TimeDemo VistaKernel )
+endif()
 
diff --git a/VistaDemo/19TimeDemo/_SourceFiles.cmake b/VistaDemo/19TimeDemo/_SourceFiles.cmake
index 5bc35ea7fd395fd4faddcb245fad8a792bec6f46..be8d42227cb7054b38b1cff0c91228ce9098f868 100644
--- a/VistaDemo/19TimeDemo/_SourceFiles.cmake
+++ b/VistaDemo/19TimeDemo/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaDemo/19TimeDemo/main.cpp b/VistaDemo/19TimeDemo/main.cpp
index 95e75719955f823ece3651f8b5f30735ff62e1ff..e9c4137a9d0a98e2b6d845eb9dbe4a3172c13eba 100644
--- a/VistaDemo/19TimeDemo/main.cpp
+++ b/VistaDemo/19TimeDemo/main.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id: main.cpp$
- */
+
 
 /**
  * Description:
@@ -63,6 +61,7 @@ void ShowTimeUtils()
 
 	// VistaType::microtime represents arbitrary time intervals
 	VistaType::microtime nRelativeTime = 3.5; // 3 seconds and 500 milliseconds
+	std::cout << "nRelativeTime = " << vstr::formattime(nRelativeTime) << " seconds" << std::endl;
 
 	// VistaType::systemtime represents seconds since January 1, 1970 (unix time)
 	VistaType::systemtime nDate1 = 12 * 60 * 60; // january 1, 1970 at noon
@@ -184,11 +183,16 @@ void ShowVistaTimer()
 	// needs around 10 of its ~16 significant bits are used, so accuracy degrades
 	// in nanosecond and low-microsecond regions
 	VistaType::systemtime nAbsoluteTime = oStandardTimer.GetSystemTime();
+	std::cout << "The current time is: " << VistaTimeUtils::ConvertToFormattedTimeString(nAbsoluteTime, "%A, %d of %B %Y, %H:%M:%S") << std::endl;
+
 	// microtime is relative to an arbitrary timestamp (usually the start of the application)
 	// so it has enough significant digits to utilize the full resolution of the timer
 	VistaType::microtime nRelativeTime = oStandardTimer.GetMicroTime();
+	std::cout << "nRelativeTime = " << vstr::formattime(nRelativeTime) << std::endl;
+
 	// microstamp is an arbitrary, monotonously rising counter
 	VistaType::microstamp nStamp = oStandardTimer.GetMicroStamp();
+	std::cout << "nStamp = " << nStamp << std::endl;
 
 	// The actual resolution of the timer depends on the system - let's estimate it
 	// these are very rough estimates, but should give a hint on the magnitude
diff --git a/VistaDemo/20PythonDFNDemo/ApplyColorActionObject.cpp b/VistaDemo/20PythonDFNDemo/ApplyColorActionObject.cpp
index 66c11cf2fb229575c961c93362afb68cc2e3016e..89953ad0e91f9bfdeeefc2210b853d7590baa00d 100644
--- a/VistaDemo/20PythonDFNDemo/ApplyColorActionObject.cpp
+++ b/VistaDemo/20PythonDFNDemo/ApplyColorActionObject.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id: GeometryDemoAppl.cpp 5427 2010-07-23 15:45:53Z tbeer $
- */
+
 #include "ApplyColorActionObject.h" 
 
 #include <VistaKernel/GraphicsManager/VistaGeometry.h>
diff --git a/VistaDemo/20PythonDFNDemo/ApplyColorActionObject.h b/VistaDemo/20PythonDFNDemo/ApplyColorActionObject.h
index c6681e7654cc77a10d41be12625d35b1e9e1011e..14c2e99ceeb074db244fdbf7d086456dd68475a6 100644
--- a/VistaDemo/20PythonDFNDemo/ApplyColorActionObject.h
+++ b/VistaDemo/20PythonDFNDemo/ApplyColorActionObject.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id: GeometryDemoAppl.h 5427 2010-07-23 15:45:53Z tbeer $
- */
+
 
 #ifndef _APPLYCOLORACTIONOBJECT_H
 #define _APPLYCOLORACTIONOBJECT_H
diff --git a/VistaDemo/20PythonDFNDemo/CMakeLists.txt b/VistaDemo/20PythonDFNDemo/CMakeLists.txt
index 49d752dd19d5d4bd2e0d4289fadcdb60f4fd02c0..aa6199688aa5027fdb2356c493dc1809c363e5e0 100644
--- a/VistaDemo/20PythonDFNDemo/CMakeLists.txt
+++ b/VistaDemo/20PythonDFNDemo/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id: $
 
 cmake_minimum_required( VERSION 2.8 )
 if( NOT VISTADEMO_COMMON_BUILD )
@@ -6,13 +5,13 @@ if( NOT VISTADEMO_COMMON_BUILD )
 
 	list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
 	include( VistaCommon )
-endif( NOT VISTADEMO_COMMON_BUILD )
+endif()
+
+vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 
 # get boost
 #set(Boost_USE_STATIC_LIBS   ON)
 #set(Boost_USE_MULTITHREADED ON)
-#SET(BOOST_ROOT "$ENV{HOME}/usr")
-
 vista_use_package(Boost COMPONENTS
                 system
                 thread
@@ -24,8 +23,6 @@ find_package(PythonLibs REQUIRED)
 include_directories(${PYTHON_INCLUDE_DIRS})
 link_directories(${PYTHON_LIBRARIES})
 
-vista_use_package( VistaCoreLibs HEAD REQUIRED VistaKernel FIND_DEPENDENCIES )
-
 # Including the source files of all source subfolders recursively
 include( "./_SourceFiles.cmake" )
 
@@ -38,4 +35,8 @@ target_link_libraries( 20PythonDFNDemo
 vista_configure_app( 20PythonDFNDemo )
 vista_install( 20PythonDFNDemo )
 vista_create_default_info_file( 20PythonDFNDemo )
+if( VISTA_COMMON_BUILD )
+	set_target_properties( 20PythonDFNDemo PROPERTIES FOLDER "VistaDemo" )
+	add_dependencies( 20PythonDFNDemo VistaKernel )
+endif()
 
diff --git a/VistaDemo/20PythonDFNDemo/ColorChangerDfnNode.cpp b/VistaDemo/20PythonDFNDemo/ColorChangerDfnNode.cpp
index 73b5446cae73e5fc22505b3a1e32c4f433938ee3..165d2cc34dd2087acda6c35213e77ee83d17bf51 100644
--- a/VistaDemo/20PythonDFNDemo/ColorChangerDfnNode.cpp
+++ b/VistaDemo/20PythonDFNDemo/ColorChangerDfnNode.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: ColorChangerDfnNode.cpp 5427 2010-07-23 15:45:53Z tbeer $
+
 
 #include "ColorChangerDfnNode.h"
 
diff --git a/VistaDemo/20PythonDFNDemo/ColorChangerDfnNode.h b/VistaDemo/20PythonDFNDemo/ColorChangerDfnNode.h
index 0cdfeb409748b1cae25b855a862b87ae19225a41..ee85e62417c4f4d9c377af888f24ea1060ffdefb 100644
--- a/VistaDemo/20PythonDFNDemo/ColorChangerDfnNode.h
+++ b/VistaDemo/20PythonDFNDemo/ColorChangerDfnNode.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: ColorChangerDfnNode.h 5427 2010-07-23 15:45:53Z tbeer $
+
 
 #ifndef _COLORCHANGERDFNNODE_H
 #define _COLORCHANGERDFNNODE_H
diff --git a/VistaDemo/20PythonDFNDemo/RandomNumberDfnNode.cpp b/VistaDemo/20PythonDFNDemo/RandomNumberDfnNode.cpp
index 6d19e2dbfb18e0db383a0e26df92a687db796a83..b0bf288b9f5dae04e69e9a92da8510caf26c1bdf 100644
--- a/VistaDemo/20PythonDFNDemo/RandomNumberDfnNode.cpp
+++ b/VistaDemo/20PythonDFNDemo/RandomNumberDfnNode.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: RandomNumberDfnNode.cpp 5427 2010-07-23 15:45:53Z tbeer $
+
 
 #include "RandomNumberDfnNode.h"
 
diff --git a/VistaDemo/20PythonDFNDemo/RandomNumberDfnNode.h b/VistaDemo/20PythonDFNDemo/RandomNumberDfnNode.h
index 20d69e31b7d929bfe639576279400adb79e2b762..f996481bbec237c4fc442f3dffbea19f08019b6e 100644
--- a/VistaDemo/20PythonDFNDemo/RandomNumberDfnNode.h
+++ b/VistaDemo/20PythonDFNDemo/RandomNumberDfnNode.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,7 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-// $Id: Vdfn3DNormalizeNode.h 5427 2010-07-23 15:45:53Z tbeer $
+
 
 #ifndef _RANDOMNUMBERDFNNODE_H
 #define _RANDOMNUMBERDFNNODE_H
diff --git a/VistaDemo/20PythonDFNDemo/SetPositionActionObject.cpp b/VistaDemo/20PythonDFNDemo/SetPositionActionObject.cpp
index 3ac72a131437cbc5351ad3a513f2079311f54756..3565ae737cf95f5b03c959cf1fda7369138ed2a8 100644
--- a/VistaDemo/20PythonDFNDemo/SetPositionActionObject.cpp
+++ b/VistaDemo/20PythonDFNDemo/SetPositionActionObject.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id: GeometryDemoAppl.cpp 5427 2010-07-23 15:45:53Z tbeer $
- */
+
 #include "SetPositionActionObject.h" 
 
 #include <VistaKernel/GraphicsManager/VistaTransformNode.h>
diff --git a/VistaDemo/20PythonDFNDemo/SetPositionActionObject.h b/VistaDemo/20PythonDFNDemo/SetPositionActionObject.h
index ce2e56d75290c1d7697c6c7c972e43690a3edaab..4d3967f4c7f39b6d759aef1f6f7fbfa350dc9d2a 100644
--- a/VistaDemo/20PythonDFNDemo/SetPositionActionObject.h
+++ b/VistaDemo/20PythonDFNDemo/SetPositionActionObject.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id: GeometryDemoAppl.h 5427 2010-07-23 15:45:53Z tbeer $
- */
+
 
 #ifndef _SETPOSITIONACTIONOBJECT_H
 #define _SETPOSITIONACTIONOBJECT_H
diff --git a/VistaDemo/20PythonDFNDemo/_SourceFiles.cmake b/VistaDemo/20PythonDFNDemo/_SourceFiles.cmake
index 80e400a4a152a89a645a2a17ed3cdf0d9d17b10b..b0971e33d5850b33a2da04f22ec235aa926f30f5 100644
--- a/VistaDemo/20PythonDFNDemo/_SourceFiles.cmake
+++ b/VistaDemo/20PythonDFNDemo/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id: $
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
@@ -11,10 +11,10 @@ set( DirFiles
 	RandomNumberDfnNode.cpp
 	RandomNumberDfnNode.h
 	SetPositionActionObject.cpp
-	SetPositionActionObject.h
-	PyDfnNodeCreate.cpp
-	PyDfnNodeCreate.h
-	PyDfnNode.cpp
+	SetPositionActionObject.h
+	PyDfnNodeCreate.cpp
+	PyDfnNodeCreate.h
+	PyDfnNode.cpp
 	PyDfnNode.h
 	main.cpp
 )
diff --git a/VistaDemo/20PythonDFNDemo/configfiles/display.ini b/VistaDemo/20PythonDFNDemo/configfiles/display.ini
index 429e3adfcc922b45867f720a9e14062273b2ef7f..b1687b097c5c5e18a87ac96e278e50d94060f900 100644
--- a/VistaDemo/20PythonDFNDemo/configfiles/display.ini
+++ b/VistaDemo/20PythonDFNDemo/configfiles/display.ini
@@ -1,4 +1,4 @@
-# $Id: display_desktop.ini 5391 2010-07-06 12:05:17Z escorter87 $
+
 # =============
 # DISPLAYSYSTEM
 # =============
diff --git a/VistaDemo/20PythonDFNDemo/configfiles/interaction.ini b/VistaDemo/20PythonDFNDemo/configfiles/interaction.ini
index 140bd838f19d21380b545aa19a8f0952da87f89b..c87cc519d22de8afebd48b9f4a3587a482818450 100644
--- a/VistaDemo/20PythonDFNDemo/configfiles/interaction.ini
+++ b/VistaDemo/20PythonDFNDemo/configfiles/interaction.ini
@@ -1,4 +1,4 @@
-# $Id: interaction_desktop.ini 5363 2010-06-22 13:05:32Z tbeer $
+
 [SYSTEM]
 DEVICEDRIVERS = KEYBOARD, MOUSE
 INTERACTIONCONTEXTS = KEYBOARD_CTX, SPHERE_POSITION, SPHERE_COLOR
diff --git a/VistaDemo/20PythonDFNDemo/configfiles/vista.ini b/VistaDemo/20PythonDFNDemo/configfiles/vista.ini
index 2a6c3a0f502a31ceb319d56ee6bbbc6b1f9a040f..d7cc734d3d782245007061af2d48e852a4bdb5ae 100644
--- a/VistaDemo/20PythonDFNDemo/configfiles/vista.ini
+++ b/VistaDemo/20PythonDFNDemo/configfiles/vista.ini
@@ -1,7 +1,7 @@
 #######################################################################
 #        V I S T A     I N I T I A L I Z A T I O N     F I L E        #
 #######################################################################
-# $Id: vista.ini 5363 2010-06-22 13:05:32Z tbeer $
+
 #######################################################################
 [SYSTEM]
 MSGPORT			= FALSE
diff --git a/VistaDemo/20PythonDFNDemo/configfiles/xml/keyboard_standardinput.xml b/VistaDemo/20PythonDFNDemo/configfiles/xml/keyboard_standardinput.xml
index 0e15d2e2b05f0e7ca96416941c21caa680c67d1a..95128a03beeb1ca4cd78192087f4cf58903248ce 100644
--- a/VistaDemo/20PythonDFNDemo/configfiles/xml/keyboard_standardinput.xml
+++ b/VistaDemo/20PythonDFNDemo/configfiles/xml/keyboard_standardinput.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id: keyboard_standardinput.xml 5363 2010-06-22 13:05:32Z tbeer $ -->
+
 <module>
 	<nodespace>
 	</nodespace>
diff --git a/VistaDemo/20PythonDFNDemo/configfiles/xml/spherecolor.xml b/VistaDemo/20PythonDFNDemo/configfiles/xml/spherecolor.xml
index 3ed0888fe714de193b9639b4adf0b618cfba783c..d7e9b7377777442c7de5469b0160f0689797e2aa 100644
--- a/VistaDemo/20PythonDFNDemo/configfiles/xml/spherecolor.xml
+++ b/VistaDemo/20PythonDFNDemo/configfiles/xml/spherecolor.xml
@@ -1,13 +1,13 @@
-<!-- $Id: worldpointer_mouse.xml,v 1.2 2010-04-29 08:35:07 dr165799 Exp $ -->
+
 <module>
 	<nodespace>
 	</nodespace>
-	<graph>
-		<node name="py_test_node" type="Python">
-			<param name="path" value="test_node.py"/>
-		</node>
-
-
+	<graph>
+		<node name="py_test_node" type="Python">
+			<param name="path" value="test_node.py"/>
+		</node>
+
+
 		<node name="mouse_source" type="DriverSensor">
 			<param name="sensor_index" value="0"/>
 			<param name="driver" value="MOUSE"/>
@@ -18,8 +18,8 @@
 		-->
 		<node name="mouse" type="HistoryProject">
 			<param name="project">X_POS, Y_POS</param>
-		</node>
-
+		</node>
+
 		<!--
 			We then create a color changer node
 		-->
@@ -57,8 +57,8 @@
 		
 		<edge fromnode="color_changer" tonode="sphereposition" fromport="color" toport="color"/>
 		
-		<edge fromnode="sphereposition" tonode="colortext" fromport="color" toport="value"/>
-
+		<edge fromnode="sphereposition" tonode="colortext" fromport="color" toport="value"/>
+
 		<edge fromnode="mouse_source" tonode="mouse" fromport="history" toport="history"/>
 		
 		<edge fromnode="mouse" tonode="py_test_node" fromport="X_POS" toport="in_x"/>
diff --git a/VistaDemo/20PythonDFNDemo/configfiles/xml/sphereposition.xml b/VistaDemo/20PythonDFNDemo/configfiles/xml/sphereposition.xml
index 1bcd7f6a6adcd463c1c2ac03091b1be0a6cc752b..3396141a69e74f00c05bb930a0ab5a8871f62014 100644
--- a/VistaDemo/20PythonDFNDemo/configfiles/xml/sphereposition.xml
+++ b/VistaDemo/20PythonDFNDemo/configfiles/xml/sphereposition.xml
@@ -1,4 +1,4 @@
-<!-- $Id: worldpointer_mouse.xml,v 1.2 2010-04-29 08:35:07 dr165799 Exp $ -->
+
 <!-- 
 	We want to create a graph that reads sensor data from the mouse, converts it
 	to a 3D position, and feeds it to the SetPositionActionObject we created in
diff --git a/VistaDemo/20PythonDFNDemo/main.cpp b/VistaDemo/20PythonDFNDemo/main.cpp
index 7f4855a564338adb89b46d6b4e2226abb1253e4c..fa4b5abb876fd7afdf2f18e09e5b08886a0af885 100644
--- a/VistaDemo/20PythonDFNDemo/main.cpp
+++ b/VistaDemo/20PythonDFNDemo/main.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id: main.cpp 19876 2010-11-18 16:25:02Z mjoppich $
- */
+
 
 #include "ColorChangerDfnNode.h"
 #include "RandomNumberDfnNode.h"
diff --git a/VistaDemo/21ClusterModeDemo/CMakeLists.txt b/VistaDemo/21ClusterModeDemo/CMakeLists.txt
index ab0ca21e84ee00dd3a0b541748f1687ef01bc172..2283ea908160a1168b4d533af616b60d02e7a72d 100644
--- a/VistaDemo/21ClusterModeDemo/CMakeLists.txt
+++ b/VistaDemo/21ClusterModeDemo/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id$
 
 cmake_minimum_required( VERSION 2.8 )
 if( NOT VISTADEMO_COMMON_BUILD )
@@ -6,12 +5,9 @@ if( NOT VISTADEMO_COMMON_BUILD )
 
 	list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
 	include( VistaCommon )
-	
-	vista_use_package( VistaCoreLibs HEAD REQUIRED VistaKernel FIND_DEPENDENCIES )
-else()
-	vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 endif()
 
+vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 
 # Including the source files of all source subfolders recursively
 include( "./_SourceFiles.cmake" )
@@ -24,4 +20,8 @@ target_link_libraries( 21ClusterModeDemo
 vista_configure_app( 21ClusterModeDemo )
 vista_install( 21ClusterModeDemo )
 vista_create_default_info_file( 21ClusterModeDemo )
+if( VISTA_COMMON_BUILD )
+	set_target_properties( 21ClusterModeDemo PROPERTIES FOLDER "VistaDemo" )
+	add_dependencies( 21ClusterModeDemo VistaKernel )
+endif()
 
diff --git a/VistaDemo/21ClusterModeDemo/ClusterModeDemo.cpp b/VistaDemo/21ClusterModeDemo/ClusterModeDemo.cpp
index 5de9e36b1da97a1b0853f06890e1b5907a2f450c..5b089534c5535951b401a50bf503828b1d24f38d 100644
--- a/VistaDemo/21ClusterModeDemo/ClusterModeDemo.cpp
+++ b/VistaDemo/21ClusterModeDemo/ClusterModeDemo.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -17,9 +17,7 @@
 /*  You should have received a copy of the GNU Lesser General Public License  */
 /*  along with this program.  If not, see <http://www.gnu.org/licenses/>.     */
 /*============================================================================*/
-/*
- * $Id: StackWalkerGeomDemo.cpp$
- */
+
 
 /**
  * Description:
@@ -107,8 +105,6 @@ private:
 	mutable VistaMutex m_oFinishMutex;
 	bool m_bFinishFlag;
 	std::string m_sComputedData;
-
-	int m_nComputationMsgEventType;
 };
 
 const int s_nComputationExternalMessageTag = 666;
@@ -190,8 +186,6 @@ void ClusterModeDemo::HandleEvent( VistaEvent* pEvent )
 {
 	if( pEvent->GetType() == VistaSystemEvent::GetTypeId() )
 	{
-		int nFrameCount = m_pVistaSystem->GetFrameLoop()->GetFrameCount();
-
 		// we'll start a computation on the master, which will compute something
 		// on the slaves, we have to do nothing. This will show how to synchronize 
 		// infrequent events using the VistaExternalMessageEvent
diff --git a/VistaDemo/21ClusterModeDemo/ClusterModeDemo.h b/VistaDemo/21ClusterModeDemo/ClusterModeDemo.h
index 11fa7f2b777d59d8e054e26290606d90dff39d31..13724c13a5eeb7618593f603799db71f87099550 100644
--- a/VistaDemo/21ClusterModeDemo/ClusterModeDemo.h
+++ b/VistaDemo/21ClusterModeDemo/ClusterModeDemo.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef _CLUSTERMODEDEMO_H
 #define _CLUSTERMODEDEMO_H
diff --git a/VistaDemo/21ClusterModeDemo/_SourceFiles.cmake b/VistaDemo/21ClusterModeDemo/_SourceFiles.cmake
index dbbca78eb7d9a7df2f6cd418445bd5808292d34d..912b243a0326b9d2ca3049b35f43cec470a6de71 100644
--- a/VistaDemo/21ClusterModeDemo/_SourceFiles.cmake
+++ b/VistaDemo/21ClusterModeDemo/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaDemo/21ClusterModeDemo/configfiles/vista.ini b/VistaDemo/21ClusterModeDemo/configfiles/vista.ini
index 6aca453fb28468a6a96addaf5a0846595aeaebd8..71343861423886fcf5978750fc92841f115d8687 100644
--- a/VistaDemo/21ClusterModeDemo/configfiles/vista.ini
+++ b/VistaDemo/21ClusterModeDemo/configfiles/vista.ini
@@ -1,7 +1,7 @@
 #######################################################################
 #        V I S T A     I N I T I A L I Z A T I O N     F I L E        #
 #######################################################################
-# $Id$
+
 #######################################################################
 [SYSTEM]
 # include other ini files
diff --git a/VistaDemo/21ClusterModeDemo/main.cpp b/VistaDemo/21ClusterModeDemo/main.cpp
index d463fbc1f41920c2539639c3efd3c34d999d8fb4..805424e005808eaeafb89ca983a4ecb0665453a2 100644
--- a/VistaDemo/21ClusterModeDemo/main.cpp
+++ b/VistaDemo/21ClusterModeDemo/main.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id: main.cpp$
- */
+
 
 /**
  * Description:
diff --git a/VistaDemo/22RecordReplayDemo/CMakeLists.txt b/VistaDemo/22RecordReplayDemo/CMakeLists.txt
index 133a483ce3a061bc6c8e5646e45fffa8440bc886..9d0dc4e745c278c292117b521e60b990018ef881 100644
--- a/VistaDemo/22RecordReplayDemo/CMakeLists.txt
+++ b/VistaDemo/22RecordReplayDemo/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id$
 
 cmake_minimum_required( VERSION 2.8 )
 if( NOT VISTADEMO_COMMON_BUILD )
@@ -6,12 +5,9 @@ if( NOT VISTADEMO_COMMON_BUILD )
 
 	list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
 	include( VistaCommon )
-	
-	vista_use_package( VistaCoreLibs HEAD REQUIRED VistaKernel FIND_DEPENDENCIES )
-else()
-	vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 endif()
 
+vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 
 # Including the source files of all source subfolders recursively
 include( "./_SourceFiles.cmake" )
@@ -24,4 +20,7 @@ target_link_libraries( 22RecordReplayDemo
 vista_configure_app( 22RecordReplayDemo )
 vista_install( 22RecordReplayDemo )
 vista_create_default_info_file( 22RecordReplayDemo )
-
+if( VISTA_COMMON_BUILD )
+	set_target_properties( 22RecordReplayDemo PROPERTIES FOLDER "VistaDemo" )
+	add_dependencies( 22RecordReplayDemo VistaKernel )
+endif()
diff --git a/VistaDemo/22RecordReplayDemo/_SourceFiles.cmake b/VistaDemo/22RecordReplayDemo/_SourceFiles.cmake
index 5bc35ea7fd395fd4faddcb245fad8a792bec6f46..be8d42227cb7054b38b1cff0c91228ce9098f868 100644
--- a/VistaDemo/22RecordReplayDemo/_SourceFiles.cmake
+++ b/VistaDemo/22RecordReplayDemo/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaDemo/22RecordReplayDemo/main.cpp b/VistaDemo/22RecordReplayDemo/main.cpp
index 3d8c173528ed971dd6599cc56d3762a7cdb76c37..4ceb5d3c3390fbb9999b20092c6db052cab1ae04 100644
--- a/VistaDemo/22RecordReplayDemo/main.cpp
+++ b/VistaDemo/22RecordReplayDemo/main.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id: main.cpp$
- */
+
 
 /**
  * Description:
diff --git a/VistaDemo/BUILDINFO b/VistaDemo/BUILDINFO
new file mode 100644
index 0000000000000000000000000000000000000000..197a1fa87ca15d73df7147617975732c2b9a13e4
--- /dev/null
+++ b/VistaDemo/BUILDINFO
@@ -0,0 +1,7 @@
+VistaDemo uses CMake (www.cmake.org/) with version 2.8.5 or greater.
+Furthermore, it requires custom cmake extensions called VistaCMakeCommon, which can be checked out from the svn or downloaded from sourceforge.
+To ensure cmake finds the VistaCMakeCommon, either define the VISTA_CMAKE_COMMON environment variable.
+On more information about external dependencies, blease refer to the BUILDINFO file of VistaCoreLibs.
+
+Configure VistaDemo with cmake, either from the VistaDemo folder, or from the toplevel ViSTA forlder to build it together with the VistaCoreLibs.
+Afterwards, build it, and run the desired demo app.
diff --git a/VistaDemo/CMakeLists.txt b/VistaDemo/CMakeLists.txt
index 4b736ec5464411f414a5f9420d9a5b47138985ff..1a9100fa542a16bde06a13ed3cff3c86926577c8 100644
--- a/VistaDemo/CMakeLists.txt
+++ b/VistaDemo/CMakeLists.txt
@@ -1,18 +1,44 @@
-# $Id$
-
-cmake_minimum_required( VERSION 2.8 )
-project( VistaDemo )
+if( NOT VISTA_COMMON_BUILD )
+	cmake_minimum_required( VERSION 2.8 )
+	project( VistaDemo )
+endif()
 
 list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
-include( VistaCommon )
+file( TO_CMAKE_PATH "$ENV{VISTA_CMAKE_COMMON}" _CMAKE_PATH_ENV )
 
-vista_set_version( VistaDemo HEAD HEAD 1 0 svn_rev )
+if( EXISTS "${_CMAKE_PATH_ENV}" )
+	list( APPEND CMAKE_MODULE_PATH "${_CMAKE_PATH_ENV}" )
+elseif( EXISTS "${VistaCoreLibs_SOURCE_DIR}/VistaCMakeCommon" )
+	list( APPEND CMAKE_MODULE_PATH "${VistaCoreLibs_SOURCE_DIR}/VistaCMakeCommon" )
+elseif( EXISTS "${CMAKE_SOURCE_DIR}/VistaCMakeCommon" )
+	list( APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/VistaCMakeCommon" )
+else()
+	find_file( VISTACORELIBS_CMAKE_COMMON_TEST_FILE "VistaCommon.cmake" 
+				PATH ${CMAKE_MODULE_PATH} $ENV{CMAKE_MODULE_PATH}
+				[NO_DEFAULT_PATH] )
+	set( VISTACORELIBS_CMAKE_COMMON_TEST_FILE ${VISTACORELIBS_CMAKE_COMMON_TEST_FILE} CACHE INTERNAL "" FORCE )
+	if( NOT VISTACORELIBS_CMAKE_COMMON_TEST_FILE )
+		message( FATAL_ERROR 
+			"ERROR: Folder VistaCMakeCommon not found, but is required for successfull build. "
+			"Please make the VistaCMakeCommon folder available using one ofthe following methods:\n"
+			"\t- define VISTA_CMAKE_COMMON environment var pointing to the folder\n"
+			"\t- add folder to environment variables CMAKE_MODULE_PATH and CMAKE_PREFIX_PATH\n"
+			"\t- place VistaCMakeCommon as subdirectory of VistaCoreLibs directory"
+			"\t- place VistaCMakeCommon as subdirectory of top-level Vista ddirectory (if building from top-level cmake file, together with demos)"
+		)
+	endif()
+endif()
+include( VistaCommon )
 
-vista_use_package( VistaCoreLibs "HEAD" REQUIRED VistaKernel FIND_DEPENDENCIES )
 
-include_directories( ${VistaDemo_SOURCE_DIR} )
+vista_set_version( VistaDemo HEAD HEAD 1 0 0 )
 
-# this variable indicates to sub-projects that they are build all together
+if( VISTA_COMMON_BUILD )
+	if( NOT VISTACORELIBS_BUILD_KERNEL )
+		message( FATAL_ERROR "VistaDemo cannot be built - VistaCorelibs component VistaKernel is not activated" )
+	endif()
+	vista_use_package( VistaCoreLibs REQUIRED VistaKernel PATHS "${CMAKE_BINARY_DIR}/cmake" NO_DEFAULT_PATH FIND_DEPENDENCIES )
+endif()
 set( VISTADEMO_COMMON_BUILD TRUE )
 
 # Standard package config
@@ -28,8 +54,8 @@ vista_conditional_add_subdirectory( VISTADEMO_BUILD_07OVERLAYDEMO 07OverlayDemo
 vista_conditional_add_subdirectory( VISTADEMO_BUILD_09EVENTDEMO 09EventDemo ON )
 vista_conditional_add_subdirectory( VISTADEMO_BUILD_10DISPLAYDEMO 10DisplayDemo ON )
 vista_conditional_add_subdirectory( VISTADEMO_BUILD_11OGLDEMO 11OGLDemo ON )
-vista_conditional_add_subdirectory( VISTADEMO_BUILD_13KERNELOPENSGEXTDEMO 13KernelOpenSGExtDemo 11OGLDemo ON )
 vista_conditional_add_subdirectory( VISTADEMO_BUILD_12INTENTIONSELECTDEMO 12IntentionSelectDemo ON )
+vista_conditional_add_subdirectory( VISTADEMO_BUILD_13KERNELOPENSGEXTDEMO 13KernelOpenSGExtDemo ON )
 vista_conditional_add_subdirectory( VISTADEMO_BUILD_14DATAFLOWNETDEMO 14DataFlowNetDemo ON )
 vista_conditional_add_subdirectory( VISTADEMO_BUILD_15VTKDEMO 15VtkDemo OFF )
 vista_conditional_add_subdirectory( VISTADEMO_BUILD_16PHANTOMDEMO 16PhantomDemo OFF )
@@ -40,8 +66,6 @@ vista_conditional_add_subdirectory( VISTADEMO_BUILD_20PYTHONDFNDEMO 20PythonDFND
 vista_conditional_add_subdirectory( VISTADEMO_BUILD_21CLUSTERMODEDEMO 21ClusterModeDemo ON )
 vista_conditional_add_subdirectory( VISTADEMO_BUILD_22RECORDREPLAYDEMO 22RecordReplayDemo ON )
 
-vista_add_external_msvc_project_of_package( VistaCoreLibs "ExternalLibs" )
-
 # additional package configuration
 if( ${VISTA_BUILD_PACKS} )
 
diff --git a/VistaDemo/LICENSE b/VistaDemo/LICENSE
index daaa3cfb40a3fd4ee352c785f9bb5ae74713a7dd..4807238517201a82b6c27417a2cd009506e2a249 100644
--- a/VistaDemo/LICENSE
+++ b/VistaDemo/LICENSE
@@ -1,6 +1,6 @@
 ======================================================================
                            ViSTA VR toolkit
-            Copyright (c) 1997-2010 RWTH Aachen University
+            Copyright (c) 1997-2016 RWTH Aachen University
 ======================================================================
 
  Contact Information
diff --git a/VistaDemo/LICENSE.LESSER b/VistaDemo/LICENSE.LESSER
index 497b9fb798f49efede3101daafa4f611dd63f038..070c965348820432e578833676e03c90b21951d0 100644
--- a/VistaDemo/LICENSE.LESSER
+++ b/VistaDemo/LICENSE.LESSER
@@ -1,6 +1,6 @@
 ======================================================================
                            ViSTA VR toolkit
-            Copyright (c) 1997-2010 RWTH Aachen University
+            Copyright (c) 1997-2016 RWTH Aachen University
 ======================================================================
 
  Contact Information
diff --git a/VistaDemo/README b/VistaDemo/README
new file mode 100644
index 0000000000000000000000000000000000000000..03225a36eed2c27bed2b1c82cdede6f960656edf
--- /dev/null
+++ b/VistaDemo/README
@@ -0,0 +1,67 @@
+/*============================================================================*/
+/*                              ViSTA VR toolkit                              */
+/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*============================================================================*/
+/*                                  License                                   */
+/*                                                                            */
+/*  This program is free software: you can redistribute it and/or modify      */
+/*  it under the terms of the GNU Lesser General Public License as published  */
+/*  by the Free Software Foundation, either version 3 of the License, or      */
+/*  (at your option) any later version.                                       */
+/*                                                                            */
+/*  This program is distributed in the hope that it will be useful,           */
+/*  but WITHOUT ANY WARRANTY; without even the implied warranty of            */
+/*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             */
+/*  GNU Lesser General Public License for more details.                       */
+/*                                                                            */
+/*  You should have received a copy of the GNU Lesser General Public License  */
+/*  along with this program.  If not, see <http://www.gnu.org/licenses/>.     */
+/*============================================================================*/
+
+The VistaDemos are developed to show you how to work with ViSTA VR Toolkit.
+All Demos should work with the release. If they do not work correctly wih the
+tagged version please contact vistavrtoolkit-general@lists.sourceforge.net.
+
+To get an idea of where you can start use the following list.
+
+ * 01KeyboardDemo			Demonstrates the use of the keyboard.
+ * 02GeometryDemo			Demonstrate creation of primitive geometries.
+ * 03TextDemo				Shows how to add 2D and 3D text.
+ * 04LoadDemo				Shows you how to load a 3D model from a file.
+ * 05InteractionDemo		Demonstrates interaction with a trackball metaphor.
+ * 06CameraControlDemo		Demonstrates how to manipulate the camera.
+ * 07OverlayDemo			Shows different overlays drawn onto the viewport
+ * 09EventDemo				Demonstrates registering and usage of events and
+							event handlers
+ * 10DisplayDemo			Shows how to open several displays and viewports.
+ * VistaGeometryDemo		This demo explains the usage of VistaGeomFactory
+ * 11OGLDemo				Direct use of OpenGL in a ViSTA Application.
+ * VistaEventDemo			Introduction into the ViSTA event system
+ * 12IntentionSelectDemo	This demo shows how to work with IntentionSelect
+ * 13KernelOpenSGExtDemo	Includes different Demos for OpenSG-specific 
+							extensions: shadows and particles
+ * 14DataFlowNetDemo		Demonstrates the usage of DataFlowNet graphs for
+							interaction modeling.
+ * 15VtkDemo				Demonstrates a simple vtk integration
+ * 16PhantomDemo			Demo using a phantom ForceFeedback device
+ * 17MsgPortDemo			Uses MessagePort for network-based communication
+							between two processes.
+ * 18DebuggingToolsDemo		Demonstrates several tools supporting debugging:
+							VistaStreams, VistaBasicProfiler, VistaStackWalker
+ * 19TimeDemo				Shows the usage of time data types, measurement,
+							averaging, conversion and formatting, as well
+							as different time-based events
+ * 20PythonDFNDemo			Provides an example for a python integration
+							with the DataFlowNet
+ * 21ClusterModeDemo		Demo showing clustered (master+slaves) execution
+							of ViSTA applications, how it works and what to
+							look out for.
+							Also shows cluster communication using
+							ExternalMessageEvent, ClusterDataSync, and
+							ClusterBarrier
+ * 22RecordReplayDemo		Demo of ViSTA's record feature that allows the
+							recording of cluster sessions, and replaying it 
+							afterwards.
+ * VistaVrmlVisualizer		This App can show *.wrl files and generate an 
+							animation from a folder.
+
diff --git a/VistaDemo/Template/CMakeLists.txt b/VistaDemo/Template/CMakeLists.txt
deleted file mode 100644
index 4afba74f558c346a7f988d7353e5459582d2ded9..0000000000000000000000000000000000000000
--- a/VistaDemo/Template/CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id$
-
-cmake_minimum_required( VERSION 2.8 )
-project( Template )
-
-list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
-include( VistaLibCommon )
-
-find_package_versioned( VistaCoreLibs "HEAD" REQUIRED )
-vista_use_VistaCoreLibs()
-
-if( WIN32 )
-	list( APPEND LIBRARIES opengl32 glu32 )
-endif( WIN32 )
-
-include( "./_SourceFiles.cmake" )
-
-add_executable( Template ${ProjectSources} )
-target_link_libraries( Template
-	${VISTACORELIBS_LIBRARIES}
-	${LIBRARIES}
-)
-
-vista_configure_app( Template )
-vista_set_app_outdir( Template ${CMAKE_CURRENT_SOURCE_DIR} )
-vista_install( Template )
-
diff --git a/VistaDemo/Template/MyDemoAppl.cpp b/VistaDemo/Template/MyDemoAppl.cpp
deleted file mode 100644
index f5eb038157c2cb9dfd37582de09697e73fc4d344..0000000000000000000000000000000000000000
--- a/VistaDemo/Template/MyDemoAppl.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*============================================================================*/
-/*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
-/*============================================================================*/
-/*                                  License                                   */
-/*                                                                            */
-/*  This program is free software: you can redistribute it and/or modify      */
-/*  it under the terms of the GNU Lesser General Public License as published  */
-/*  by the Free Software Foundation, either version 3 of the License, or      */
-/*  (at your option) any later version.                                       */
-/*                                                                            */
-/*  This program is distributed in the hope that it will be useful,           */
-/*  but WITHOUT ANY WARRANTY; without even the implied warranty of            */
-/*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             */
-/*  GNU Lesser General Public License for more details.                       */
-/*                                                                            */
-/*  You should have received a copy of the GNU Lesser General Public License  */
-/*  along with this program.  If not, see <http://www.gnu.org/licenses/>.     */
-/*============================================================================*/
-/*                                Contributors                                */
-/*                                                                            */
-/*============================================================================*/
-/*
- * $Id$
- */
-
-#include "MyDemoAppl.h"
-
-/*============================================================================*/
-/* MACROS AND DEFINES, CONSTANTS AND STATICS, FUNCTION-PROTOTYPES             */
-/*============================================================================*/
-
-/*============================================================================*/
-/* CONSTRUCTORS / DESTRUCTOR                                                  */
-/*============================================================================*/
-CMyDemoAppl::CMyDemoAppl( int argc, char  *argv[] )
-	:	mVistaSystem( VistaSystem() )
-{
-
-	std::list<std::string> liSearchPaths;
-	liSearchPaths.push_back("../configfiles/");
-	mVistaSystem.SetIniSearchPaths(liSearchPaths);
-
-	// ViSTA's standard intro message
-	mVistaSystem.IntroMsg ();
-
-	// ADD YOUR CODE HERE...
-	
-	mVistaSystem.Init (argc, argv);
-}
-
-CMyDemoAppl::~CMyDemoAppl()
-{
-}
-
-/*============================================================================*/
-/* IMPLEMENTATION                                                             */
-/*============================================================================*/
-
-void CMyDemoAppl::Run ()
-{
-	// Start Universe
-	mVistaSystem.Run();
-}
-
-/*============================================================================*/
-/* LOCAL VARS AND FUNCS                                                       */
-/*============================================================================*/
-
-/*============================================================================*/
-/*  END OF FILE "MyDemoAppl.cpp"                                              */
-/*============================================================================*/
diff --git a/VistaDemo/Template/main.cpp b/VistaDemo/Template/main.cpp
deleted file mode 100644
index 2feb64fd7cbef10fea3751ee0cd8307be6d6fd64..0000000000000000000000000000000000000000
--- a/VistaDemo/Template/main.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*============================================================================*/
-/*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
-/*============================================================================*/
-/*                                  License                                   */
-/*                                                                            */
-/*  This program is free software: you can redistribute it and/or modify      */
-/*  it under the terms of the GNU Lesser General Public License as published  */
-/*  by the Free Software Foundation, either version 3 of the License, or      */
-/*  (at your option) any later version.                                       */
-/*                                                                            */
-/*  This program is distributed in the hope that it will be useful,           */
-/*  but WITHOUT ANY WARRANTY; without even the implied warranty of            */
-/*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             */
-/*  GNU Lesser General Public License for more details.                       */
-/*                                                                            */
-/*  You should have received a copy of the GNU Lesser General Public License  */
-/*  along with this program.  If not, see <http://www.gnu.org/licenses/>.     */
-/*============================================================================*/
-/*                                Contributors                                */
-/*                                                                            */
-/*============================================================================*/
-/*
- * $Id$
- */
-
-#include <iostream>
-
-#include <VistaKernel/VistaSystem.h>
-#include <VistaBase/VistaExceptionBase.h>
-#include "MyDemoAppl.h"
-
-/*============================================================================*/
-/* MACROS AND DEFINES, CONSTANTS AND STATICS, FUNCTION-PROTOTYPES             */
-/*============================================================================*/
-
-/*============================================================================*/
-/* CONSTRUCTORS / DESTRUCTOR                                                  */
-/*============================================================================*/
-
-/*============================================================================*/
-/* IMPLEMENTATION                                                             */
-/*============================================================================*/
-
-int	main (int argc, char *argv[])
-{
-
-	try
-	{
-		CMyDemoAppl demoAppl( argc, argv );
-		// start universe as an endless loop
-		demoAppl.Run ();
-	}
-	catch ( std::exception &e )
-	{
-		std::cerr << "Exception:" << e.what() << std::endl;
-	}
-	catch ( VistaExceptionBase &e )
-	{
-		e.PrintException();
-	}
-
-	return 0;
-}
-
-/*============================================================================*/
-/* LOCAL VARS AND FUNCS                                                       */
-/*============================================================================*/
-
-/*============================================================================*/
-/*  END OF FILE "main.cpp"                                                    */
-/*============================================================================*/
diff --git a/VistaDemo/VRMLVisualizer/CMakeLists.txt b/VistaDemo/VRMLVisualizer/CMakeLists.txt
index dcd91d4817cdad5715512fb3eb83924a33aea850..a8cace0ee581f0fafd65abb9ad9f5bf68214c4a5 100644
--- a/VistaDemo/VRMLVisualizer/CMakeLists.txt
+++ b/VistaDemo/VRMLVisualizer/CMakeLists.txt
@@ -6,8 +6,7 @@ if( NOT VISTADEMO_COMMON_BUILD )
 	include( VistaCommon )
 endif( NOT VISTADEMO_COMMON_BUILD )
 
-vista_use_package( VistaCoreLibs "HEAD" REQUIRED FIND_DEPENDENCIES )
-
+vista_use_package( VistaCoreLibs REQUIRED VistaKernel FIND_DEPENDENCIES )
 
 # Including the source files of all source subfolders recursively
 include( "./_SourceFiles.cmake" )
@@ -18,4 +17,10 @@ target_link_libraries( VRMLVisualizer
 )
 
 vista_configure_app( VRMLVisualizer )
+vista_install( VRMLVisualizer )
+vista_create_default_info_file( VRMLVisualizer )
+if( VISTA_COMMON_BUILD )
+	set_target_properties( VRMLVisualizer PROPERTIES FOLDER "VistaDemo" )
+	add_dependencies( VRMLVisualizer VistaKernel )
+endif()
 
diff --git a/VistaDemo/VRMLVisualizer/DecreaseCallback.cpp b/VistaDemo/VRMLVisualizer/DecreaseCallback.cpp
index 29c427c963d34166ffdf0865f040a86042225543..27a23b5ae8c759a5220a5abb503f92168da5d7b8 100644
--- a/VistaDemo/VRMLVisualizer/DecreaseCallback.cpp
+++ b/VistaDemo/VRMLVisualizer/DecreaseCallback.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "DecreaseCallback.h"
 #include "VrmlVisualizer.h"
diff --git a/VistaDemo/VRMLVisualizer/DecreaseCallback.h b/VistaDemo/VRMLVisualizer/DecreaseCallback.h
index 7828ac32f27292ea9767527dd30ce382d7428ab5..208b9cbdba343c61935b928450787a88f2a8a519 100644
--- a/VistaDemo/VRMLVisualizer/DecreaseCallback.h
+++ b/VistaDemo/VRMLVisualizer/DecreaseCallback.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef _DECREASECALLBACK_H
 #define _DECREASECALLBACK_H
diff --git a/VistaDemo/VRMLVisualizer/EnDisableCallback.cpp b/VistaDemo/VRMLVisualizer/EnDisableCallback.cpp
index acd0ac515f8a4e69e2004728a7cd58148e73e7b8..8bc1937677abeec6483db36d267db50e54923d1f 100644
--- a/VistaDemo/VRMLVisualizer/EnDisableCallback.cpp
+++ b/VistaDemo/VRMLVisualizer/EnDisableCallback.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "EnDisableCallback.h"
 
diff --git a/VistaDemo/VRMLVisualizer/EnDisableCallback.h b/VistaDemo/VRMLVisualizer/EnDisableCallback.h
index 427fa55fee03a2b648771a951b7b6b028c3f75fa..11251c43dfb64be2bf0bf9aa8f4839391625f6d3 100644
--- a/VistaDemo/VRMLVisualizer/EnDisableCallback.h
+++ b/VistaDemo/VRMLVisualizer/EnDisableCallback.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef _ENDISABLECALLBACK_H
 #define _ENDISABLECALLBACK_H
diff --git a/VistaDemo/VRMLVisualizer/IncreaseCallback.cpp b/VistaDemo/VRMLVisualizer/IncreaseCallback.cpp
index ea245414ad81dbc89df8fd784f6135a44cdfa5e1..998ff0c64b5d06188810490b97d239f827d69d1a 100644
--- a/VistaDemo/VRMLVisualizer/IncreaseCallback.cpp
+++ b/VistaDemo/VRMLVisualizer/IncreaseCallback.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "IncreaseCallback.h"
 #include "VrmlVisualizer.h"
diff --git a/VistaDemo/VRMLVisualizer/IncreaseCallback.h b/VistaDemo/VRMLVisualizer/IncreaseCallback.h
index b298c88bb5961cc4d7996ea40fb6cac9783a9442..abca6f62c6226973c0a31dd8e12872c4fd19944c 100644
--- a/VistaDemo/VRMLVisualizer/IncreaseCallback.h
+++ b/VistaDemo/VRMLVisualizer/IncreaseCallback.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef _INCREASECALLBACK_H
 #define _INCREASECALLBACK_H
diff --git a/VistaDemo/VRMLVisualizer/ResetCallback.cpp b/VistaDemo/VRMLVisualizer/ResetCallback.cpp
index ba8b65308f26279cebd4232d07b3abac14b1319e..4104eb52c9217cee9c339b3997523836bdc3011d 100644
--- a/VistaDemo/VRMLVisualizer/ResetCallback.cpp
+++ b/VistaDemo/VRMLVisualizer/ResetCallback.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "ResetCallback.h"
 #include "VrmlVisualizer.h"
diff --git a/VistaDemo/VRMLVisualizer/ResetCallback.h b/VistaDemo/VRMLVisualizer/ResetCallback.h
index d93f772524f523a9b51ae710ddcc94ec4860a7da..19122cdc8517b7ab5f8c52efe90e48aeb1bbb731 100644
--- a/VistaDemo/VRMLVisualizer/ResetCallback.h
+++ b/VistaDemo/VRMLVisualizer/ResetCallback.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef _RESETCALLBACK_H
 #define _RESETCALLBACK_H
diff --git a/VistaDemo/VRMLVisualizer/ToggleAnimationCallback.cpp b/VistaDemo/VRMLVisualizer/ToggleAnimationCallback.cpp
index d4fa2e31badfdbfcf74435d583cf3b122aa54a94..09a66d97e50106173f4c46e41ae3e3da120fb76f 100644
--- a/VistaDemo/VRMLVisualizer/ToggleAnimationCallback.cpp
+++ b/VistaDemo/VRMLVisualizer/ToggleAnimationCallback.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "ToggleAnimationCallback.h"
 
diff --git a/VistaDemo/VRMLVisualizer/ToggleAnimationCallback.h b/VistaDemo/VRMLVisualizer/ToggleAnimationCallback.h
index fcc939430ee31f51ca5ae5d66de994fe51687ce7..6d0f1e694aa08fdec531b3399eca472c631fcad9 100644
--- a/VistaDemo/VRMLVisualizer/ToggleAnimationCallback.h
+++ b/VistaDemo/VRMLVisualizer/ToggleAnimationCallback.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef _TOGGLEANIMATIONCALLBACK_H
 #define _TOGGLEANIMATIONCALLBACK_H
diff --git a/VistaDemo/VRMLVisualizer/VrmlEventHandler.cpp b/VistaDemo/VRMLVisualizer/VrmlEventHandler.cpp
index 180ae91e6265080d17a86103df512fd030e55dde..1866dc7afab7228adc3471d3c9d25b38331b80a8 100644
--- a/VistaDemo/VRMLVisualizer/VrmlEventHandler.cpp
+++ b/VistaDemo/VRMLVisualizer/VrmlEventHandler.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include "VrmlEventHandler.h"
 #include "VrmlVisualizer.h"
diff --git a/VistaDemo/VRMLVisualizer/VrmlEventHandler.h b/VistaDemo/VRMLVisualizer/VrmlEventHandler.h
index 0ad0fbaacf4b7d7d451c520620d2805fb99df71f..07a1d229080cbb7aae5a6ade5efa9927aa63550f 100644
--- a/VistaDemo/VRMLVisualizer/VrmlEventHandler.h
+++ b/VistaDemo/VRMLVisualizer/VrmlEventHandler.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef _VRMLEVENTHANDLER_H
 #define _VRMLEVENTHANDLER_H
diff --git a/VistaDemo/VRMLVisualizer/VrmlVisualizer.cpp b/VistaDemo/VRMLVisualizer/VrmlVisualizer.cpp
index 910c4fc91b9df086ebb441f1baf26f774e2754b2..6691056c5c8d4e259d57a8e510fc33ff29f88da6 100644
--- a/VistaDemo/VRMLVisualizer/VrmlVisualizer.cpp
+++ b/VistaDemo/VRMLVisualizer/VrmlVisualizer.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #include <cstring>
 #include <string>
@@ -233,10 +231,9 @@ void VrmlVisualizer::DecreaseStepSpeed()
 	m_dStepTime += 0.1;
 }
 
-bool VrmlVisualizer::AddByFilename( const std::string strFilename )
+bool VrmlVisualizer::AddByFilename( const std::string& strFilename )
 {
-	IVistaNode *pNode = m_vistaSystem.GetGraphicsManager()->GetSceneGraph()->
-		LoadNode(strFilename);
+	IVistaNode *pNode = m_vistaSystem.GetGraphicsManager()->GetSceneGraph()->LoadNode(strFilename);
 
 	// assert first node as TransformNode
 	pNode = FirstNodeAsTransformNode( pNode );
diff --git a/VistaDemo/VRMLVisualizer/VrmlVisualizer.h b/VistaDemo/VRMLVisualizer/VrmlVisualizer.h
index da7301d25f72ba2e67678c1f9b029c092bffa756..187083658daaabba232db25bb8621135084657d3 100644
--- a/VistaDemo/VRMLVisualizer/VrmlVisualizer.h
+++ b/VistaDemo/VRMLVisualizer/VrmlVisualizer.h
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 
 #ifndef _VRMLVISUALIZER_H
 #define _VRMLVISUALIZER_H
@@ -74,7 +72,7 @@ public:
 private:
 
 	void PrintUsage();
-	bool AddByFilename( const std::string strFilename );
+	bool AddByFilename( const std::string& strFilename );
 	bool LoadData();
 
 	VistaSystem							m_vistaSystem;
diff --git a/VistaDemo/VRMLVisualizer/_SourceFiles.cmake b/VistaDemo/VRMLVisualizer/_SourceFiles.cmake
index ccee5212f4548e0f1240dce82fef7ee466ce4bd6..f87b508a5fa6ed2cf4672eda7799daacc0080771 100644
--- a/VistaDemo/VRMLVisualizer/_SourceFiles.cmake
+++ b/VistaDemo/VRMLVisualizer/_SourceFiles.cmake
@@ -1,4 +1,4 @@
-# $Id$
+
 
 set( RelativeDir "." )
 set( RelativeSourceGroup "Source Files" )
diff --git a/VistaDemo/VRMLVisualizer/main.cpp b/VistaDemo/VRMLVisualizer/main.cpp
index 843c9fd104b4e224b073e64aafc0c4c09ad189e8..1d033d8c55e67c7c62247fc11285d081a2e16b8d 100644
--- a/VistaDemo/VRMLVisualizer/main.cpp
+++ b/VistaDemo/VRMLVisualizer/main.cpp
@@ -1,6 +1,6 @@
 /*============================================================================*/
 /*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
+/*               Copyright (c) 1997-2016 RWTH Aachen University               */
 /*============================================================================*/
 /*                                  License                                   */
 /*                                                                            */
@@ -20,9 +20,7 @@
 /*                                Contributors                                */
 /*                                                                            */
 /*============================================================================*/
-/*
- * $Id$
- */
+
 #include "VrmlVisualizer.h"
 #include <iostream>
 #include <VistaKernel/VistaSystem.h>
diff --git a/VistaDemo/configfiles/display_cave.ini b/VistaDemo/configfiles/display_cave.ini
deleted file mode 100644
index 28f711db8fa432e10a7ba1a8538fe4ae2fa3c6ca..0000000000000000000000000000000000000000
--- a/VistaDemo/configfiles/display_cave.ini
+++ /dev/null
@@ -1,460 +0,0 @@
-
-## MASTER ###########################################################
-
-[CaveSpace]
-DISPLAYSYSTEMS = MAIN_DISPLAYSYSTEM
-SLAVES         = FrontWallLeft, FrontWallRight, LeftWallLeft, LeftWallRight, RightWallLeft, RightWallRight, BottomLeft, BottomRight
-NAME           = CaveSpace Master
-BYTESWAP       = FALSE
-SYNC           = TRUE
-SYNCPORT       = 18776
-SYNCIP         = 10.0.0.255
-
-[HoloSpace]
-DISPLAYSYSTEMS = MAIN_DISPLAYSYSTEM
-SLAVES         = FrontWallLeft, FrontWallRight, LeftWallLeft, LeftWallRight, RightWallLeft, RightWallRight, BottomLeft, BottomRight, BackLeft, BackRight
-NAME           = HoloSpace Master
-BYTESWAP       = FALSE
-SYNC           = TRUE
-SYNCPORT       = 18776
-SYNCIP         = 10.0.0.255
-
-
-## SLAVES ###########################################################
-
-[FrontWallLeft]
-NAME           = slave01
-DISPLAYSYSTEMS = CAVE_FRONT_L
-SLAVEIP        = 10.0.0.1
-SLAVEPORT      = 18775
-SYNC           = TRUE
-SYNCPORT       = 18776
-SYNCIP         = 10.0.0.255
-BYTESWAP       = FALSE
-ACKPORT        = 18777
-DOGLFINISH     = true
-
-[FrontWallRight]
-NAME           = slave02
-DISPLAYSYSTEMS = CAVE_FRONT_R
-SLAVEIP        = 10.0.0.2
-SLAVEPORT      = 18775
-SYNC           = TRUE
-SYNCPORT       = 18776
-SYNCIP         = 10.0.0.255
-BYTESWAP       = FALSE
-ACKPORT        = 18777
-DOGLFINISH     = true
-
-[LeftWallLeft]
-NAME           = slave03
-DISPLAYSYSTEMS = CAVE_LEFT_L
-SLAVEIP        = 10.0.0.3
-SLAVEPORT      = 18775
-SYNC           = TRUE
-SYNCPORT       = 18776
-SYNCIP         = 10.0.0.255
-BYTESWAP       = FALSE
-ACKPORT        = 18777
-DOGLFINISH     = true
-
-[LeftWallRight]
-NAME           = slave04
-DISPLAYSYSTEMS = CAVE_LEFT_R
-SLAVEIP        = 10.0.0.4
-SLAVEPORT      = 18775
-SYNC           = TRUE
-SYNCPORT       = 18776
-SYNCIP         = 10.0.0.255
-BYTESWAP       = FALSE
-ACKPORT        = 18777
-DOGLFINISH     = true
-
-[RightWallLeft]
-NAME           = slave05
-DISPLAYSYSTEMS = CAVE_RIGHT_L
-SLAVEIP        = 10.0.0.5
-SLAVEPORT      = 18775
-SYNC           = TRUE
-SYNCPORT       = 18776
-SYNCIP         = 10.0.0.255
-BYTESWAP       = FALSE
-ACKPORT        = 18777
-DOGLFINISH     = true
-
-[RightWallRight]
-NAME           = slave06
-DISPLAYSYSTEMS = CAVE_RIGHT_R
-SLAVEIP        = 10.0.0.6
-SLAVEPORT      = 18775
-SYNC           = TRUE
-SYNCPORT       = 18776
-SYNCIP         = 10.0.0.255
-BYTESWAP       = FALSE
-ACKPORT        = 18777
-DOGLFINISH     = true
-
-
-[BottomLeft]
-NAME           = slave07
-DISPLAYSYSTEMS = CAVE_BOTTOM_L
-SLAVEIP        = 10.0.0.7
-SLAVEPORT      = 18775
-SYNC           = TRUE
-SYNCPORT       = 18776
-SYNCIP         = 10.0.0.255
-BYTESWAP       = FALSE
-ACKPORT        = 18777
-DOGLFINISH     = true
-
-[BottomRight]
-NAME           = slave08
-DISPLAYSYSTEMS = CAVE_BOTTOM_R
-SLAVEIP        = 10.0.0.8
-SLAVEPORT      = 18775
-SYNC           = TRUE
-SYNCPORT       = 18776
-SYNCIP         = 10.0.0.255
-BYTESWAP       = FALSE
-ACKPORT        = 18777
-DOGLFINISH     = true
-
-[BackLeft]
-NAME           = slave09
-DISPLAYSYSTEMS = CAVE_BACK_L
-SLAVEIP        = 10.0.0.9
-SLAVEPORT      = 18775
-SYNC           = TRUE
-SYNCPORT       = 18776
-SYNCIP         = 10.0.0.255
-BYTESWAP       = FALSE
-ACKPORT        = 18777
-DOGLFINISH     = true
-
-[BackRight]
-NAME           = slave10
-DISPLAYSYSTEMS = CAVE_BACK_R
-SLAVEIP        = 10.0.0.10
-SLAVEPORT      = 18775
-SYNC           = TRUE
-SYNCPORT       = 18776
-SYNCIP         = 10.0.0.255
-BYTESWAP       = FALSE
-ACKPORT        = 18777
-DOGLFINISH     = true
-
-###############################################################################
-
-[MAIN_DISPLAYSYSTEM]
-NAME			=	MAIN
-VIEWPORTS 		= 	MAIN_VIEWPORT
-VIEWER_POSITION		=	0, 1.8, 0
-VIEWER_ORIENTATION	=	0, 0, 0, 1
-LEFT_EYE_OFFSET		=	-0.03, 0, 0
-RIGHT_EYE_OFFSET	=	 0.03, 0, 0
-HMD_MODE            = TRUE
-REFERENCE_FRAME		= INITIAL_REFFRAME
-
-[MAIN_VIEWPORT]
-NAME		=	MAIN_VIEWPORT
-PROJECTION	=	MAIN_PROJECTION
-WINDOW		=	MAIN_WINDOW
-#POSITION	=	0, 0
-#SIZE		=	1280, 1024
-
-[MAIN_PROJECTION]
-NAME			=	MAIN_PROJECTION
-PROJ_PLANE_MIDPOINT	=	0, 1.35, -1.35
-PROJ_PLANE_NORMAL	=	0, 0, 1
-PROJ_PLANE_UP		=	0, 1, 0
-PROJ_PLANE_EXTENTS	=	-1,1,-0.75,0.75
-CLIPPING_RANGE= 0.1, 666
-STEREO_MODE		=	MONO
-
-[MAIN_WINDOW]
-NAME			=	MAIN_WINDOW
-#DISPLAY			=	
-STEREO			=	false
-POSITION		=	10, 20
-SIZE			=	640, 480
-TITLE           =   Inside
-
-#####################################################################
-
-## FRONT L #############################################################
-
-[CAVE_FRONT_L]
-NAME			=	MAIN
-VIEWPORTS 		= 	CAVE_FRONT_L_VP
-VIEWER_POSITION		=	0, 1.8, 0
-VIEWER_ORIENTATION	=	0, 0, 0, 1
-LEFT_EYE_OFFSET		=       0.03, 0, 0
-RIGHT_EYE_OFFSET	=      -0.03, 0, 0
-REFERENCE_FRAME		= INITIAL_REFFRAME
-
-[CAVE_FRONT_L_VP]
-NAME		=	CAVE_FRONT_L_VIEWPORT
-PROJECTION	=	CAVE_FRONT_L_PROJ
-WINDOW		=	CAVE_WINDOW_WIDE
-
-
-[CAVE_FRONT_L_PROJ]
-NAME			=	CAVE_FRONT_L_PROJ
-PROJ_PLANE_MIDPOINT	=	0, 1.35, -1.35
-PROJ_PLANE_NORMAL	=	0, 0, 1
-PROJ_PLANE_UP		=	0, 1, 0
-PROJ_PLANE_EXTENTS	=	-1.8, 1.8, -1.35, 1.35
-CLIPPING_RANGE= 0.1, 666
-STEREO_MODE		=	LEFT_EYE
-
-## FRONT R #############################################################
-
-[CAVE_FRONT_R]
-NAME			=	MAIN
-VIEWPORTS 		= 	CAVE_FRONT_R_VP
-VIEWER_POSITION		=	0, 1.8, 0
-VIEWER_ORIENTATION	=	0, 0, 0, 1
-LEFT_EYE_OFFSET		=       0.03, 0, 0
-RIGHT_EYE_OFFSET	=      -0.03, 0, 0
-REFERENCE_FRAME		= INITIAL_REFFRAME
-
-[CAVE_FRONT_R_VP]
-NAME		=	CAVE_FRONT_R_VIEWPORT
-PROJECTION	=	CAVE_FRONT_R_PROJ
-WINDOW		=	CAVE_WINDOW_WIDE
-
-[CAVE_FRONT_R_PROJ]
-NAME			=	CAVE_FRONT_R_PROJ
-PROJ_PLANE_MIDPOINT	=	0, 1.35, -1.35
-PROJ_PLANE_NORMAL	=	0, 0, 1
-PROJ_PLANE_UP		=	0, 1, 0
-PROJ_PLANE_EXTENTS	=	-1.8, 1.8, -1.35, 1.35
-CLIPPING_RANGE= 0.1, 666
-STEREO_MODE		=	RIGHT_EYE
-
-
-## LEFT R #############################################################
-
-[CAVE_LEFT_R]
-NAME			=	MAIN
-VIEWPORTS 		= 	CAVE_LEFT_R_VP
-VIEWER_POSITION		=	0, 1.8, 0
-VIEWER_ORIENTATION	=	0, 0, 0, 1
-LEFT_EYE_OFFSET		=       0.03, 0, 0
-RIGHT_EYE_OFFSET	=      -0.03, 0, 0
-REFERENCE_FRAME		= INITIAL_REFFRAME
-
-[CAVE_LEFT_R_VP]
-NAME		=	CAVE_LEFT_R_VIEWPORT
-PROJECTION	=	CAVE_LEFT_R_PROJ
-WINDOW		=	CAVE_WINDOW_NARROW
-
-[CAVE_LEFT_R_PROJ]
-NAME			=	CAVE_LEFT_R_PROJ
-PROJ_PLANE_MIDPOINT	=	-1.8, 1.35, 0
-PROJ_PLANE_NORMAL	=	1, 0, 0
-PROJ_PLANE_UP		=	0, 1, 0
-PROJ_PLANE_EXTENTS	=	-1.35, 1.35, -1.35, 1.35
-CLIPPING_RANGE= 0.1, 666
-STEREO_MODE		=	RIGHT_EYE
-
-## LEFT L #############################################################
-
-[CAVE_LEFT_L]
-NAME			=	MAIN
-VIEWPORTS 		= 	CAVE_LEFT_L_VP
-VIEWER_POSITION		=	0, 1.8, 0
-VIEWER_ORIENTATION	=	0, 0, 0, 1
-LEFT_EYE_OFFSET		=       0.03, 0, 0
-RIGHT_EYE_OFFSET	=      -0.03, 0, 0
-REFERENCE_FRAME		= INITIAL_REFFRAME
-
-[CAVE_LEFT_L_VP]
-NAME		=	CAVE_LEFT_L_VIEWPORT
-PROJECTION	=	CAVE_LEFT_L_PROJ
-WINDOW		=	CAVE_WINDOW_NARROW
-
-[CAVE_LEFT_L_PROJ]
-NAME			=	CAVE_LEFT_L_PROJ
-PROJ_PLANE_MIDPOINT	=	-1.8, 1.35, 0
-PROJ_PLANE_NORMAL	=	1, 0, 0
-PROJ_PLANE_UP		=	0, 1, 0
-PROJ_PLANE_EXTENTS	=	-1.35, 1.35, -1.35, 1.35
-CLIPPING_RANGE= 0.1, 666
-STEREO_MODE		=	LEFT_EYE
-
-## RIGHT R #############################################################
-
-[CAVE_RIGHT_R]
-NAME			=	MAIN
-VIEWPORTS 		= 	CAVE_RIGHT_R_VP
-VIEWER_POSITION		=	0, 1.8, 0
-VIEWER_ORIENTATION	=	0, 0, 0, 1
-LEFT_EYE_OFFSET		=       0.03, 0, 0
-RIGHT_EYE_OFFSET	=      -0.03, 0, 0
-REFERENCE_FRAME		= INITIAL_REFFRAME
-
-[CAVE_RIGHT_R_VP]
-NAME		=	CAVE_RIGHT_R_VIEWPORT
-PROJECTION	=	CAVE_RIGHT_R_PROJ
-WINDOW		=	CAVE_WINDOW_NARROW
-
-[CAVE_RIGHT_R_PROJ]
-NAME			=	CAVE_RIGHT_R_PROJ
-PROJ_PLANE_MIDPOINT	=	1.78, 1.35, 0
-PROJ_PLANE_NORMAL	=	-1, 0, 0
-PROJ_PLANE_UP		=	0, 1, 0
-PROJ_PLANE_EXTENTS	=	-1.35, 1.35, -1.35, 1.35
-CLIPPING_RANGE= 0.1, 666
-STEREO_MODE		=	RIGHT_EYE
-
-
-
-## RIGHT L #############################################################
-
-[CAVE_RIGHT_L]
-NAME			=	MAIN
-VIEWPORTS 		= 	CAVE_RIGHT_L_VP
-VIEWER_POSITION		=	0, 1.8, 0
-VIEWER_ORIENTATION	=	0, 0, 0, 1
-LEFT_EYE_OFFSET		=       0.03, 0, 0
-RIGHT_EYE_OFFSET	=      -0.03, 0, 0
-REFERENCE_FRAME		= INITIAL_REFFRAME
-
-[CAVE_RIGHT_L_VP]
-NAME		=	CAVE_RIGHT_L_VIEWPORT
-PROJECTION	=	CAVE_RIGHT_L_PROJ
-WINDOW		=	CAVE_WINDOW_NARROW
-
-[CAVE_RIGHT_L_PROJ]
-NAME			=	CAVE_RIGHT_L_PROJ
-PROJ_PLANE_MIDPOINT	=	1.78, 1.35, 0
-PROJ_PLANE_NORMAL	=	-1, 0, 0
-PROJ_PLANE_UP		=	0, 1, 0
-PROJ_PLANE_EXTENTS	=	-1.35, 1.35, -1.35, 1.35
-CLIPPING_RANGE= 0.1, 666
-STEREO_MODE		=	LEFT_EYE
-
-
-
-## BOTTOM L ###########################################################
-
-[CAVE_BOTTOM_L]
-NAME			=	MAIN
-VIEWPORTS 		= 	CAVE_BOTTOM_L_VP
-VIEWER_POSITION		=	0, 1.8, 0
-VIEWER_ORIENTATION	=	0, 0, 0, 1
-LEFT_EYE_OFFSET		=       0.03, 0, 0
-RIGHT_EYE_OFFSET	=      -0.03, 0, 0
-REFERENCE_FRAME		= INITIAL_REFFRAME
-
-[CAVE_BOTTOM_L_VP]
-NAME		=	CAVE_BOTTOM_L_VIEWPORT
-PROJECTION	=	CAVE_BOTTOM_L_PROJ
-WINDOW		=	CAVE_WINDOW_WIDE
-
-[CAVE_BOTTOM_L_PROJ]
-NAME			=	CAVE_BOTTOM_L_PROJ
-PROJ_PLANE_MIDPOINT	=	0, 0, 0
-PROJ_PLANE_NORMAL	=	0, 1, 0
-PROJ_PLANE_UP		=	0, 0, -1
-PROJ_PLANE_EXTENTS	=	-1.8, 1.8, -1.35, 1.35
-CLIPPING_RANGE= 0.1, 666
-STEREO_MODE		=	LEFT_EYE
-
-## BOTTOM R ############################################################
-
-[CAVE_BOTTOM_R]
-NAME			=	MAIN
-VIEWPORTS 		= 	CAVE_BOTTOM_R_VP
-VIEWER_POSITION		=	0, 1.8, 0
-VIEWER_ORIENTATION	=	0, 0, 0, 1
-LEFT_EYE_OFFSET		=       0.03, 0, 0
-RIGHT_EYE_OFFSET	=      -0.03, 0, 0
-REFERENCE_FRAME		= INITIAL_REFFRAME
-
-[CAVE_BOTTOM_R_VP]
-NAME		=	CAVE_BOTTOM_R_VIEWPORT
-PROJECTION	=	CAVE_BOTTOM_R_PROJ
-WINDOW		=	CAVE_WINDOW_WIDE
-
-[CAVE_BOTTOM_R_PROJ]
-NAME			=	CAVE_BOTTOM_R_PROJ
-PROJ_PLANE_MIDPOINT	=	0, 0, 0
-PROJ_PLANE_NORMAL	=	0, 1, 0
-PROJ_PLANE_UP		=	0, 0, -1
-PROJ_PLANE_EXTENTS	=	-1.8, 1.8, -1.35, 1.35
-CLIPPING_RANGE= 0.1, 666
-STEREO_MODE		=	RIGHT_EYE
-
-## BACK L ###########################################################
-
-[CAVE_BACK_L]
-NAME			=	MAIN
-VIEWPORTS 		= 	CAVE_BACK_L_VP
-VIEWER_POSITION		=	0, 1.8, 0
-VIEWER_ORIENTATION	=	0, 0, 0, 1
-LEFT_EYE_OFFSET		=       -0.03, 0, 0
-RIGHT_EYE_OFFSET	=      0.03, 0, 0
-REFERENCE_FRAME		= INITIAL_REFFRAME
-
-[CAVE_BACK_L_VP]
-NAME		=	CAVE_BACK_L_VIEWPORT
-PROJECTION	=	CAVE_BACK_L_PROJ
-WINDOW		=	CAVE_WINDOW_WIDE
-
-[CAVE_BACK_L_PROJ]
-NAME			=	CAVE_BACK_L_PROJ
-PROJ_PLANE_MIDPOINT	=	0, 1.35, 1.35
-PROJ_PLANE_NORMAL	=	0, 0, -1
-PROJ_PLANE_UP		=	0, 1, 0
-PROJ_PLANE_EXTENTS	=	-1.8, 1.8, -1.35, 1.35
-CLIPPING_RANGE= 0.1, 666
-STEREO_MODE		=	LEFT_EYE
-
-## BACK R ############################################################
-
-[CAVE_BACK_R]
-NAME			=	MAIN
-VIEWPORTS 		= 	CAVE_BACK_R_VP
-VIEWER_POSITION		=	0, 1.8, 0
-VIEWER_ORIENTATION	=	0, 0, 0, 1
-LEFT_EYE_OFFSET		=       -0.03, 0, 0
-RIGHT_EYE_OFFSET	=      0.03, 0, 0
-REFERENCE_FRAME		= INITIAL_REFFRAME
-
-[CAVE_BACK_R_VP]
-NAME		=	CAVE_BACK_R_VIEWPORT
-PROJECTION	=	CAVE_BACK_R_PROJ
-WINDOW		=	CAVE_WINDOW_WIDE
-
-[CAVE_BACK_R_PROJ]
-NAME			=	CAVE_BACK_R_PROJ
-PROJ_PLANE_MIDPOINT	=	0, 1.35, 1.35
-PROJ_PLANE_NORMAL	=	0, 0, -1
-PROJ_PLANE_UP		=	0, 1, 0
-PROJ_PLANE_EXTENTS	=	-1.8, 1.8, -1.35, 1.35
-CLIPPING_RANGE= 0.1, 666
-STEREO_MODE		=	RIGHT_EYE
-
-
-
-#######################################################################
-## WINDOWS 
-#######################################################################
-
-[CAVE_WINDOW_WIDE]
-NAME			=	MAIN_WINDOW
-STEREO			=	false
-POSITION		=	0, 0
-SIZE			=	1600, 1200
-
-[CAVE_WINDOW_NARROW]
-NAME			=	MAIN_WINDOW
-STEREO			=	false
-POSITION		=	200, 0
-SIZE			=	1200, 1200
-
-
-[INITIAL_REFFRAME]
-TRANSLATION		= 0.0, 0, 0
diff --git a/VistaDemo/configfiles/display_desktop.ini b/VistaDemo/configfiles/display_desktop.ini
index dc207ac6d719cdbed7e4fc4e3cc292b4e6bc0392..8948ef4d333793dcccc6e6bcc0e921fb8ea7ca5e 100644
--- a/VistaDemo/configfiles/display_desktop.ini
+++ b/VistaDemo/configfiles/display_desktop.ini
@@ -1,4 +1,4 @@
-# $Id$
+
 # =============
 # DISPLAYSYSTEM
 # =============
diff --git a/VistaDemo/configfiles/display_desktop_offscreen.ini b/VistaDemo/configfiles/display_desktop_offscreen.ini
index 24a0cd53c6056c33e220166aa86585ea2d17af9d..39a11eb7d04d9fd4612c86f8e1ecd9b748de7d3d 100644
--- a/VistaDemo/configfiles/display_desktop_offscreen.ini
+++ b/VistaDemo/configfiles/display_desktop_offscreen.ini
@@ -1,4 +1,4 @@
-# $Id: display_desktop.ini 23634 2011-09-30 11:30:22Z dr165799 $
+
 # =============
 # DISPLAYSYSTEM
 # =============
diff --git a/VistaDemo/configfiles/display_desktop_offscreen_sidebyside.ini b/VistaDemo/configfiles/display_desktop_offscreen_sidebyside.ini
index 449af701c84420851b4101ca2e4efac996b40c0c..38866d1e88915e21bcfc080f2908c00f31961089 100644
--- a/VistaDemo/configfiles/display_desktop_offscreen_sidebyside.ini
+++ b/VistaDemo/configfiles/display_desktop_offscreen_sidebyside.ini
@@ -1,4 +1,4 @@
-# $Id: display_desktop.ini 23634 2011-09-30 11:30:22Z dr165799 $
+
 # =============
 # DISPLAYSYSTEM
 # =============
diff --git a/VistaDemo/configfiles/display_picasso.ini b/VistaDemo/configfiles/display_picasso.ini
index a0961eafce9d857ba973c7033615a5b943788cca..1c7a3006debcc70a5ec6c7d2ab503846f73a607e 100644
--- a/VistaDemo/configfiles/display_picasso.ini
+++ b/VistaDemo/configfiles/display_picasso.ini
@@ -1,6 +1,6 @@
 # display system initialization file for the PI-casso workstation
 # in the CCC VR-Lab
-# $Id$
+
 
 [SYSTEM]
 DISPLAYSYSTEMS 		= MAIN
diff --git a/VistaDemo/configfiles/interaction_cave.ini b/VistaDemo/configfiles/interaction_cave.ini
deleted file mode 100644
index a23ed3d62fbd2212d99e691f0955a427f9550461..0000000000000000000000000000000000000000
--- a/VistaDemo/configfiles/interaction_cave.ini
+++ /dev/null
@@ -1,101 +0,0 @@
-# $Id: interaction_desktop.ini 23950 2011-10-29 17:21:19Z dr165799 $
-[SYSTEM]
-# DRIVERPLUGINDIRS describes where the plugin dlls for drivers can be found
-# Usually, the VISTACORELIBS_DRIVER_PLUGIN_DIRS environment variable can be used,
-# which is set to the correct value when using the set_environment_for_XXX script
-# (or when starting from an MSVC project, where it should be set by cmake too)
-DRIVERPLUGINDIRS	= ${VISTACORELIBS_DRIVER_PLUGIN_DIRS}
-
-# these list the device drivers that should be created, which are specified in separate sections
-DEVICEDRIVERS		= KEYBOARD, DTRACK
-# the Interaction contexts are defined in separate sections, and use DataFlowNet scripts to process
-# data and inject it into the application
-INTERACTIONCONTEXTS	= KEYCONTROL, UCP, NAV_FLYSTICK
-
-# DUMPDFNGRAPHS enables the writing of DataFlowNet graphs as dotty files when they are loaded, and
-# allows an easier debugging. WRITEDFNPORTS is sa modifier for this, and produces different dotty output.
-DUMPDFNGRAPHS			= FALSE
-WRITEDFNPORTS			= TRUE
-
-#######################################################################
-# INTERACTION CONTEXTS
-#######################################################################
-
-
-[KEYCONTROL]
-ROLE 				= KEYCONTROL
-GRAPH 				= xml/keyboard_standardinput.xml
-
-[NAV_FLYSTICK]
-ROLE				= NAV_FLYSTICK
-GRAPH				= xml/navigator_flystick.xml
-RELOADTRIGGER		= Y
-
-[UCP]
-ROLE				= UCP
-GRAPH				= xml/ucp_cave.xml
-RELOADTRIGGER		= U
-# Delayed update causes this context to be updated later in the vista
-# loop, after the POSTAPPLICATIONLOOP System event, right before the 
-# PREGRAPHICS. This ensures that it is updated as shortly before the
-# actual rendering as possible, to reduce latency
-DELAYED_UPDATE		= TRUE
-PRIORITY			= -2
-
-
-#####################################################################
-# DEVICE DRIVERS
-#####################################################################
-
-[KEYBOARD]
-TYPE				= GLUTKEYBOARD
-SENSORS				= KEYB_MAIN
-HISTORY				= 100
-DEFAULTWINDOW		= TRUE
-
-[KEYB_MAIN]
-RAWID				= 0
-
-
-
-[DTRACK]
-TYPE				= DTRACK
-NAME				= DTRACK
-PROTOCOL			= DTRACK1
-CONNECTIONS			= DTRACKCONTROL, DTRACKDATA
-SENSORS				= HEAD, STICK0, STICK1
-HISTORY				= 10
-ATTACHONLY			= FALSE
-
-[DTRACK1]
-NAME				= dtrack1
-
-[HEAD]
-TYPE				= BODY
-NAME				= HEAD_SENSOR
-RAWID				= 2
-
-[STICK0]
-TYPE				= STICK
-RAWID				= 0
-
-[STICK1]
-TYPE				= STICK
-NAME				= STICK_SENSOR
-RAWID				= 1
-
-
-[DTRACKCONTROL]
-TYPE				= UDP
-DRIVERROLE			= CONTROLCONNECTION
-ADDRESS				= 134.130.70.3
-PORT				= 5000
-DIRECTION			= OUTGOING
-
-[DTRACKDATA]
-TYPE				= UDP
-DRIVERROLE			= DATACONNECTION
-ADDRESS				= 134.130.70.14
-PORT				= 5001
-DIRECTION			= INCOMING
-
diff --git a/VistaDemo/configfiles/interaction_desktop.ini b/VistaDemo/configfiles/interaction_desktop.ini
index 683486503f3def56f96b880ca4be94cf8e6b57d2..ae94cefbadc8114f3f9789bee9b5b801e36ee065 100644
--- a/VistaDemo/configfiles/interaction_desktop.ini
+++ b/VistaDemo/configfiles/interaction_desktop.ini
@@ -1,4 +1,4 @@
-# $Id$
+
 [SYSTEM]
 # DRIVERPLUGINDIRS describes where the plugin dlls for drivers can be found
 # Usually, the VISTACORELIBS_DRIVER_PLUGIN_DIRS environment variable can be used,
diff --git a/VistaDemo/configfiles/interaction_picasso.ini b/VistaDemo/configfiles/interaction_picasso.ini
index 479a0bfdfadea63102f7a953970bd0bbf226197e..f14a3e7f40515240cb50f351e9ccd2e0d4d2d436 100644
--- a/VistaDemo/configfiles/interaction_picasso.ini
+++ b/VistaDemo/configfiles/interaction_picasso.ini
@@ -1,4 +1,4 @@
-# $Id$
+
 [SYSTEM]
 DRIVERPLUGINDIRS	= ${VISTACORELIBS_DRIVER_PLUGIN_DIRS}
 DEVICEDRIVERS		= KEYBOARD, MOUSE, DTRACK, SPACENAVIGATOR
diff --git a/VistaDemo/configfiles/vista.ini b/VistaDemo/configfiles/vista.ini
index 30931c19883f92170fff2879cb602671521ab28e..5dd19680ad3874befaa1c06c50dba150fc4b52cc 100644
--- a/VistaDemo/configfiles/vista.ini
+++ b/VistaDemo/configfiles/vista.ini
@@ -1,7 +1,7 @@
 #######################################################################
 #        V I S T A     I N I T I A L I Z A T I O N     F I L E        #
 #######################################################################
-# $Id$
+
 #######################################################################
 [SYSTEM]
 # include other ini files
diff --git a/VistaDemo/configfiles/vista_cave.ini b/VistaDemo/configfiles/vista_cave.ini
deleted file mode 100644
index 7f3dec20134c6bc28d58beddd8524e08bcc38793..0000000000000000000000000000000000000000
--- a/VistaDemo/configfiles/vista_cave.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-#######################################################################
-#        V I S T A     I N I T I A L I Z A T I O N     F I L E        #
-#######################################################################
-# $Id: vista_desktop.ini 23634 2011-09-30 11:30:22Z dr165799 $
-#######################################################################
-[SYSTEM]
-# include other ini files
-DISPLAYINI		=	display_cave.ini
-CLUSTERINI		=	display_cave.ini
-INTERACTIONINI	=	interaction_cave.ini
-
-#select configuration for graphics manager
-GRAPHICSSECTION = GRAPHICS
-
-#######################################################################
-# GRAPHICS SECTION
-#######################################################################
-[GRAPHICS]
-LIGHTS			= LIGHT_A0
-
-[LIGHT_A0]
-Type			= DIRECTIONAL
-DiffuseColor	= 0.8, 0.8, 0.8
-SpecularColor	= 0.2, 0.2, 0.2
-Direction		= 1.0, 1.0, 1.0
diff --git a/VistaDemo/configfiles/vista_desktop.ini b/VistaDemo/configfiles/vista_desktop.ini
index 30931c19883f92170fff2879cb602671521ab28e..5dd19680ad3874befaa1c06c50dba150fc4b52cc 100644
--- a/VistaDemo/configfiles/vista_desktop.ini
+++ b/VistaDemo/configfiles/vista_desktop.ini
@@ -1,7 +1,7 @@
 #######################################################################
 #        V I S T A     I N I T I A L I Z A T I O N     F I L E        #
 #######################################################################
-# $Id$
+
 #######################################################################
 [SYSTEM]
 # include other ini files
diff --git a/VistaDemo/configfiles/vista_picasso.ini b/VistaDemo/configfiles/vista_picasso.ini
index e334f1da9dae78f770716f3958d51e93b45fb403..ad7487c9d8e47b3075a3da41e9b974f0fbc00a03 100644
--- a/VistaDemo/configfiles/vista_picasso.ini
+++ b/VistaDemo/configfiles/vista_picasso.ini
@@ -1,7 +1,7 @@
 #######################################################################
 #        V I S T A     I N I T I A L I Z A T I O N     F I L E        #
 #######################################################################
-# $Id$
+
 #######################################################################
 [SYSTEM]
 
diff --git a/VistaDemo/configfiles/xml/keyboard_standardinput.xml b/VistaDemo/configfiles/xml/keyboard_standardinput.xml
index 6534fe9273794b47d2431d4e7b8135040e3eb787..79239b534383e97786c5d683e8c799a091ea6a76 100644
--- a/VistaDemo/configfiles/xml/keyboard_standardinput.xml
+++ b/VistaDemo/configfiles/xml/keyboard_standardinput.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
+
 <module>
 	<nodespace>
 	</nodespace>
diff --git a/VistaDemo/configfiles/xml/mouse_trackball.xml b/VistaDemo/configfiles/xml/mouse_trackball.xml
index 2e9a3d48912a30ecc9a988d2878dd07012aeedd8..fe8d63393c57ef022e18de6a46ad4aa1fa05f768 100644
--- a/VistaDemo/configfiles/xml/mouse_trackball.xml
+++ b/VistaDemo/configfiles/xml/mouse_trackball.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
+
 <!--=========================================================================-->
 <!-- This nodes implements the default mouse navigation with trackball,      -->
 <!-- panning and zooming. The behavior is continous. You can scale the speed -->
diff --git a/VistaDemo/configfiles/xml/mouse_trackball_continuous.xml b/VistaDemo/configfiles/xml/mouse_trackball_continuous.xml
index 92d6a1f7c62fa69755bbb39bd6ba70682b8f000e..e65a849d4018f7b16bb55a9f6165badd902cbec7 100644
--- a/VistaDemo/configfiles/xml/mouse_trackball_continuous.xml
+++ b/VistaDemo/configfiles/xml/mouse_trackball_continuous.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
+
 <!--=========================================================================-->
 <!-- This nodes implements the default mouse navigation with trackball,      -->
 <!-- panning and zooming. The behavior is continous. You can scale the speed -->
diff --git a/VistaDemo/configfiles/xml/navigator_flystick.xml b/VistaDemo/configfiles/xml/navigator_flystick.xml
deleted file mode 100644
index 45f95c760c8a880a358d809021baaa7c72931135..0000000000000000000000000000000000000000
--- a/VistaDemo/configfiles/xml/navigator_flystick.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<!-- $Id: navigator_flystick.xml 22882 2011-08-08 15:54:40Z dr165799 $ -->
-<module>
-	<nodespace>
-	</nodespace>
-	<graph>
-		<!-- driver -->
-		<node name="flystick_source" type="DriverSensor">
-			<param name="sensor_name" value="STICK_SENSOR"/>
-			<param name="type" value="STICK"/>
-			<param name="driver" value="DTRACK"/>
-		</node>
-
-		<node name="flystick" type="HistoryProject">
-			<param name="project">ORIENTATION, DSCALAR</param>
-		</node>
-
-		<!-- constants -->
-		<node name="minus_one" type="ConstantValue[float]">
-			<param name="value" value="-1.0"/>
-		</node>
-
-		<!-- get linear and angular speed from local base and app-controlled factor -->
-		<node name="linear_velocity" type="ConstantValue[float]">
-			<param name="value" value="2.0"/>
-		</node>
-		<node name="angular_velocity" type="ConstantValue[float]">
-			<param name="value" value="6.28318"/>
-		</node>
-
-		<node name="forward_dir" type="ConstantValue[VistaVector3D]">
-			<param name="value" value="0,0,-1"/>
-		</node>
-
-		<!-- Button converts -->
-		<node name="fwd_trigger" type="TypeConvert[double,float]"/>
-		<node name="bwd_trigger" type="TypeConvert[double,float]"/>
-		<node name="right_trigger" type="TypeConvert[double,float]"/>
-		<node name="left_trigger" type="TypeConvert[double,float]"/>
-
-		<!-- Translation -->
-		<node name="rotation_matrix" type="TypeConvert[VistaQuaternion,VistaTransformMatrix]"/>
-		<node name="move_direction" type="Multiply[VistaTransformMatrix,VistaVector3D]"/>
-
-
-		<node name="negate_trans_factor" type="Multiply[float]"/>
-		<node name="add_trans_factors" type="Add[float]"/>
-		<node name="mult_linear_velocity" type="Multiply[float]"/>
-
-		<!-- Rotation -->
-		<node name="rotate_quat" type="ConstantValue[VistaQuaternion]">
-			<param name="value" value="0,0.7071067811865476,0,-0.7071067811865476"/>
-		</node>
-
-		<node name="negate_rotate_factor" type="Multiply[float]"/>
-		<node name="add_rotate_factors" type="Add[float]"/>
-		<node name="mult_angular_velocity" type="Multiply[float]"/>
-
-		<!-- Application -->
-		<node name="get_transform" type="GetTransform">
-			<param name="object" value="CAM:MAIN"/>
-		</node>
-
-		<node name="set_transform" type="SetTransform">
-			<param name="object" value="CAM:MAIN"/>
-		</node>
-	
-		<node name="navigator" type="Navigation">
-			<param name="default_linear_velocity" value="5.0" />
-			<param name="default_angular_velocity" value="8.0" />
-			<param name="default_navigation_mode" value="0" />
-		</node>
-
-		<node name="timer" type="Timer"/>
-
-	</graph>
-	<edges>
-		<edge fromnode="flystick_source" tonode="flystick" fromport="history" toport="history" />
-
-		<edge fromnode="flystick" tonode="fwd_trigger" fromport="DSCALAR_6" toport="in" />
-		<edge fromnode="flystick" tonode="bwd_trigger" fromport="DSCALAR_4" toport="in" />
-		<edge fromnode="flystick" tonode="right_trigger" fromport="DSCALAR_7" toport="in" />
-		<edge fromnode="flystick" tonode="left_trigger" fromport="DSCALAR_5" toport="in" />
-		
-		<!-- Translation -->
-		<edge fromnode="flystick" tonode="rotation_matrix" fromport="ORIENTATION" toport="in" />
-		<edge fromnode="rotation_matrix" tonode="move_direction" fromport="out" toport="first" />
-		<edge fromnode="forward_dir" tonode="move_direction" fromport="value" toport="second" />
-		<edge fromnode="move_direction" tonode="navigator" fromport="out" toport="translation" />
-
-		<edge fromnode="bwd_trigger" tonode="negate_trans_factor" fromport="out" toport="first" />
-		<edge fromnode="minus_one" tonode="negate_trans_factor" fromport="value" toport="second" />
-		<edge fromnode="negate_trans_factor" tonode="add_trans_factors" fromport="out" toport="first" />
-		<edge fromnode="fwd_trigger" tonode="add_trans_factors" fromport="out" toport="second" />
-		<edge fromnode="add_trans_factors" tonode="mult_linear_velocity" fromport="out" toport="first" />
-		<edge fromnode="linear_velocity" tonode="mult_linear_velocity" fromport="value" toport="second" />
-
-		<edge fromnode="mult_linear_velocity" tonode="navigator" fromport="out" toport="linear_velocity" />
-
-		<!-- Rotation -->
-		<edge fromnode="rotate_quat" tonode="navigator" fromport="value" toport="rotation" />
-
-		<edge fromnode="left_trigger" tonode="negate_rotate_factor" fromport="out" toport="first" />
-		<edge fromnode="minus_one" tonode="negate_rotate_factor" fromport="value" toport="second" />
-		<edge fromnode="negate_rotate_factor" tonode="add_rotate_factors" fromport="out" toport="first" />
-		<edge fromnode="right_trigger" tonode="add_rotate_factors" fromport="out" toport="second" />
-		<edge fromnode="add_rotate_factors" tonode="mult_angular_velocity" fromport="out" toport="first" />
-		<edge fromnode="angular_velocity" tonode="mult_angular_velocity" fromport="value" toport="second" />
-
-		<edge fromnode="mult_angular_velocity" tonode="navigator" fromport="out" toport="angular_velocity" />
-
-		<!-- Navigation edges-->
-		<edge fromnode="timer" tonode="navigator" fromport="dt" toport="dt"/>
-		<edge fromnode="get_transform" tonode="navigator" fromport="transform" toport="transform"/>
-		<edge fromnode="navigator" tonode="set_transform" fromport="transform" toport="in"/>
-		
-	</edges>
-</module>
diff --git a/VistaDemo/configfiles/xml/spacenavigator_navigation.xml b/VistaDemo/configfiles/xml/spacenavigator_navigation.xml
index c3b531d9817c6fb7c7456f4d7efc6d9fa860368d..1505fa45a166370bca33a9237f68d9adf90284a6 100644
--- a/VistaDemo/configfiles/xml/spacenavigator_navigation.xml
+++ b/VistaDemo/configfiles/xml/spacenavigator_navigation.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
+
 <module>
 	<nodespace></nodespace>
 	<graph>
diff --git a/VistaDemo/configfiles/xml/ucp_cave.xml b/VistaDemo/configfiles/xml/ucp_cave.xml
deleted file mode 100644
index 93481ea331c32c2566c9bb56ef9e332333452b9d..0000000000000000000000000000000000000000
--- a/VistaDemo/configfiles/xml/ucp_cave.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<!-- $Id: ucp_cave.xml 22882 2011-08-08 15:54:40Z dr165799 $ -->
-<module>
-	<nodespace>
-	</nodespace>
-	<graph>
-		<node name="head_source" type="DriverSensor">
-			<param name="sensor_index" value="2"/>
-			<param name="type" value="BODY"/>
-			<param name="driver" value="DTRACK"/>
-		</node>
-		<node name="head" type="HistoryProject">
-			<param name="project">POSITION, ORIENTATION</param>
-		</node>
-		
-		<node name="project_mode" type="ConstantValue[int]">
-			<param name="value" value="1"/> 
-		</node>
-
-		<!-- tracker conversion -->
-		<node name="1_to_1000" type="ConstantValue[float]">
-			<param name="value" value="0.001"/>
-		</node>
-
-		<node name="scale_pos" type="Multiply[float,VistaVector3D]"/>
-		<node name="translate_pos" type="Add[VistaVector3D]"/>
-
-		<node name="to_dtrack_origin" type="ConstantValue[VistaVector3D]">
-			<param name="value" value="0,43,0"/>
-		</node>
-
-		<!-- SINK NODES -->
-		<node name="ucp" type="ViewerSink">
-			<param name="displaysystem" value="MAIN"/>
-		</node>
-
-	</graph>
-
-	<edges>
-		<!-- history projection -->
-		<edge fromnode="project_mode" tonode="head" fromport="value"   toport="sampling_mode"/>
-		<edge fromnode="head_source"  tonode="head" fromport="history" toport="history"/>
-
-		<edge fromnode="head" tonode="translate_pos" fromport="POSITION" toport="first"/>
-		<edge fromnode="to_dtrack_origin" tonode="translate_pos" fromport="value" toport="second"/>
-
-		<edge fromnode="translate_pos" tonode="scale_pos" fromport="out" toport="second"/>
-		<edge fromnode="1_to_1000" tonode="scale_pos" fromport="value" toport="first"/>
-
-		<edge fromnode="scale_pos" tonode="ucp" fromport="out" toport="position"/>
-		<edge fromnode="head" tonode="ucp" fromport="ORIENTATION" toport="orientation"/>
-
-	</edges>
-
-</module>
diff --git a/VistaDemo/configfiles/xml/ucp_picasso.xml b/VistaDemo/configfiles/xml/ucp_picasso.xml
index 8595b87305b85ce87accd8cdf6692d9881a124c7..2cc1c5ab0cc73cc13d497a3f5f3ebc43cfd7897e 100644
--- a/VistaDemo/configfiles/xml/ucp_picasso.xml
+++ b/VistaDemo/configfiles/xml/ucp_picasso.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
+
 <module>
 	<nodespace>
 	</nodespace>
diff --git a/VistaDemo/master_cave.sh b/VistaDemo/master_cave.sh
deleted file mode 100755
index 84f115bf138a220c4562ad69fcf1d0bda003c639..0000000000000000000000000000000000000000
--- a/VistaDemo/master_cave.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-export __GL_FSAA_MODE=5
-#export __GL_SYNC_TO_VBLANK=1
-#export __GL_SYNC_DISPLAY_DEVICE=CRT-1
-
-if [ "$1" = "" ]; then
-	echo "No demo executable specified!"
-	exit -4	
-else
-	EXECUTABLE="./$1"
-	PATHSCRIPT="set_path_for_$1.sh"
-fi
-
-if [ ! -d $1 ];
-then
-	echo "Specified dir $1 does not exist"
-	exit -5
-fi
-
-cd $1
-
-if [ ! -x $1 ];
-then
-	echo "Specified file $EXECUTABLE does not exist, or is not executable"
-	exit -5
-fi
-	
-if [ "$2" = "" ]; then
-	echo "No cluster configuration given."
-	exit -4	
-fi
-
-if [ -x $PATHSCRIPT ]; then
-	source $PATHSCRIPT
-fi
-$EXECUTABLE -clustermaster $2 -vistaini vista_cave.ini -interactionini interaction_cave.ini -displayini display_cave.ini -clusterini display_cave.ini
-
-
-
-
diff --git a/VistaDemo/readme.txt b/VistaDemo/readme.txt
deleted file mode 100644
index 2cd5d7f89233b5d204b082144f22185816f9b06f..0000000000000000000000000000000000000000
--- a/VistaDemo/readme.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-/*============================================================================*/
-/*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
-/*============================================================================*/
-/*                                  License                                   */
-/*                                                                            */
-/*  This program is free software: you can redistribute it and/or modify      */
-/*  it under the terms of the GNU Lesser General Public License as published  */
-/*  by the Free Software Foundation, either version 3 of the License, or      */
-/*  (at your option) any later version.                                       */
-/*                                                                            */
-/*  This program is distributed in the hope that it will be useful,           */
-/*  but WITHOUT ANY WARRANTY; without even the implied warranty of            */
-/*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             */
-/*  GNU Lesser General Public License for more details.                       */
-/*                                                                            */
-/*  You should have received a copy of the GNU Lesser General Public License  */
-/*  along with this program.  If not, see <http://www.gnu.org/licenses/>.     */
-/*============================================================================*/
-/*                                Contributors                                */
-/*                                                                            */
-/*============================================================================*/
-// $Id$
-
-/*============================================================================*/
-/*                                                                            */
-/*                                 README.TXT                                 */
-/*                                                                            */
-/*============================================================================*/
-
-The VistaDemos are developed to show you how to work with ViSTA VR Toolkit.
-All Demos should work with the release. If they do not work correctly wih the
-tagged version please contact vistavrtoolkit-general@lists.sourceforge.net.
-
-To get an idea of where you can start use the following list.
-
- * VistaKeyboardDemo		Demonstrates the use of the keyboard.
- * VistaDisplayDemo			Shows you how to open several displays and viewports.
- * VistaLoadDemo			Shows you how to load a model.
- * VistaTrackballDemo		See here how to interact with the trackball metaphor
- * VistaCameraControlDemo	Demonstrates how to manipulate the camera.
- * VistaGeometryDemo		This demo explains the usage of VistaGeomFactory
- * VistaOglDemo				Direkt use of OpenGL in a ViSTA Application.
- * VistaEventDemo			A Demo to introduce into the ViSTA eventsystem
- * VistaIntentionSelectDemo	This demo shows how to work with Intentionselect
- * VistaTemplate			An empty template for your ViSTA application
- * VistaVrmlVisualizer		This App can show *.wrl files and generate an animation
-							from an folder.
- * VistaTextDemo			Shows you how to add 2D and 3D text to your application
-
-/*============================================================================*/
-/*                                 Compiling                                  */
-/*============================================================================*/
-
-Use CMake to generate build all demos. 
-Make sure you have compiled VistaVRToolkit and you need the environment Variable 
-VISTA_CMAKE_COMMON pointing to VistaCMakeCommon 
-Tested Platforms are 
--Windows wirh MSVC8 MSVC9 and MSVC10
--Linux with gcc up to 4.6
--and MacOS10
\ No newline at end of file
diff --git a/VistaDemo/slave_cave.sh b/VistaDemo/slave_cave.sh
deleted file mode 100755
index e80fcc4bebeb7580cb6ad73600f6f3e9212932e5..0000000000000000000000000000000000000000
--- a/VistaDemo/slave_cave.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-export __GL_FSAA_MODE=5
-export __GL_SYNC_TO_VBLANK=1
-export __GL_SYNC_DISPLAY_DEVICE=CRT-1
-
-if [ "$1" = "" ]; then
-	echo "No demo executable specified!"
-	exit -4	
-else
-	EXECUTABLE="./$1"
-	PATHSCRIPT="set_path_for_$1.sh"
-fi
-
-if [ ! -d $1 ];
-then
-	echo "Specified dir $1 does not exist"
-	exit -5
-fi
-
-cd $1
-
-if [ ! -x $1 ];
-then
-	echo "Specified file $EXECUTABLE does not exist, or is not executable"
-	exit -5
-fi
-	
-if [ "$2" = "" ]; then
-	echo "No cluster configuration given."
-	exit -4	
-fi
-
-if [ -x $PATHSCRIPT ]; then
-	source $PATHSCRIPT
-fi
-$EXECUTABLE  -clusterslave $2 -vistaini vista_cave.ini -interactionini interaction_cave.ini -displayini display_cave.ini -clusterini display_cave.ini
-
-
-
-
diff --git a/VistaDemo/startslaves_cave.sh b/VistaDemo/startslaves_cave.sh
deleted file mode 100755
index b81c90f2cbbb3b1433f194271fa0f855c5f07dca..0000000000000000000000000000000000000000
--- a/VistaDemo/startslaves_cave.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-# save the directory
-DIR=`pwd`
-echo Working directory: ${DIR}
-
-if [ "$2" = "" ];
-then
-	echo Usage: startslaves_cave DEMO_NAME CLUSTER_CONFIG
-	echo      DEMO_NAME is full name, e.g. 01KeyboardDemo
-	echo      CLUSTER_CONFIG can be CaveSpace or HoloSpace
-	exit -2
-fi
-
-if [ "$2" = "CaveSpace" ];
-then
-
-	echo start on caveclient01
-	ssh 10.0.0.1 ". /etc/profile; cd ${DIR}; ${DIR}/slave_cave.sh $1 FrontWallLeft" &
-	echo start on caveclient02
-	ssh 10.0.0.2 ". /etc/profile; cd ${DIR}; ${DIR}/slave_cave.sh $1 FrontWallRight" &
-	echo start on caveclient03
-	ssh 10.0.0.3 ". /etc/profile; cd ${DIR}; ${DIR}/slave_cave.sh $1 LeftWallLeft" &
-	echo start on caveclient04
-	ssh 10.0.0.4 ". /etc/profile; cd ${DIR}; ${DIR}/slave_cave.sh $1 LeftWallRight" &
-	echo start on caveclient05
-	ssh 10.0.0.5 ". /etc/profile; cd ${DIR}; ${DIR}/slave_cave.sh $1 RightWallLeft" &
-	echo start on caveclient06
-	ssh 10.0.0.6 ". /etc/profile; cd ${DIR}; ${DIR}/slave_cave.sh $1 RightWallRight" &
-	echo start on caveclient07
-	ssh 10.0.0.7 ". /etc/profile; cd ${DIR}; ${DIR}/slave_cave.sh $1 BottomLeft" &
-	echo start on caveclient08
-	ssh 10.0.0.8 ". /etc/profile; cd ${DIR}; ${DIR}/slave_cave.sh $1 BottomRight" &
-
-elif [ "$2" = "HoloSpace" ];
-then
-
-	echo start on caveclient01
-	ssh 10.0.0.1 ". /etc/profile; cd ${DIR}; ${DIR}/slave_cave.sh $1 FrontWallLeft" &
-	echo start on caveclient02
-	ssh 10.0.0.2 ". /etc/profile; cd ${DIR}; ${DIR}/slave_cave.sh $1 FrontWallRight" &
-	echo start on caveclient03
-	ssh 10.0.0.3 ". /etc/profile; cd ${DIR}; ${DIR}/slave_cave.sh $1 LeftWallLeft" &
-	echo start on caveclient04
-	ssh 10.0.0.4 ". /etc/profile; cd ${DIR}; ${DIR}/slave_cave.sh $1 LeftWallRight" &
-	echo start on caveclient05
-	ssh 10.0.0.5 ". /etc/profile; cd ${DIR}; ${DIR}/slave_cave.sh $1 RightWallLeft" &
-	echo start on caveclient06
-	ssh 10.0.0.6 ". /etc/profile; cd ${DIR}; ${DIR}/slave_cave.sh $1 RightWallRight" &
-	echo start on caveclient07
-	ssh 10.0.0.7 ". /etc/profile; cd ${DIR}; ${DIR}/slave_cave.sh $1 BottomLeft" &
-	echo start on caveclient08
-	ssh 10.0.0.8 ". /etc/profile; cd ${DIR}; ${DIR}/slave_cave.sh $1 BottomRight" &
-	echo start on caveclient09
-	ssh 10.0.0.9 ". /etc/profile; cd ${DIR}; ${DIR}/slave_cave.sh $1 BackLeft" &
-	echo start on caveclient10
-	ssh 10.0.0.10 ". /etc/profile; cd ${DIR}; ${DIR}/slave_cave.sh $1 BackRight" &
-
-else
-	
-	echo Unknown Cluster configuration "$2"
-	exit -3
-fi
-
-
diff --git a/changelog.md b/changelog.md
new file mode 100644
index 0000000000000000000000000000000000000000..3bf06717b7c6d1e17b872015893709f9e70bdd9b
--- /dev/null
+++ b/changelog.md
@@ -0,0 +1,442 @@
+# ViSTA project change log
+This file documents notable changes to ViSTA since version 1.14.
+
+
+## ViSTA 1.16 - 2016-05-20
+
+### General notes
+ViSTA 1.16 now requires the msvc12 (Microsoft Visual Studio 2013) or gcc 4 compiler (version 4.8.2 or higher) to build.
+For gcc, C++11 features are enabled (compiler flag "-std=c++11"), which means that this flag also has to be enabled in projects including many ViSTA header files.
+
+### Removed
+* As we're not supporting SVN anymore, the svn revision (cmake svn_rev) is not part of the ViSTA versioning anymore
+* For the same reason, the SVN $Id$ lines (that could contain the last SVN commit if used correctly) have been removed
+* The deprecated (and no longer implemented) methods VistaQuaternion::GetAnglesXYZ(), GetAnglesZXY() and GetAnglesZYX() have been removed
+* The outdated Template project was removed from VistaDemo
+* The obsolete StereoTester was removed from contrib
+ 
+### Added
+* The VistaOGLExt library is now part of the VistaCoreLibs (formerly part of VistaFlowLib). 
+  VistaOGLExt provides several helpful classes and functions for when dealing with OpenGL and rendering stuff yourself, among them
+  - VistaTexture: abstraction of an OpenGL texture
+  - VistaGLSLShader: abstraction of a GLSL shader program. Note that this is for rendering own stuff, and cannot be used with OpenSG geometry.
+  - VistaShaderRegistry: central class for easily loading and retrieving shader sources from a list of shader directories. 
+  - VistaOGLUtils: collection of helper functions, e.g., for error checking
+  - VistaGLLine and VistaGLPoints: provide simple ways to draw geometric lines and points using OpenGL line/point primitives.
+  - VistaFrameBufferObj and VistaRenderBuffer: abstractions of framebuffer objects and render buffers
+  - VistaABuffer*: realizes order-independent transparency
+  - core classes for realizing particle and volume rendering
+  - ... and some more
+
+* VistaSimpleCallback can be used for callbacks without writing classes deriving from IVistaExplicitCallbackInterface, e.g., by just using lambda-functions
+  Lambda functions can also be passed directly to VistaKeyboardSystemControl to register simple key callbacks
+
+* The VistaGenericCreator can deal with non-default-constructible types
+* Can now assign priorities to IntenSelect adapters (override IVistaIntentionSelectAdapter::GetContributionMultiplier())
+* Unit tests for GenericFactory, SensorMeasure, HistoryProjectNode
+* VistaCoreLibs and VistaDemos can now be built together using the CMakeLists.txt file in the top-level directory
+
+### Changed
+* The startscripts (in contrib) were improved to allow easier customization to the application more default options
+* There is no invalid "default" zero-th sensor measure anymore if no data have been written, instead can be checked for validity
+
+### Fixed
+* Glut mouse wheel now works everywhere as expected
+* All of the VistaDemos were fixed and should now work as expected. Documentation was also improved.
+* A potential cause of memleaks was fixed in VistaSceneGraph::NewOpenGLNode() and VistaSceneGraph::NewExtensionNode
+* The DTrack driver is now again usable without control connection (AttachOnly = data connection only)
+* Fixed faulty registration of mouse / keyboard to multiple windows
+* VistaStreamManager ignored one parameter and misinterpreted others upon log file creation
+* Consistent usage of ReadState throughout drivers
+* Correct projection behavior if the projection plane is set to exactly -1, 1, -1, 1
+* Several warnings regarding implicit casts and comparisons
+* Several small fixes/tweaks
+
+
+
+## ViSTA 1.15 CONCORDE - 2016-01-21
+
+
+### Deprecated:
+
+* VistaCluster\[Master|Slave\] (old cluster mode)
+
+
+### Removed:
+
+* VistaTickTimer:
+  - constructor had two optional parameters that were not used at all
+  - static method RegisterEvents() (unused)
+
+* VistaViewport:
+  - VistaViewportProperties::MSG\_PARENT\_WINDOW\_SIZE\_CHANGE -
+    window resizing may now directly call
+  - VistaViewportProperties::SetSize/Position
+
+  
+### Added:
+
+* VistaSystem:
+  - GetStartUpTime()
+  - command line parameter -disable\_stream\_colors to disable color
+    streams when parsing the streams defined in the inifile.
+
+* VistaOpenSGSystemClassFactory:
+  - parameter to determine usage of OpenSG threads. Use of opensg
+    thread factory can be configured in vista.ini SYSTEM section by
+    setting USE\_OPENSG\_THREADS (default: true)
+
+* VistaClusterMaster:
+  - runtime deprecation warning when using old cluster mode
+
+* VistaNewClusterMaster: 
+  - configuration to record a session to file dumps
+  - Init() overload for record-only
+  - commandline option -record path to enable recording w/o editing
+    configs (required NewClusterMaster or Standalone mode)
+  - activate by adding ini entry RECORD = foldername to master
+    section.
+  - record folder from ini only set if no folder already present -->
+    command line args have priority
+  - recording replaces %DATE% in record filename with current date
+  - max consecutive barrier failures configurable by ini entry
+    MAX\_ALLOWED\_BARRIER\_FAILURES
+
+* Vista\[New\]ClusterSlave:
+  - profiler measuring glFinish call on slaves
+
+* VistaClusterMode:
+  - debugging output - can be enabled with DEBUG\_OUTPUT = TRUE in
+    system config section of cluster-ini
+
+* VistaZeroMQClusterBarrier:
+  - WaitForConnection analogous to ZeroMQDataSync
+
+* VistaRecordClusterLeaderDataSync, VistaReplayClusterFollowerSync:
+  - DataSync that write to/read from file
+
+* VistaReplaySlave:
+  - replay a previously recorded session - activate by command line
+    switch -replay foldername
+
+* VistaDisplayBridge:
+  - GetViewerPosition/Orientation with return value
+
+* VistaWindow: 
+  - VistaWindowPorperties::G/SetIsOffscreenBuffer for rendering into
+    FBO (ini entry: OFFSCREEN_BUFFER)
+  - G/SetDrawBorder (ini entry: DRAW_BORDER) re-added and
+    implemented
+  - G/SetContextVersion (ini entry: CONTEXT\_VERSION)
+  - G/SetIsDebugContext (ini entry: DEBUG\_CONTEXT)
+  - G/SetIsForwardCompatible (ini entry: FORWARD\_COMPATIBLE)
+  - G/SetMultiSamples - can be used to explicitely request MSAA - plus
+    implementation in GlutWindowToolkit (OSG not done yet).  This also
+    allows MSAA to be used with offscreen buffer windows. Can be
+    specified with the MULTISAMPLES entry in the WINDOWs ini
+    section. 0 or less as "use system default", 1 as "disable MSAA",
+    higher as nr of samples.
+  - Get\[RBG|Depth\]Image to retrieve images from frame buffer
+  - image read implementation for osg windows
+
+* VistaViewport:
+  - added VistaViewportProperties fields ResizeWithWindow and
+    RepositionWithWindow, enabled by default, which control if the
+    viewport pos and size should be maintained in relation to the
+    window size
+  
+* VistaViewportResizeToProjectionAdapter: can be used to automatically
+  update projections after resizing a viewport
+
+* VistaFrameSeriesCapture: 
+  - automatically creates a series of screenshots of a session
+  - VistaSystem command line options -capture\_frames
+    -capture\_frames\_periodically -capture\_frames\_with\_framerate
+    to automatically set up FrameSeriesCapture
+  - option -capture\_frames\_filename to specify filenames for
+    capture\_frames\_* mode
+  - allows tags (e.g. %S%, %D%) to be enclosed by $ instead of %
+
+* VistaAdaptipeVSyncControl: 
+  - monitor framerate and adaptively enable/disable vsync
+
+* VistaSceneGraph/VistaOpenSGNodeBridge:
+  - API to query all light nodes
+  - non-static GetAllSubNodesOfType without FromNode, using root
+
+* VistaGeometry: 
+  - Clone() method
+  - GetCoordinate with VistaVector3D return type
+  - GetTrianglesTextureCoordinateIndices
+  - completed Get* API for texcoords and colors (analogous to normals
+    and coords), also affects Vista\[OpenSG\]GraphicsBridge
+
+* VistaGeometryFactory::CreatePlane/CreateBox:
+  - now have three types to generate faces: quads, quads split into
+    two tris, and quads split symmetrically into four triangles
+  - optionally accept scaled texture coordinates
+  - static Create*Data functions which generate only the data vectors
+    needed for the different primitive types without depending on the
+    VistaSceneGraph member variable
+
+* VistaLightNode: 
+  - getter/setter using VistaColor
+
+* VistaOpenGLPrimitiveList: 
+  - per primitive coloring possible
+
+* VistaKeyboardSystemControl:
+  - key callback to create a screenshot (S)
+  - key callback to reset VistaKernel profiling (ALT+i)
+  - key callback for joint Profiler output from all cluster nodes
+    (ALT+o)
+  - keyboard key aliases for modifiers (ctrl, alt, del).
+  - keyboard driver detecting ctrl, alt, del presses/releases with
+    freeglut 2.8
+  - GetKeyValueFromString now also knows shift/alt/ctrl key values
+  - more named variants for string-to-keycode in GetKeyValueFromString
+  - added modifier keys to GetKeyName
+  - now optionally delays calls to registered actions
+
+* VistaIntentionSelect:
+  - ClearAllNodes() method
+
+* IVista3DText:
+  - G/SetIsLit to choose wether or not to use shading
+
+* VistaFramerateDisplay:
+  - new options. per default shown on all viewports, can be changed
+    with ALL\_VIEWPORTS\[bool\], VIEWPORTS\[list<string>\] and
+    EXCLUDE\_VIEWPORTS\[list<string>\]
+
+* VistaColorOverlay:
+  - Scene Overlay to draw simple unicolor fullscreen quad, e.g. for
+    fading
+
+* VistaOpenSGMultiMaterial:
+  - Clone() method
+
+
+### Changed:
+
+* Build system:
+  - request ZeroMQ version with PGM support
+  - glew for offscreen buffer rendering
+  - using SYSTEM_HEADERS define for OpenSG to suppress gcc compiler
+    warnings in their header files.
+
+* VistaSystem: 
+  - unregister signal-handlers on deletion
+  - Linux: register signal handlers with SA_RESTART so all restartable
+    syscalls will be restarted automatically
+  - VistaSystemConfigurators uses VistaKernelWindowHandle (VDD)
+  - capturing default history size now in DriverInfo (cluster-device init)
+  - ini configuration of BACKGROUNDCOLOR and LIGHTS now interprets
+    colors as numbers or as text (e.g. BLACK, VISTA_BLUE)
+  - Loading driver plugins worked even if driver type was wrongly
+    capitalized in ini, which led to follow-up problems (i.e. a crash
+    on exit). Driver types must now always be provided with correct
+    case.
+
+* VistaEventManager: 
+  - UnregisterObserver outside frame not queued
+
+* VistaEventHandler: 
+  - S/GetIsEnabled now virtual
+
+* VistaEvent:
+  - clarified API (using enum instead of bool on construction to
+    clarify waitable / non-waitable behavior)
+
+* VistaThreadEvent:
+  - ResetThisEvent: added flag to indicate whether to reset ALL or
+    just the latest event (depending on implementation)
+
+* VistaTickTimer:
+  - changed timer event type registration
+
+* VistaDisplayManager:
+  - MakeScreenshot function changed - now no longer uses OpenSG
+    Foreground, but directly grabs framebuffer. This allows to (a)
+    grab the whole window, instead of just the first viewport, and (b)
+    grab images from multisample FBOs
+    
+* VistaDisplayBridge:
+  - G/SetFullscreen renamed to G/SetWindowFullscreen
+
+* VistaOpenSGDisplayBridge:
+  - added notification message to clarify on size change (parent
+    window size change in display bridge), to differentiate from vp
+    size change
+
+* VistaWindowingToolkit:
+  - support window aspect changes
+
+* VistaGlutWindowingToolkit:
+  - handler for catching window close
+  - can now optionally catch all exceptions that are unhandled, before
+    returning control to glut. This can be helpful with 64bit-windows,
+    which silently smallows unhandled expressions. Can be enabled by
+    setting the CMake vars
+    VISTACORELIBS\_GLUT\_WINDOW\_NOTIFY\_FRAME\_EXCEPTIONS or
+    VISTACORELIBS\_GLUT\_WINDOW\_ABORT\_ON\_FRAME\_EXCEPTIONS
+  - by default leaves multisampling unchanged from system default
+  - hide dummy window immediately after creation
+ 
+* VistaGraphicsBridge/VistaOpenSGGraphicsBridge:
+  - more const correctness
+  - SetTextures configures textures to use repeat and mipmaps.
+  - SetTransparency checks for SimpleMaterial special case.
+  - GetCachedOrLoadImage: texture loading on windows now accepts
+    absolute paths.
+
+* VistaSceneGraph:
+  - GetAllSubNodesOfType is now static
+  - SaveSubTree now accepts IVistaNode instead of VistaNode
+
+* VistaOpenGLNode: 
+  - using top-level GetBoundingBox
+
+* VistaGeometryFactory::CreateBox: 
+  - create box with no superfluous vertices
+  - un-set backface culling
+
+* VistaInteractionManager:
+  - now acts as read state source for all devices in the event Loop
+
+* VistaKeyboardSystemControl:
+  - by default, keyboard actions are now triggered in the
+    POSTAPPLICATION event, because otherwise issues may arise when
+    using cluster-synchronization-dependent actions (e.g. ClusterSync
+    usage), and performing time-consuming operations have a higher
+    impact because they are first performed on master, then on slave
+
+* VistaDfnKeyCallbackNode: 
+  - only update outport when actually changed
+  - moved setup of keyboard callbacks into dedicated function
+
+* VistaIntentionSelect:
+  - VistaNodeAdapter::GetNode() returns the Vista node.
+  - now also supports line handles
+  - IVistaIntentionSelectAdapter::GetPosition now also gets the
+    reference frame of the IntenSelect cone
+
+* VistaAxes:
+  - takes parent group node as second parameter now
+
+* VistaOSGAC3DFileType: 
+  - loader doesn't create per-vertex colors anymore (ac3d has
+    per-object colors only)
+
+* VistaFadeoutNode: overlay extracted to VistaColorOverlay
+
+* VistaProximityWarning: no longer flashes when entering from the outside
+
+
+
+
+### Fixed:
+
+* Build system:
+  - GLUT capitalization in vista\_find\_package call
+
+* VistaSystem:
+  - check if ini paths exist before trying to make absolute
+  - no longer crashes when closed via console on MS Windows
+  - use GetSystemSectionName() instead of hardcoded "SYSTEM"
+  - adding a call to disconnect after disabling device drivers on
+    ramp-down of system in d'tor
+  - console Handlers for windows equiv. to behavior on posix signals
+    (i.e. Ctrl+C -> quit, 3 times Ctrl+C -> Force quit)
+  - Linux SIGTERM adjustments
+
+* VistaSystemConfigurators:
+  - remove USB connection
+  - set driver/sensor names in SensorMappingConfigurator only if not
+    yet set by the driver itself
+
+* VistaClusterStandalone:
+  - now provides correct node counts and infos
+
+* VistaNewClusterMaster:
+  - proper observing of swapsync barriers to detect dropped slaves
+  - cluster debug stream config deserialization
+  
+* VistaZeroMQClusterDataSync:
+  - make cluster sync work with >=zeromq-3.2
+
+* VistaGlutWindowingToolkit:
+  - SetUseStereo: proper init checking
+  - problem with freeglut 2.8 calling closefunction after window was
+    already destroyed, crashing on shutdown
+  - Combining real and offscreen windows works properly now
+  - after window resizing, the window still reported the old size
+    until the next frame (i.e. until the glut reshape callback
+  - Check for freeglut version (context version and flags only
+    available since freeglut 2.8)
+  - conditional use of GL\_MAX\_FRAMEBUFFER\_WIDTH/HEIGHT
+  - VSync initial setting
+  - GlutImage Read\[RGB|Depth\]Image read from front buffer instead of
+    back buffer
+
+* VistaOpenSGDisplayBridge:
+  - GetViewportPosition returned wrong y position
+
+* VistaViewport:
+  - SetSize did set viewport width/height one pixel too large (wrong
+    conversion to opensg's left/top pixel)
+
+* VistaViewportResizeToProjectionAdapter:
+  - div by zero when viewport is temporarily resized to zero width or
+    height
+
+* VistaOSGWindowingToolkit:
+  - add empty(!) methods to make it compile, due to changes in
+    VistaWindowingToolkit
+
+* VistaUser/PlatformNode: 
+  - initial state setting
+
+* VistaOpenSGGraphicsBridge:
+  - vertex count computation for lines
+  - GetCoordinates crash
+  - GetTrianglesNormalIndices: proper check for normal correctness
+  - GetTrianglesTextureCoordinateIndices: index check
+
+* VistaSceneGraph:
+  - point lights defined using prop lists (e.g., from a config file)
+    now work ... (direction was used instead)
+  - when changing the parent of a light node, the light got disabled
+    (only light beacon was reattached to scenegraph, but not actual
+    light).
+
+* VistaGeometry:
+  - GetColor properly handles osg::SimpleMaterial
+
+* VistaGeometryFactory:
+  - usage of resolution value in triangle creation
+  - ordering of vertices in triangle creation
+  - CreateEllipsoidData default parameters and order
+
+* VistaInteractionManager:
+  - DelInteractionContext: proper deletion iteration
+
+* VistaVirtualConsole:
+  - Set correct texture unit (prevents problems when using
+    OpenSSGShadows)
+
+* VistaKeyboardSystemControl::GetKeyAndModifiersValueFromString():
+  - parsing of plus-sign as character, not separator
+  - corrected name check for Pagedown
+  - BindAction with Force properly overwrites in all cases
+
+* VistaFramerateDisplay: avoiding stack corruption in framerate
+  display for ludicrous framerates.
+
+* VistaEyeTester: 
+  - proper GL tex env mode setting
+  - eyetester texture always applied
+
+* VistaDfnFadeoutNode: corrected fadeout opacity adjustment
+   
+* Various minor fixes and style changes
diff --git a/contrib/StereoTester/CMakeLists.txt b/contrib/StereoTester/CMakeLists.txt
deleted file mode 100644
index a5456e27ad5501de1da04dda73e2bcab201a5ea1..0000000000000000000000000000000000000000
--- a/contrib/StereoTester/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-# $Id$
-
-cmake_minimum_required( VERSION 2.8 )
-project( StereoTester )
-
-list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
-
-include( VistaCommon )
-
-vista_use_package( VistaCoreLibs "HEAD" REQUIRED FIND_DEPENDENCIES )
-
-add_executable( StereoTester main.cpp )
-target_link_libraries( StereoTester
-	${VISTA_USE_PACKAGE_LIBRARIES} # contains all libraries from vista_use_package() calls
-)
-
-vista_configure_app( StereoTester )
-vista_create_default_info_file( StereoTester )
-
diff --git a/contrib/StereoTester/README.txt b/contrib/StereoTester/README.txt
deleted file mode 100644
index c588c02a2ac88061a663c83673a40c60e8a35be1..0000000000000000000000000000000000000000
--- a/contrib/StereoTester/README.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Use this demo to test if your 3D display is set up right.
-Please compile the program and run it with your init file. If run on a
-Pi-CASSO system, you just need to start the start_picasso.sh from your build directory.
-What do you see? If you see a long bar going from short behind the screen to
-the horizon, everything is fine. If you see a triangle coming out of your screen,
-you should switch either the projectors or the eye positions in your display
-configuration file.
diff --git a/contrib/StereoTester/configfiles/display_picasso.ini b/contrib/StereoTester/configfiles/display_picasso.ini
deleted file mode 100644
index a4d8c699d0cdf02f68c0f6a97345c9b9fe8ea324..0000000000000000000000000000000000000000
--- a/contrib/StereoTester/configfiles/display_picasso.ini
+++ /dev/null
@@ -1,43 +0,0 @@
-# display system initialization file for the PI-casso workstation
-# in the CCC VR-Lab
-# $Id$
-
-[SYSTEM]
-DISPLAYSYSTEMS 		= MAIN
-
-[MAIN]
-NAME				= MAIN
-VIEWPORTS 			= MAIN_VIEWPORT
-VIEWER_POSITION		= 0, 0, 2
-VIEWER_ORIENTATION	= 0, 0, 0, 1
-LEFT_EYE_OFFSET		= -0.04, 0.0, 0.0
-RIGHT_EYE_OFFSET	= 0.04, 0.0, 0.0
-REFERENCE_FRAME 	= MAIN_REF_FRAME
-
-[MAIN_REF_FRAME]
-NAME 				= MAIN Reference Frame
-#TRANSLATION		= 1, 0.1, 1
-ROTATION			= 90, 0, 0
-
-[MAIN_VIEWPORT]
-NAME				= MAIN_VIEWPORT
-PROJECTION			= MAIN_PROJECTION
-WINDOW				= MAIN_WINDOW
-
-[MAIN_PROJECTION]
-NAME				= MAIN_PROJECTION
-PROJ_PLANE_MIDPOINT	= 0, 0, 0
-PROJ_PLANE_NORMAL	= 0, 0.258819, 0.965925
-PROJ_PLANE_UP		= 0, 0.965925, -0.258819
-PROJ_PLANE_EXTENTS	= -0.6, 0.6, -0.45, 0.45
-CLIPPING_RANGE		= 0.15, 1000.0
-STEREO_MODE		    = FULL_STEREO
-
-[MAIN_WINDOW]
-NAME				= MAIN_WINDOW
-#POSITION			= 0, 0
-#SIZE				= 1400, 1050
-#SIZE				= 800, 600
-STEREO				= true
-FULL_SCREEN			= true
-
diff --git a/contrib/StereoTester/configfiles/interaction_picasso.ini b/contrib/StereoTester/configfiles/interaction_picasso.ini
deleted file mode 100644
index 64d98ecfc4e291c75108442fd44d120975005590..0000000000000000000000000000000000000000
--- a/contrib/StereoTester/configfiles/interaction_picasso.ini
+++ /dev/null
@@ -1,97 +0,0 @@
-# $Id$
-[SYSTEM]
-DRIVERPLUGINDIRS	= ${VISTACORELIBS_DRIVER_PLUGIN_DIRS}
-DEVICEDRIVERS		= KEYBOARD, MOUSE, DTRACK, SPACENAVIGATOR
-INTERACTIONCONTEXTS	= KEYCONTROL, TRACKBALL, UCP
-DUMPGRAPHS			= FALSE
-DUMPPORTS			= TRUE
-
-#######################################################################
-# INTERACTION CONTEXTS
-#######################################################################
-
-[KEYCONTROL]
-ROLE				= KEYCONTROL 
-GRAPH				= xml/keyboard_standardinput.xml
-
-[SPACENAVIGATION]
-ROLE				= SPACENAVIGATOR
-GRAPH				= xml/spacenavigator_navigation.xml
-PRIORITY			= 4096
-
-[TRACKBALL]
-ROLE				= TRACKBALL
-GRAPH				= xml/mouse_trackball.xml
-#RELOADTRIGGER = T
-
-# user centered projection
-[UCP]
-ROLE				= UCP
-GRAPH				= xml/ucp_picasso.xml
-
-#######################################################################
-# DEVICE DRIVERS
-#######################################################################
-
-[KEYBOARD]
-TYPE				= GLUTKEYBOARD
-HISTORY				= 10
-DEFAULTWINDOW		= TRUE
-# the sensor section is important for clustermode as the slaves will get the
-# sensor values injected and therefore need a sensor id to be assigned
-SENSORS				= KEYB_MAIN
-
-[KEYB_MAIN]
-RAWID				= 0
-
-[MOUSE]
-TYPE				= GLUTMOUSE
-HISTORY				= 10
-SENSORS				= MOUSE_MAIN
-DEFAULTWINDOW		= TRUE
-
-[SPACENAVIGATOR]
-TYPE				= 3DCSPACENAVIGATOR
-HISTORY				= 10
-
-[MOUSE_MAIN]
-RAWID				= 0
-
-[DTRACK]
-TYPE				= DTRACK
-NAME				= DTRACK
-PROTOCOL			= DTRACK2
-CONNECTIONS			= DTRACKCONTROL, DTRACKDATA
-SENSORS				= HEAD, GYRO
-HISTORY				= 10
-ATTACHONLY			= FALSE
-
-[DTRACK2]
-NAME				= dtrack2
-
-[HEAD]
-TYPE				= BODY
-RAWID				= 0
-
-[GYRO]
-TYPE				= BODY
-RAWID				= 1
-
-[STICK1]
-TYPE				= STICK
-RAWID				= 0
-
-[DTRACKCONTROL]
-TYPE				= TCP
-DRIVERROLE			= CONTROLCONNECTION
-ADDRESS				= 192.168.0.1
-#PORT				= 5000
-PORT				= 50105
-DIRECTION			= OUTGOING
-
-[DTRACKDATA]
-TYPE				= UDP
-DRIVERROLE			= DATACONNECTION
-ADDRESS				= 192.168.0.5
-PORT				= 5001
-DIRECTION			= INCOMING
diff --git a/contrib/StereoTester/configfiles/vista.ini b/contrib/StereoTester/configfiles/vista.ini
deleted file mode 100644
index d8da32aa094ac4e85c1a57390446e454d538938c..0000000000000000000000000000000000000000
--- a/contrib/StereoTester/configfiles/vista.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-#######################################################################
-#        V I S T A     I N I T I A L I Z A T I O N     F I L E        #
-#######################################################################
-# $Id$
-#######################################################################
-[SYSTEM]
-# include other ini files
-DISPLAYINI		=	display_picasso.ini
-INTERACTIONINI	=	interaction_picasso.ini
-
-#select configuration for graphics manager
-GRAPHICSSECTION = GRAPHICS
-
-#######################################################################
-# GRAPHICS SECTION
-#######################################################################
-[GRAPHICS]
-LIGHTS			= LIGHT_A0
-
-[LIGHT_A0]
-Type			= DIRECTIONAL
-DiffuseColor	= 0.8, 0.8, 0.8
-SpecularColor	= 0.2, 0.2, 0.2
-Direction		= 1.0, 1.0, 1.0
diff --git a/contrib/StereoTester/configfiles/xml/keyboard_standardinput.xml b/contrib/StereoTester/configfiles/xml/keyboard_standardinput.xml
deleted file mode 100644
index 4e5b8ef075ac797680c4cd79324ffb42560300e6..0000000000000000000000000000000000000000
--- a/contrib/StereoTester/configfiles/xml/keyboard_standardinput.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
-<module>
-	<nodespace>
-	</nodespace>
-	<graph>
-		<!-- data source... a keyboard -->
-		<node name="keyboard" type="DriverSensor">
-			<param name="sensor" value="0"/>
-			<param name="driver" value="KEYBOARD"/>
-		</node>
-
-		<node name="triggerlist" type="Aggregate[int]">
-			<param name="in" value="KEY"/>
-		</node>
-		<node name="modderlist" type="Aggregate[int]">
-			<param name="in" value="MODIFIER"/>
-		</node>
-
-		<node name="apply" type="SystemTriggerControl"/>
-	</graph>
-	<edges>
-		<!-- connect hid -> overlay -->
-		<edge fromnode="keyboard" tonode="triggerlist" fromport="history" toport="history"/>
-		<edge fromnode="keyboard" tonode="modderlist" fromport="history" toport="history"/>
-		<edge fromnode="triggerlist" tonode="apply" fromport="values" toport="triggerlist"/>
-		<edge fromnode="modderlist" tonode="apply" fromport="values" toport="modlist"/>
-	</edges>
-</module>
\ No newline at end of file
diff --git a/contrib/StereoTester/configfiles/xml/mouse_trackball.xml b/contrib/StereoTester/configfiles/xml/mouse_trackball.xml
deleted file mode 100644
index 181eae68d46457779c9a96cdd7a67ac2c3a643ed..0000000000000000000000000000000000000000
--- a/contrib/StereoTester/configfiles/xml/mouse_trackball.xml
+++ /dev/null
@@ -1,344 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
-<!--=========================================================================-->
-<!-- This nodes implements the default mouse navigation with trackball,      -->
-<!-- panning and zooming. The behavior is continous. You can scale the speed -->
-<!-- by changing the transform matrices.                                     -->
-<!--=========================================================================-->
-
-<module>
-	<nodespace>
-	</nodespace>
-	<graph>
-		<!--=========================================================================-->
-		<!-- hardware stuff                                                          -->
-		<!--=========================================================================-->
-		<!-- data source... a mouse -->
-		<node name="mouse" type="DriverSensor">
-			<param name="sensor" value="0"/>
-			<param name="driver" value="MOUSE"/>
-		</node>
-		<!-- project the necessary information from the mouse history -->
-		<!-- in this demo, we are not interested in the mouse history,
-				 but only in the last value (LAZYSAMPLING), but for demonstration
-				 purposes, we simply extract every attribute we can get from
-				 the mouse driver -->
-		<node name="project_mouse" type="HistoryProject">
-			<param name="project">POSITION, LEFT_BUTTON, RIGHT_BUTTON, MIDDLE_BUTTON</param>
-		</node>
-		<!-- this will give the sampling mode to the history project
-				 node, a value of "0" means "LAZY" while a value of "1"
-				 means "HOT". There is no other sampling value currently -->
-		<node name="project_mode" type="ConstantValue[int]">
-			<param name="mode" value="0"/>
-		</node>
-		<!-- DONE -->
-
-		<!--=========================================================================-->
-		<!-- timer node                                                              -->
-		<!--=========================================================================-->
-
-		<!-- we need the timer for the time-delta between graph evaluations, to make
-		 the movement frame-rate independant.
-		-->
-		<node name="timer" type="Timer" />
-
-		<!--=========================================================================-->
-		<!-- normalize mouse position                                                -->
-		<!--=========================================================================-->
-		<!-- get normalize source -->
-		<node name="normwindow" type="WindowSource">
-			<param name="value" value="MAIN_WINDOW"/>
-		</node>
-		<!-- the window spits out ints as attribs, we need floats for the normalize node -->
-		<node name="conv_w" type="TypeConvert[int,float]"/>
-		<node name="conv_h" type="TypeConvert[int,float]"/>
-		<!-- all these params are optional and can also be set by an inport -->
-		<node name="normalize" type="3DNormalize">
-			<param name="min_x" value="-1"/>
-			<param name="min_y" value="-1"/>
-			<param name="min_z" value="0"/>
-			<param name="target_w" value="2"/>
-			<param name="target_h" value="2"/>
-			<param name="target_d" value="0"/>
-			<param name="flip_y" value="1"/>
-		</node>
-		<!-- setup the operations of the graph -->
-		<node name="position_to_norm" type="Multiply[VistaTransformMatrix,VistaVector3D]"/>
-
-		<!--=========================================================================-->
-		<!-- ConstantValue nodes                                                     -->
-		<!--=========================================================================-->
-		<node name="value-0" type="ConstantValue[float]">
-			<param name="value" value="0.0"/>
-		</node>
-		<node name="value-minus-1" type="ConstantValue[float]">
-			<param name="value" value="-1.0"/>
-		</node>
-
-		<!-- set your desired panning/zooming factor here. -->
-		<node name="value-scale" type="ConstantValue[float]">
-			<param name="value" value="8.0"/>
-		</node>
-
-		<node name="true" type="ConstantValue[bool]">
-			<param name="value" value="true"/>
-		</node>
-		<node name="rotation_center" type="ConstantValue[VistaVector3D]">
-			<param name="value" value="0,0,0,1"/>
-		</node>
-
-		<!--=========================================================================-->
-		<!-- rotation nodes                                                          -->
-		<!--=========================================================================-->
-
-		<!-- this node holds the value when the button was first pressed at its
-		 outport, thus enabling to retrieve the grab point for the trackball from the
-		 moment the button was first pressed.
-		-->
-		<node name="rot_grab_condition" type="ConditionalRoute"/>
-
-		<!-- introduces a delay of 1 graph evaluation so we can in each frame calculate
-		 the difference to the last position.
-		-->
-		<node name="coord_delay" type="Delay[VistaVector3D]"/>
-
-		<!-- this node does the substraction of the and the current position with the
-		 position in the last graph evaluation.
-		-->
-		<node name="rot_diff_coords" type="Substract[VistaVector3D]"/>
-
-		<!-- a gate which opens if the button is pressed, to make the rotation offset
-		 (which is calculated as the coord difference between graph iterations)
-		 active for the time the button is pressed.
-		-->
-		<node name="rot_offset_condition" type="ConditionalRoute"/>
-
-		<!-- inverts the value of the button press, since we want the conditionalroute
-		 to route (_not_ keep the old value) when the button is _not_ pressed, i.e.
-		 to keep the old value as long as the button is pressed.
-		-->
-		<node name="rot_button_invert" type="Invert[bool]"/>
-
-		<!-- the latestupdate node functions realizes a default value for the trigger inport
-		 of the conditionalroute node. since the default value we get from the
-		 historyproject (as long as there are no measures) is false, but we want an
-		 initial true, we connect a constantvalue true (which fires once on initialization)
-		 and the button outport, which overrides the default as soon as there are
-		 driver measures. 
-		-->
-		<node name="rot_condition_la" type="LatestUpdate[bool]"/>
-
-		<!-- inverts the coordinates for the trackball, to get a non-inverted mouse
-		 behavior. this is of course a matter of taste as well of wether the resulting
-		 transformation is applied to the camera or an object. tune this as you like.
-		-->
-		<node name="rot_invert_offset" type="Multiply[float,VistaVector3D]"/>
-
-		<!-- calculates the actual (incremental) transformation from the normalized, 
-		 time-scaled input coordinates, the initial "grab point" and the center
-		 of rotation.
-		-->
-		<node name="trackball_trans" type="Trackball" />
-
-		<!-- the result is a transform that has to be applied to an object, in this
-		 case, the camera.
-		-->
-		<node name="apply_rotation" type="ApplyTransform">
-			<param name="object" value="CAM:MAIN"/>
-			<param name="local" value="true"/>
-		</node>
-
-		<!--=========================================================================-->
-		<!-- Pan nodes                                                               -->
-		<!--=========================================================================-->
-
-		<!-- the nodes' function is analog to the rotation case, see above -->
-
-		<node name="pan_condition" type="ConditionalRoute"/>
-
-		<node name="pan_diff_coords" type="Substract[VistaVector3D]"/>
-
-		<!-- multiplication with the time-delta for frame-rate independent movement.
-		-->
-		<node name="pan_diff_timed" type="Multiply[double,VistaVector3D]"/>
-
-		<!-- multiplication with a custom multiplier for different movement speeds.
-		 this depends on the application and the scale of your scene.
-		-->
-		<node name="pan_diff_scaled" type="Multiply[float,VistaVector3D]"/>
-
-		<node name="pan_button_invert" type="Invert[bool]"/>
-		<node name="pan_condition_la" type="LatestUpdate[bool]"/>
-
-		<!-- instead of using the trackball node, here we just compose a matrix from
-		 our screen coordinate offet, which is then applied to the camera as a
-		 local transformation to realize panning parallel to the screen surface.
-		 -->
-		<node name="pan_matrix" type="MatrixCompose"/>
-
-		<node name="apply_panning" type="ApplyTransform">
-			<param name="object" value="CAM:MAIN"/>
-			<param name="local" value="true"/>
-		</node>
-
-		<!--=========================================================================-->
-		<!-- Zoom nodes                                                              -->
-		<!--=========================================================================-->
-
-		<!-- the nodes' function is analog to the panning case, see above -->
-
-		<node name="zoom_condition" type="ConditionalRoute"/>
-
-		<node name="zoom_diff_coords" type="Substract[VistaVector3D]"/>
-		<node name="zoom_diff_timed" type="Multiply[double,VistaVector3D]"/>
-
-		<node name="zoom_diff_scaled" type="Multiply[float,VistaVector3D]"/>
-
-		<node name="zoom_button_invert" type="Invert[bool]"/>
-		<node name="zoom_condition_la" type="LatestUpdate[bool]"/>
-
-		<!-- for zooming, we additionally multiply the following matrix to map the
-		 y coordinate to -z for panning (actually it's not a zoom) in the viewer
-		 direction, i.e. orthogonal to the screen surface.
-		 -->
-		<node name="zoom_y_to_z" type="Multiply[VistaTransformMatrix,VistaVector3D]"/>
-		<node name="zoom_y_to_z_matrix" type="ConstantValue[VistaTransformMatrix]">
-			<param name="value" value="0, 0,0,0,
-								 0, 0,0,0,
-								 0,-1,0,0,
-								 0, 0,0,1"/>
-		</node>
-
-
-		<node name="zoom_matrix" type="MatrixCompose"/>
-
-		<node name="apply_zoom" type="ApplyTransform">
-			<param name="object" value="CAM:MAIN"/>
-			<param name="local" value="true"/>
-		</node>
-
-		<!--=========================================================================-->
-		<!-- DEBUG                                                                   -->
-		<!--=========================================================================-->
-		<!--
-		 <node name="debug" type="DeviceDebug"/>
-		 <node name="debugv3d" type="TextOverlay[VistaVector3D]"/>
-		 <node name="debugButton" type="TextOverlay[bool]"/>
-		 -->
-
-		<!--
-		 <node name="debugv3d" type="TextOverlay[VistaVector3D]">
-		 <param name="red" value="255" />
-		 <param name="size" value="40" />
-		 </node>
-		 -->
-	</graph>
-	<edges>
-
-		<!--=========================================================================-->
-		<!-- hardware stuff                                                          -->
-		<!--=========================================================================-->
-		<edge fromnode="mouse" tonode="project_mouse" fromport="history" toport="history"/>
-		<edge fromnode="project_mode" tonode="project_mouse" fromport="value" toport="sampling_mode"/>
-
-		<!--=========================================================================-->
-		<!-- normalize mouse position                                                -->
-		<!--=========================================================================-->
-		<edge fromnode="normwindow" tonode="conv_w" fromport="win_w" toport="in"/>
-		<edge fromnode="normwindow" tonode="conv_h" fromport="win_h" toport="in"/>
-		<edge fromnode="conv_w" tonode="normalize" fromport="out" toport="source_w"/>
-		<edge fromnode="conv_h" tonode="normalize" fromport="out" toport="source_h"/>
-		<edge fromnode="value-0" tonode="normalize" fromport="value" toport="source_d"/>
-		<edge fromnode="normalize"     tonode="position_to_norm" fromport="transform" toport="first"/>
-		<edge fromnode="project_mouse" tonode="position_to_norm" fromport="POSITION"  toport="second"/>
-
-		<!--=========================================================================-->
-		<!-- rotation                                                                -->
-		<!--=========================================================================-->
-		<edge fromnode="project_mouse" tonode="rot_button_invert" fromport="LEFT_BUTTON" toport="in"/>
-
-		<edge fromnode="true"              tonode="rot_condition_la" fromport="value" toport="in_0"/>
-		<edge fromnode="rot_button_invert" tonode="rot_condition_la" fromport="out"   toport="in_1"/>
-
-		<edge fromnode="rot_condition_la" tonode="rot_grab_condition" fromport="out" toport="trigger"/>
-		<edge fromnode="position_to_norm" tonode="rot_grab_condition" fromport="out" toport="coords"/>
-
-		<edge fromnode="position_to_norm" tonode="coord_delay" fromport="out" toport="in"/>
-
-		<edge fromnode="position_to_norm" tonode="rot_diff_coords" fromport="out" toport="first"/>
-		<edge fromnode="coord_delay"      tonode="rot_diff_coords" fromport="out" toport="second"/>
-
-		<edge fromnode="rot_diff_coords" tonode="rot_offset_condition" fromport="out"         toport="offset"/>
-		<edge fromnode="project_mouse"   tonode="rot_offset_condition" fromport="LEFT_BUTTON" toport="trigger"/>
-
-		<edge fromnode="value-minus-1"        tonode="rot_invert_offset" fromport="value"  toport="first"/>
-		<edge fromnode="rot_offset_condition" tonode="rot_invert_offset" fromport="offset" toport="second"/>
-
-		<edge fromnode="rot_invert_offset"  tonode="trackball_trans" fromport="out"    toport="offset"/>
-		<edge fromnode="rotation_center"    tonode="trackball_trans" fromport="value"  toport="center"/>
-		<edge fromnode="rot_grab_condition" tonode="trackball_trans" fromport="coords" toport="grab"/>
-
-		<edge fromnode="trackball_trans" tonode="apply_rotation" fromport="transform" toport="in"/>
-
-		<!--=========================================================================-->
-		<!-- panning                                                                 -->
-		<!--=========================================================================-->
-		<edge fromnode="project_mouse" tonode="pan_button_invert" fromport="RIGHT_BUTTON" toport="in"/>
-
-		<edge fromnode="true"              tonode="pan_condition_la" fromport="value" toport="in_0"/>
-		<edge fromnode="pan_button_invert" tonode="pan_condition_la" fromport="out" toport="in_1"/>
-
-		<edge fromnode="pan_condition_la" tonode="pan_condition" fromport="out" toport="trigger"/>
-		<edge fromnode="position_to_norm" tonode="pan_condition" fromport="out" toport="coords"/>
-
-		<edge fromnode="position_to_norm" tonode="pan_diff_coords" fromport="out" toport="first"/>
-		<edge fromnode="pan_condition"    tonode="pan_diff_coords" fromport="coords" toport="second"/>
-
-		<edge fromnode="pan_diff_coords" tonode="pan_diff_timed" fromport="out" toport="second"/>
-		<edge fromnode="timer"           tonode="pan_diff_timed" fromport="dt"  toport="first"/>
-
-		<edge fromnode="value-scale"    tonode="pan_diff_scaled" fromport="value" toport="first"/>
-		<edge fromnode="pan_diff_timed" tonode="pan_diff_scaled" fromport="out"   toport="second"/>
-
-		<edge fromnode="pan_diff_scaled" tonode="pan_matrix" fromport="out" toport="translation"/>
-
-		<edge fromnode="pan_matrix" tonode="apply_panning" fromport="out" toport="in"/>
-
-		<!--=========================================================================-->
-		<!-- zooming                                                                 -->
-		<!--=========================================================================-->
-		<edge fromnode="project_mouse" tonode="zoom_button_invert" fromport="MIDDLE_BUTTON" toport="in"/>
-
-		<edge fromnode="true"               tonode="zoom_condition_la" fromport="value" toport="in_0"/>
-		<edge fromnode="zoom_button_invert" tonode="zoom_condition_la" fromport="out" toport="in_1"/>
-
-		<edge fromnode="zoom_condition_la" tonode="zoom_condition" fromport="out" toport="trigger"/>
-		<edge fromnode="position_to_norm"  tonode="zoom_condition" fromport="out" toport="coords"/>
-
-		<edge fromnode="position_to_norm" tonode="zoom_diff_coords" fromport="out" toport="first"/>
-		<edge fromnode="zoom_condition"   tonode="zoom_diff_coords" fromport="coords" toport="second"/>
-
-		<edge fromnode="zoom_diff_coords" tonode="zoom_diff_timed" fromport="out" toport="second"/>
-		<edge fromnode="timer"            tonode="zoom_diff_timed" fromport="dt"  toport="first"/>
-
-		<edge fromnode="value-scale"     tonode="zoom_diff_scaled" fromport="value" toport="first"/>
-		<edge fromnode="zoom_diff_timed" tonode="zoom_diff_scaled" fromport="out" toport="second"/>
-
-		<edge fromnode="zoom_diff_scaled"   tonode="zoom_y_to_z" fromport="out" toport="second"/>
-		<edge fromnode="zoom_y_to_z_matrix" tonode="zoom_y_to_z" fromport="value" toport="first"/>
-
-		<edge fromnode="zoom_y_to_z" tonode="zoom_matrix" fromport="out" toport="translation"/>
-
-		<edge fromnode="zoom_matrix" tonode="apply_zoom" fromport="out" toport="in"/>
-
-		<!--=========================================================================-->
-		<!-- DEBUG                                                                   -->
-		<!--=========================================================================-->
-
-		<!--   <edge fromnode="mouse" tonode="debug" fromport="history" toport="history"/>-->
-		<!--   <edge fromnode="camera_source" tonode="debugv3d" fromport="position" toport="value"/>-->
-		<!--   <edge fromnode="timer" tonode="debugDouble" fromport="dt" toport="value"/> -->
-
-	</edges>
-</module>
diff --git a/contrib/StereoTester/configfiles/xml/mouse_trackball_continuous.xml b/contrib/StereoTester/configfiles/xml/mouse_trackball_continuous.xml
deleted file mode 100644
index e6380cc53e7ebc34814e1a58aea767ecd57d74e7..0000000000000000000000000000000000000000
--- a/contrib/StereoTester/configfiles/xml/mouse_trackball_continuous.xml
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
-<!--=========================================================================-->
-<!-- This nodes implements the default mouse navigation with trackball,      -->
-<!-- panning and zooming. The behavior is continous. You can scale the speed -->
-<!-- by changing the transform matrices.                                     -->
-<!--=========================================================================-->
-<module>
-	<nodespace>
-	</nodespace>
-	<graph>
-		<!--=========================================================================-->
-		<!-- hardware stuff                                                          -->
-		<!--=========================================================================-->
-		<!-- data source... a mouse -->
-		<node name="mouse" type="DriverSensor">
-			<param name="sensor" value="0"/>
-			<param name="driver" value="MOUSE"/>
-		</node>
-		<!-- project the necessary information from the mouse history -->
-		<!-- in this demo, we are not interested in the mouse history,
-				 but only in the last value (LAZYSAMPLING), but for demonstration
-				 purposes, we simply extract every attribute we can get from
-				 the mouse driver -->
-		<node name="project_mouse" type="HistoryProject">
-			<param name="project">POSITION, LEFT_BUTTON, RIGHT_BUTTON, MIDDLE_BUTTON</param>
-		</node>
-		<!-- this will give the sampling mode to the history project
-				 node, a value of "0" means "LAZY" while a value of "1"
-				 means "HOT". There is no other sampling value currently -->
-		<node name="project_mode" type="ConstantValue[int]">
-			<param name="mode" value="0"/>
-		</node>
-		<!-- DONE -->
-
-		<!--=========================================================================-->
-		<!-- timer node                                                              -->
-		<!--=========================================================================-->
-
-		<!-- we need the timer for the time-delta between graph evaluations, to make
-		 the movement frame-rate independant.
-		-->
-		<node name="timer" type="Timer" />
-
-		<!--=========================================================================-->
-		<!-- normalize mouse position                                                -->
-		<!--=========================================================================-->
-		<!-- get normalize source -->
-		<node name="normwindow" type="WindowSource">
-			<param name="value" value="MAIN_WINDOW"/>
-		</node>
-		<!-- the window spits out ints as attribs, we need floats for the normalize node -->
-		<node name="conv_w" type="TypeConvert[int,float]"/>
-		<node name="conv_h" type="TypeConvert[int,float]"/>
-		<!-- all these params are optional and can also be set by an inport -->
-		<node name="normalize" type="3DNormalize">
-			<param name="min_x" value="-1"/>
-			<param name="min_y" value="-1"/>
-			<param name="min_z" value="0"/>
-			<param name="target_w" value="2"/>
-			<param name="target_h" value="2"/>
-			<param name="target_d" value="0"/>
-			<param name="flip_y" value="1"/>
-		</node>
-		<!-- setup the operations of the graph -->
-		<node name="position_to_norm" type="Multiply[VistaTransformMatrix,VistaVector3D]"/>
-
-		<!--=========================================================================-->
-		<!-- ConstantValue nodes                                                     -->
-		<!--=========================================================================-->
-		<node name="value-0" type="ConstantValue[float]">
-			<param name="value" value="0.0"/>
-		</node>
-		<node name="true" type="ConstantValue[bool]">
-			<param name="value" value="true"/>
-		</node>
-		<node name="rotation_center" type="ConstantValue[VistaVector3D]">
-			<param name="value" value="0,0,0,1"/>
-		</node>
-
-		<!--=========================================================================-->
-		<!-- rotation nodes                                                          -->
-		<!--=========================================================================-->
-
-		<!-- this node holds the value when the button was first pressed at its
-		 outport, thus enabling to calculate the coordinate difference from the
-		 moment the button was first pressed to the "current" position afterwards.
-		-->
-		<node name="rot_condition" type="ConditionalRoute"/>
-
-		<!-- this node does the actual substraction of the "grab point" and the current
-		 position.
-		-->
-		<node name="rot_diff_coords" type="Substract[VistaVector3D]"/>
-
-		<!-- multiplication with the time-delta for frame-rate independent movement.
-		-->
-		<node name="rot_diff_scaled" type="Multiply[double,VistaVector3D]"/>
-
-		<!-- inverts the value of the button press, since we want the conditionalroute
-		 to route (_not_ keep the old value) when the button is _not_ pressed, i.e.
-		 to keep the old value as long as the button is pressed.
-		-->
-		<node name="rot_button_invert" type="Invert[bool]"/>
-
-		<!-- the latestupdate node functions realizes a default value for the trigger inport
-		 of the conditionalroute node. since the default value we get from the
-		 historyproject (as long as there are no measures) is false, but we want an
-		 initial true, we connect a constantvalue true (which fires once on initialization)
-		 and the button outport, which overrides the default as soon as there are
-		 driver measures. 
-		-->
-		<node name="rot_condition_la" type="LatestUpdate[bool]"/>
-
-		<!-- calculates the actual (incremental) transformation from the normalized, 
-		 time-scaled input coordinates, the initial "grab point" and the center
-		 of rotation.
-		-->
-		<node name="trackball_trans" type="Trackball" />
-
-		<!-- the result is a transform that has to be applied to an object, in this
-		 case, the camera.
-		-->
-		<node name="apply_rotation" type="ApplyTransform">
-			<param name="object" value="CAM:MAIN"/>
-			<param name="local"  value="true"/>
-		</node>
-
-		<!--=========================================================================-->
-		<!-- Pan nodes                                                               -->
-		<!--=========================================================================-->
-
-		<!-- the nodes' function is analog to the rotation case, see above -->
-
-		<node name="pan_condition" type="ConditionalRoute"/>
-
-		<node name="pan_diff_coords" type="Substract[VistaVector3D]"/>
-		<node name="pan_diff_scaled" type="Multiply[double,VistaVector3D]"/>
-
-		<node name="pan_button_invert" type="Invert[bool]"/>
-		<node name="pan_condition_la" type="LatestUpdate[bool]"/>
-
-		<!-- instead of using the trackball node, here we just compose a matrix from
-		 our screen coordinate offet, which is then applied to the camera as a
-		 local transformation to realize panning parallel to the screen surface.
-		 -->
-		<node name="pan_matrix" type="MatrixCompose"/>
-
-		<node name="apply_panning" type="ApplyTransform">
-			<param name="object" value="CAM:MAIN"/>
-			<param name="local"  value="true"/>
-		</node>
-
-		<!--=========================================================================-->
-		<!-- Zoom nodes                                                              -->
-		<!--=========================================================================-->
-
-		<!-- the nodes' function is analog to the panning case, see above -->
-
-		<node name="zoom_condition" type="ConditionalRoute"/>
-
-		<node name="zoom_diff_coords" type="Substract[VistaVector3D]"/>
-		<node name="zoom_diff_scaled" type="Multiply[double,VistaVector3D]"/>
-
-		<node name="zoom_button_invert" type="Invert[bool]"/>
-		<node name="zoom_condition_la" type="LatestUpdate[bool]"/>
-
-		<!-- for zooming, we additionally multiply the following matrix to map the
-		 y coordinate to -z for panning (actually it's not a zoom) in the viewer
-		 direction, i.e. orthogonal to the screen surface.
-		 -->
-		<node name="zoom_y_to_z" type="Multiply[VistaTransformMatrix,VistaVector3D]"/>
-		<node name="zoom_y_to_z_matrix" type="ConstantValue[VistaTransformMatrix]">
-			<param name="value" value="0, 0,0,0,
-								 0, 0,0,0,
-								 0,-1,0,0,
-								 0, 0,0,1"/>
-		</node>
-
-
-		<node name="zoom_matrix" type="MatrixCompose"/>
-
-		<node name="apply_zoom" type="ApplyTransform">
-			<param name="object" value="CAM:MAIN"/>
-			<param name="local"  value="true"/>
-		</node>
-
-		<!--=========================================================================-->
-		<!-- DEBUG                                                                   -->
-		<!--=========================================================================-->
-		<!--
-		 <node name="debug" type="DeviceDebug"/>
-		 <node name="debugv3d" type="TextOverlay[VistaVector3D]"/>
-		 <node name="debugButton" type="TextOverlay[bool]"/>
-		 -->
-
-		<!--
-		 <node name="debugv3d" type="TextOverlay[VistaVector3D]">
-		 <param name="red" value="255" />
-		 <param name="size" value="40" />
-		 </node>
-		 -->
-	</graph>
-	<edges>
-
-		<!--=========================================================================-->
-		<!-- hardware stuff                                                          -->
-		<!--=========================================================================-->
-		<edge fromnode="mouse" tonode="project_mouse" fromport="history" toport="history"/>
-		<edge fromnode="project_mode" tonode="project_mouse" fromport="value" toport="sampling_mode"/>
-
-		<!--=========================================================================-->
-		<!-- normalize mouse position                                                -->
-		<!--=========================================================================-->
-		<edge fromnode="normwindow" tonode="conv_w" fromport="win_w" toport="in"/>
-		<edge fromnode="normwindow" tonode="conv_h" fromport="win_h" toport="in"/>
-		<edge fromnode="conv_w" tonode="normalize" fromport="out" toport="source_w"/>
-		<edge fromnode="conv_h" tonode="normalize" fromport="out" toport="source_h"/>
-		<edge fromnode="value-0" tonode="normalize" fromport="value" toport="source_d"/>
-		<edge fromnode="normalize"     tonode="position_to_norm" fromport="transform" toport="first"/>
-		<edge fromnode="project_mouse" tonode="position_to_norm" fromport="POSITION"  toport="second"/>
-
-		<!--=========================================================================-->
-		<!-- rotation                                                                -->
-		<!--=========================================================================-->
-		<edge fromnode="project_mouse" tonode="rot_button_invert" fromport="LEFT_BUTTON" toport="in"/>
-
-		<edge fromnode="true"              tonode="rot_condition_la" fromport="value" toport="in_0"/>
-		<edge fromnode="rot_button_invert" tonode="rot_condition_la" fromport="out" toport="in_1"/>
-
-		<edge fromnode="rot_condition_la" tonode="rot_condition" fromport="out" toport="trigger"/>
-		<edge fromnode="position_to_norm" tonode="rot_condition" fromport="out" toport="coords"/>
-
-		<edge fromnode="position_to_norm" tonode="rot_diff_coords" fromport="out" toport="first"/>
-		<edge fromnode="rot_condition"    tonode="rot_diff_coords" fromport="coords" toport="second"/>
-
-		<edge fromnode="rot_diff_coords" tonode="rot_diff_scaled" fromport="out" toport="second"/>
-		<edge fromnode="timer"           tonode="rot_diff_scaled" fromport="dt"  toport="first"/>
-
-		<edge fromnode="rotation_center" tonode="trackball_trans" fromport="value" toport="center"/>
-		<edge fromnode="rot_condition"   tonode="trackball_trans" fromport="coords" toport="grab"/>
-		<edge fromnode="rot_diff_scaled" tonode="trackball_trans" fromport="out" toport="offset"/>
-
-		<edge fromnode="trackball_trans" tonode="apply_rotation" fromport="transform" toport="in"/>
-
-		<!--=========================================================================-->
-		<!-- panning                                                                 -->
-		<!--=========================================================================-->
-		<edge fromnode="project_mouse" tonode="pan_button_invert" fromport="RIGHT_BUTTON" toport="in"/>
-
-		<edge fromnode="true"              tonode="pan_condition_la" fromport="value" toport="in_0"/>
-		<edge fromnode="pan_button_invert" tonode="pan_condition_la" fromport="out" toport="in_1"/>
-
-		<edge fromnode="pan_condition_la" tonode="pan_condition" fromport="out" toport="trigger"/>
-		<edge fromnode="position_to_norm" tonode="pan_condition" fromport="out" toport="coords"/>
-
-		<edge fromnode="position_to_norm" tonode="pan_diff_coords" fromport="out" toport="first"/>
-		<edge fromnode="pan_condition"    tonode="pan_diff_coords" fromport="coords" toport="second"/>
-
-		<edge fromnode="pan_diff_coords" tonode="pan_diff_scaled" fromport="out" toport="second"/>
-		<edge fromnode="timer"           tonode="pan_diff_scaled" fromport="dt"  toport="first"/>
-
-		<edge fromnode="pan_diff_scaled" tonode="pan_matrix" fromport="out" toport="translation"/>
-
-		<edge fromnode="pan_matrix" tonode="apply_panning" fromport="out" toport="in"/>
-
-		<!--=========================================================================-->
-		<!-- zooming                                                                 -->
-		<!--=========================================================================-->
-		<edge fromnode="project_mouse" tonode="zoom_button_invert" fromport="MIDDLE_BUTTON" toport="in"/>
-
-		<edge fromnode="true"               tonode="zoom_condition_la" fromport="value" toport="in_0"/>
-		<edge fromnode="zoom_button_invert" tonode="zoom_condition_la" fromport="out" toport="in_1"/>
-
-		<edge fromnode="zoom_condition_la" tonode="zoom_condition" fromport="out" toport="trigger"/>
-		<edge fromnode="position_to_norm"  tonode="zoom_condition" fromport="out" toport="coords"/>
-
-		<edge fromnode="position_to_norm" tonode="zoom_diff_coords" fromport="out" toport="first"/>
-		<edge fromnode="zoom_condition"   tonode="zoom_diff_coords" fromport="coords" toport="second"/>
-
-		<edge fromnode="zoom_diff_coords" tonode="zoom_diff_scaled" fromport="out" toport="second"/>
-		<edge fromnode="timer"            tonode="zoom_diff_scaled" fromport="dt"  toport="first"/>
-
-		<edge fromnode="zoom_diff_scaled"   tonode="zoom_y_to_z" fromport="out" toport="second"/>
-		<edge fromnode="zoom_y_to_z_matrix" tonode="zoom_y_to_z" fromport="value" toport="first"/>
-
-		<edge fromnode="zoom_y_to_z" tonode="zoom_matrix" fromport="out" toport="translation"/>
-
-		<edge fromnode="zoom_matrix" tonode="apply_zoom" fromport="out" toport="in"/>
-
-		<!--=========================================================================-->
-		<!-- DEBUG                                                                   -->
-		<!--=========================================================================-->
-
-		<!--   <edge fromnode="mouse" tonode="debug" fromport="history" toport="history"/>-->
-		<!--   <edge fromnode="camera_source" tonode="debugv3d" fromport="position" toport="value"/>-->
-		<!--   <edge fromnode="zoom_condition_la" tonode="debugButton" fromport="out" toport="value"/>-->
-
-	</edges>
-</module>
diff --git a/contrib/StereoTester/configfiles/xml/spacenavigator_navigation.xml b/contrib/StereoTester/configfiles/xml/spacenavigator_navigation.xml
deleted file mode 100644
index 50720d1b6bf6b42da6427bdb6a41adb52330e684..0000000000000000000000000000000000000000
--- a/contrib/StereoTester/configfiles/xml/spacenavigator_navigation.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
-<module>
-	<nodespace></nodespace>
-	<graph>
-		<node name="spacenavigator" type="DriverSensor">
-			<param name="sensor" value="0" />
-			<param name="driver" value="SPACENAVIGATOR" />
-		</node>
-		<node name="project_spacenav" type="HistoryProject">
-			<param name="project">POSITION, ORIENTATION, BUTTON_1, BUTTON_2</param>
-		</node>
-		<node name="sampling_mode" type="ConstantValue[int]">
-			<param name="mode" value="0" />
-		</node>
-		<node name="navigation_mode" type="ConstantValue[int]">
-			<param name="mode" value="1" />
-		</node>
-		<node name="null_vector" type="ConstantValue[VistaVector3D]">
-			<param name="value">
-				0, 0, 0, 0
-			</param>
-		</node>
-		<node name="scale_measure" type="Multiply[float,VistaVector3D]" />
-		
-		<!--
-			Beware of very small values here cause there might some
-			strange behavior when panning left/right in far distance
-		-->
-		<node name="scale_factor" type="ConstantValue[float]">
-			<param name="value" value="0.005" />
-		</node>
-		<node name="camera_transform" type="GetTransform">
-			<param name="object" value="CAM:MAIN" />
-		</node>
-		<node name="set_transform" type="SetTransform">
-			<param name="object" value="CAM:MAIN" />
-		</node>
-		<node name="timer" type="Timer">
-			<param name="reset_on_activate" value="true" />
-		</node>
-		<node name="navigation" type="Navigation" />
-
-		<!-- Button Handling -->
-		<node name="change_left" type="ChangeDetect[bool]"/>
-		<node name="change_right" type="ChangeDetect[bool]"/>
-
-		<node name="spatialhandler" type="Action">
-			<param name="object" value="spatial_handler"/>
-		</node>
-
-	</graph>
-	<edges>
-		<edge fromnode="spacenavigator" tonode="project_spacenav" fromport="history" toport="history" />
-		<edge fromnode="sampling_mode" tonode="project_spacenav" fromport="value" toport="sampling_mode" />
-		<edge fromnode="project_spacenav" tonode="scale_measure" fromport="POSITION" toport="second" />
-		<edge fromnode="scale_factor" tonode="scale_measure" fromport="value" toport="first" />
-		<edge fromnode="scale_measure" tonode="navigation" fromport="out" toport="translation" />
-		<edge fromnode="project_spacenav" tonode="navigation" fromport="ORIENTATION" toport="rotation" />
-		<edge fromnode="navigation_mode" tonode="navigation" fromport="value" toport="navigation_mode" />
-		<edge fromnode="camera_transform" tonode="navigation" fromport="transform" toport="transform" />
-		<edge fromnode="timer" tonode="navigation" fromport="dt" toport="dt" />
-		<edge fromnode="navigation" tonode="set_transform" fromport="transform" toport="in" />
-
-		<edge fromnode="project_spacenav" tonode="change_left" fromport="BUTTON_1" toport="in"/>
-		<edge fromnode="project_spacenav" tonode="change_right" fromport="BUTTON_2" toport="in"/>
-
-		<edge fromnode="change_left" tonode="spatialhandler" fromport="out" toport="command0"/>
-		<edge fromnode="change_right" tonode="spatialhandler" fromport="out" toport="command1"/>
-	</edges>
-</module>
diff --git a/contrib/StereoTester/configfiles/xml/ucp_picasso.xml b/contrib/StereoTester/configfiles/xml/ucp_picasso.xml
deleted file mode 100644
index d8747fd2f1a7b037998ab2e21f322bcf9b27440e..0000000000000000000000000000000000000000
--- a/contrib/StereoTester/configfiles/xml/ucp_picasso.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
-<module>
-	<nodespace>
-	</nodespace>
-	<graph>
-		<node name="head_source" type="DriverSensor">
-			<param name="sensor" value="0"/>
-			<param name="type" value="BODY"/>
-			<param name="driver" value="DTRACK"/>
-		</node>
-		<node name="head" type="HistoryProject">
-			<param name="project">POSITION, ORIENTATION</param>
-		</node>
-				<!-- this will give the sampling mode to the history project
-						 node, a value of "0" means "LAZY" while a value of "1"
-						 means "HOT". There is no other sampling value currently -->
-		<node name="project_mode" type="ConstantValue[int]">
-			<param name="mode" value="0"/>
-		</node>
-
-		<node name="scale_pos" type="Multiply[float,VistaVector3D]" />
-		<node name="translate_pos_tracker" type="Add[VistaVector3D]" />
-		
-		<node name="tracker_offset" type="ConstantValue[VistaVector3D]">
-				<param name="value" value="0,-1095,1093" />
-		</node>
-
-		<node name="scale_factor" type="ConstantValue[float]">
-				<param name="value" value="0.001" />
-		</node>
-
-		<!-- SINK NODES -->
-	<node name="ucp" type="ViewerSink">
-		<param name="displaysystem" value="MAIN"/>
-	</node>
-
-	<node name="vpos" type="TextOverlay[VistaVector3D]">
-		<param name="prefix" value="3p: "/>
-		<param name="x_pos" value="0.1"/>
-		<param name="y_pos" value="0.30"/>
-		<param name="font" value="TYPEWRITER"/>
-		<param name="red" value="255"/>
-		<param name="size" value="50"/>
-	</node>
-	
-	<node name="vori" type="TextOverlay[VistaQuaternion]">
-		<param name="prefix" value="3q: "/>
-		<param name="x_pos" value="0.1"/>
-		<param name="y_pos" value="0.40"/>
-		<param name="font" value="TYPEWRITER"/>
-		<param name="red" value="255"/>
-		<param name="size" value="50"/>
-	</node>
-	
-	</graph>
-
-	<edges>
-				<!-- history projection -->
-		<edge fromnode="project_mode" tonode="head" fromport="value" toport="sampling_mode"/>
-		<edge fromnode="head_source" tonode="head" fromport="history" toport="history"/>
-
-				<!-- position transformation -->
-				<edge fromnode="head"           tonode="translate_pos_tracker" fromport="POSITION" toport="first" />
-		<edge fromnode="tracker_offset" tonode="translate_pos_tracker" fromport="value"    toport="second" />
-
-		<edge fromnode="scale_factor"          tonode="scale_pos" fromport="value"  toport="first" />
-		<edge fromnode="translate_pos_tracker" tonode="scale_pos" fromport="out"    toport="second" />
-
-		<!-- connect to the viewer sink -->
-				<edge fromnode="scale_pos" tonode="ucp" fromport="out"         toport="position"/>        
-				<edge fromnode="head"      tonode="ucp" fromport="ORIENTATION" toport="orientation"/>
-	</edges>
-
-</module>
\ No newline at end of file
diff --git a/contrib/StereoTester/main.cpp b/contrib/StereoTester/main.cpp
deleted file mode 100644
index 19a12a7da572c48bb700205fafd03d6ab661dc20..0000000000000000000000000000000000000000
--- a/contrib/StereoTester/main.cpp
+++ /dev/null
@@ -1,219 +0,0 @@
-/*============================================================================*/
-/*                              ViSTA VR toolkit                              */
-/*               Copyright (c) 1997-2010 RWTH Aachen University               */
-/*============================================================================*/
-/*                                  License                                   */
-/*                                                                            */
-/*  This program is free software: you can redistribute it and/or modify      */
-/*  it under the terms of the GNU Lesser General Public License as published  */
-/*  by the Free Software Foundation, either version 3 of the License, or      */
-/*  (at your option) any later version.                                       */
-/*                                                                            */
-/*  This program is distributed in the hope that it will be useful,           */
-/*  but WITHOUT ANY WARRANTY; without even the implied warranty of            */
-/*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             */
-/*  GNU Lesser General Public License for more details.                       */
-/*                                                                            */
-/*  You should have received a copy of the GNU Lesser General Public License  */
-/*  along with this program.  If not, see <http://www.gnu.org/licenses/>.     */
-/*============================================================================*/
-/*                                Contributors                                */
-/*                                                                            */
-/*============================================================================*/
-/*
- * $Id$
- */
-
-// include header here
-
-#include <VistaKernel/VistaSystem.h>
-#include <VistaKernel/InteractionManager/VistaKeyboardSystemControl.h>
-
-
-#include <VistaKernel/DisplayManager/VistaDisplayManager.h>
-#include <VistaKernel/DisplayManager/VistaDisplaySystem.h>
-#include <VistaKernel/DisplayManager/VistaVirtualPlatform.h>
-#include <VistaKernel/DisplayManager/VistaWindow.h>
-#include <VistaKernel/DisplayManager/Vista2DDrawingObjects.h>
-
-#include <VistaKernel/GraphicsManager/VistaGeometryFactory.h>
-
-
-#include <VistaKernel/GraphicsManager/VistaGraphicsManager.h>
-#include <VistaKernel/GraphicsManager/VistaSG.h>
-#include <VistaKernel/GraphicsManager/VistaTransformNode.h>
-#include <VistaKernel/GraphicsManager/VistaTextNode.h>
-
-#include <VistaBase/VistaVectorMath.h>
-
-#include <VistaAspects/VistaExplicitCallbackInterface.h>
-
-/*============================================================================*/
-/* MACROS AND DEFINES, CONSTANTS AND STATICS, FUNCTION-PROTOTYPES             */
-/*============================================================================*/
-
-/*============================================================================*/
-/* CONSTRUCTORS / DESTRUCTOR                                                  */
-/*============================================================================*/
-
-class Translate : public IVistaExplicitCallbackInterface
-{
-public:
-	Translate( VistaVirtualPlatform *pPlatform,
-				const VistaVector3D &v3Trans )
-				: m_pPlatform(pPlatform),
-				  m_v3Trans(v3Trans)
-	{
-	}
-
-	bool Do()
-	{
-		// move the camera, but keep the movement in 
-		// the view alignments, so get the current rotation
-		// of the vp
-		VistaQuaternion q = m_pPlatform->GetRotation();
-
-		// rotate the given world vector along the view direction
-		VistaVector3D v3Trans = q.Rotate( m_v3Trans );
-
-		// translate to that direction
-		return m_pPlatform->SetTranslation( m_pPlatform->GetTranslation() + v3Trans );
-	}
-
-private:
-	VistaVirtualPlatform *m_pPlatform;
-	VistaVector3D         m_v3Trans;
-};
-
-class Rotate : public IVistaExplicitCallbackInterface
-{
-public:
-	Rotate( VistaVirtualPlatform *pPlatform,
-			 float nDeg )
-			 : m_pPlatform(pPlatform),
-			   m_nRot(nDeg)
-	{
-	}
-
-	bool Do()
-	{
-		// rotation is simple: apply an incremental roation 
-		// the AxisAndAngle constructs a quat that defines a rotation
-		// around the global given axis, keep in mind that the rotation
-		// is given in radians.
-		VistaAxisAndAngle aaa( VistaVector3D(0,1,0), Vista::DegToRad(m_nRot) );
-		VistaQuaternion q(aaa);
-
-		// due to numerical reasons, a quat might degenerate during the
-		// manipulation, so it might be a good idea to normalize it once and then
-		// here, we do it on every call, but that might be too much
-		VistaQuaternion qRot = m_pPlatform->GetRotation();
-		qRot.Normalize();
-
-		// set the rotation as an incremental rotation
-		return m_pPlatform->SetRotation( qRot * q );
-
-		// the rotation is around the center of the virtual platform.
-		// iff you decide to have the viewpoint not in 0,0,0, this might
-		// look akward. In that case, you have to apply a transform
-		// that includes a normalization around the view point position.
-		// for this demo, we chose the viewpoint to be 0,0,0 and the projection
-		// plane midpoint in 0,0,-2. So the rotation look ''natural'' around the
-		// view point (as it is in 0,0,0).
-	}
-
-private:
-	VistaVirtualPlatform *m_pPlatform;
-	float m_nRot;
-};
-/*============================================================================*/
-/* IMPLEMENTATION                                                             */
-/*============================================================================*/
-
-int main(int argc, char **argv)
-{
-	VistaSystem vistaSystem;
-
-	if(vistaSystem.Init(argc, argv))
-	{
-		VistaGraphicsManager *pMgr = vistaSystem.GetGraphicsManager();
-		VistaSG *pSG = pMgr->GetSceneGraph();
-
-        
-        VistaGeometryFactory geometryFactory( pSG );
-        
-		VistaQuaternion q;
-		VistaVector3D v3TransOld;
-		VistaVector3D v3TransNew;
-		
-        /*
-         * Create a large box that goes from just behind the screen
-         * way behind the screen. If the stereo projection is flipped,
-         * the box will come out of the screen.
-         */
-        VistaGeometry *pBoxBack = geometryFactory.CreateBox ( 0.2f, 100.0f, 0.2f );
-        pBoxBack->SetColor( VistaColorRGB( VistaColorRGB::GREEN ) );
-        VistaTransformNode *pBoxBackTrans = pSG->NewTransformNode( pSG->GetRoot() );
-		pBoxBackTrans->GetRotation(q);
-		v3TransNew = q.Rotate( VistaVector3D(-0.0f, 50.0f, -0.2f) );
-		pBoxBackTrans->GetTranslation(v3TransOld);
-		pBoxBackTrans->SetTranslation(  v3TransOld + v3TransNew );
-		pSG->NewGeomNode( pBoxBackTrans, pBoxBack );
-        
-        // Create the info text
-		Vista2DText *pText2D = vistaSystem.GetDisplayManager()->Add2DText( "MAIN_VIEWPORT" );
-        if( pText2D )
-            pText2D->Init( "If you see a triangle coming out of the screen, your stereo projection is flipped!", 0, 0 );
-        
-		// now determine the reference frame from a given display system
-		// we query that from the display manager here
-		VistaDisplayManager *pDispMgr = vistaSystem.GetDisplayManager();
-
-		// for this demo, we simply take the first display system (index = 0)
-		VistaDisplaySystem *pDispSys  = pDispMgr->GetDisplaySystem(0);
-
-		// each display system has a reference frame, which represents a virtual
-		// camera, so we claim that.
-		VistaVirtualPlatform *pVp     = pDispSys->GetReferenceFrame();
-
-
-        // TODO Move camera to zero
-        
-        
-        
-        
-        
-        
-		// register some callbacks for some keyboard strokes.
-		// these have to be registered with the keyboard system control
-		VistaKeyboardSystemControl *pCtrl = vistaSystem.GetKeyboardSystemControl();
-
-		// self descriptive.
-		pCtrl->BindAction( 'a', new Translate( pVp, VistaVector3D(-0.25f, 0,  0 ) ),
-												   "translate to -x");
-		pCtrl->BindAction( 'd', new Translate( pVp, VistaVector3D( 0.25f, 0,  0 ) ),
-												   "translate to  x");
-		pCtrl->BindAction( 'w', new Translate( pVp, VistaVector3D(     0, 0, -0.25f ) ),
-												   "translate to -z");
-		pCtrl->BindAction( 's', new Translate( pVp, VistaVector3D(     0, 0,  0.25f ) ),
-												   "translate to  z");
-		
-		pCtrl->BindAction( VISTA_KEY_UPARROW, new Translate( pVp, VistaVector3D( 0, 0.25f, 0 ) ),
-													  "translate to y");
-		pCtrl->BindAction( VISTA_KEY_DOWNARROW, new Translate( pVp, VistaVector3D( 0, -0.25f, 0 ) ),
-													   "translate to -y");
-
-		pCtrl->BindAction( VISTA_KEY_RIGHTARROW, new Rotate( pVp, -0.5f ),
-													   "rotate -0.5 deg about the y-axis");
-		pCtrl->BindAction( VISTA_KEY_LEFTARROW,  new Rotate( pVp,   0.5f ),
-													   "rotate 0.5 deg about the y-axis");
-
-		vistaSystem.GetDisplayManager()->GetWindowByName("MAIN_WINDOW")->GetWindowProperties()->SetTitle(argv[0]);
-
-		// start the simulation.
-		vistaSystem.Run();
-	}
-
-
-}
-
diff --git a/contrib/configfiles/aices_powerwall/display_powerwall.ini b/contrib/configfiles/aices_powerwall/display_powerwall.ini
index e8dce639a18dde98ed76abe01598cd6389dcc3c4..414284ba670000143a3f6839fd1f73f896b75566 100644
--- a/contrib/configfiles/aices_powerwall/display_powerwall.ini
+++ b/contrib/configfiles/aices_powerwall/display_powerwall.ini
@@ -1,4 +1,4 @@
-# $Id$
+
 # display system initialization file for the Powerwall@AICES
 
 ########################################
diff --git a/contrib/configfiles/common/interactionxmls/spacenavigator_navigation.xml b/contrib/configfiles/common/interactionxmls/spacenavigator_navigation.xml
index 14d1d8f22a7c93b7b4bbdf926ada5999d065e7de..2d97acbc78b720c539aeed57c0fb3a47a51f7c50 100644
--- a/contrib/configfiles/common/interactionxmls/spacenavigator_navigation.xml
+++ b/contrib/configfiles/common/interactionxmls/spacenavigator_navigation.xml
@@ -1,4 +1,4 @@
-<!-- $Id: navigator_spacenavigator.xml 31467 2012-08-07 09:38:46Z dr165799 $ -->
+
 <module>
 	<nodespace>
 	</nodespace>
diff --git a/contrib/configfiles/common/interactionxmls/ucp_fixed.xml b/contrib/configfiles/common/interactionxmls/ucp_fixed.xml
index 72f7fa49754e84fc66369028b79b83e1113fe827..143fdc62aebb770017fce7884673baad7e1eac46 100644
--- a/contrib/configfiles/common/interactionxmls/ucp_fixed.xml
+++ b/contrib/configfiles/common/interactionxmls/ucp_fixed.xml
@@ -1,4 +1,4 @@
-<!-- $Id: ucp_cave.xml 22882 2011-08-08 15:54:40Z dr165799 $ -->
+
 <!--
 	User centered projection with fixed position, e.g. to make photos
 -->
diff --git a/contrib/configfiles/common/interactionxmls/ucp_keyboardnav.xml b/contrib/configfiles/common/interactionxmls/ucp_keyboardnav.xml
index 000984187a71e370f07a6a3ea47bc886ee93f35a..af17aa161f900e4e0208f4c799b49cacd1fab423 100644
--- a/contrib/configfiles/common/interactionxmls/ucp_keyboardnav.xml
+++ b/contrib/configfiles/common/interactionxmls/ucp_keyboardnav.xml
@@ -1,4 +1,4 @@
-<!-- $Id: ucp_cave.xml 22882 2011-08-08 15:54:40Z dr165799 $ -->
+
 <!--
 	User centered projection with viewer position that can be changed via keyboard callbacks
 	Per default, one can change the viewer position with the arrow keys (x-z-plane) and
diff --git a/contrib/configfiles/jsc_rotunde/interaction_rotunde.ini b/contrib/configfiles/jsc_rotunde/interaction_rotunde.ini
index fb5b36ec50fc817a061bf252404bbebff3e2991f..fc2dff3a2e8b710ba785d7dc1f9c518206e5c906 100644
--- a/contrib/configfiles/jsc_rotunde/interaction_rotunde.ini
+++ b/contrib/configfiles/jsc_rotunde/interaction_rotunde.ini
@@ -1,4 +1,4 @@
-# $Id$
+
 ###############################################################################
 #      V I S T A     I N T E R A C T I O N     C O N F I G U R A T I O N      #
 ###############################################################################
diff --git a/contrib/configfiles/newcave/interaction xmls/doorstate_newcave.xml b/contrib/configfiles/newcave/interaction xmls/doorstate_newcave.xml
index dc0e107840a0d2828aadf845f4c698680f20250f..158745e0704c1db636a0cecc8459f005d7431586 100644
--- a/contrib/configfiles/newcave/interaction xmls/doorstate_newcave.xml	
+++ b/contrib/configfiles/newcave/interaction xmls/doorstate_newcave.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
+
 <module>
 	<nodespace>
 	</nodespace>
diff --git a/contrib/configfiles/newcave/interaction xmls/generic_flystick_data_newcave.xml b/contrib/configfiles/newcave/interaction xmls/generic_flystick_data_newcave.xml
index 5a5a9616525d3a88542b663da46136cc12095faf..aa0043c4921e9272de786017cca175653c36e3c5 100644
--- a/contrib/configfiles/newcave/interaction xmls/generic_flystick_data_newcave.xml	
+++ b/contrib/configfiles/newcave/interaction xmls/generic_flystick_data_newcave.xml	
@@ -1,4 +1,4 @@
-<!-- $Id$ -->
+
 <!--
 	Generic base for receiving data from flystick2. Not working in itself - choose what you need,
 	and pipe data whereever you need it.
diff --git a/contrib/configfiles/newcave/interaction xmls/navigation_flystick2_aroundorigin.xml b/contrib/configfiles/newcave/interaction xmls/navigation_flystick2_aroundorigin.xml
index 43c842b12e0fcfb6e0599f182b329370009c383e..229f9b308d46297a93121a29269ad8bec397f53e 100644
--- a/contrib/configfiles/newcave/interaction xmls/navigation_flystick2_aroundorigin.xml	
+++ b/contrib/configfiles/newcave/interaction xmls/navigation_flystick2_aroundorigin.xml	
@@ -1,4 +1,4 @@
-<!-- $Id$ -->
+
 <!--
   -- Configuration for a flystick navigation controlled by pointing firection and the coolie hat.
   -- This variant uses the room coordinate system (i.e. the cave floor center) as pivot for rotations,
diff --git a/contrib/configfiles/newcave/interaction xmls/navigation_flystick2_aroundstick.xml b/contrib/configfiles/newcave/interaction xmls/navigation_flystick2_aroundstick.xml
index 6c6df1e3022e2997dfe2c0dae2112153ff18ba8e..bb73ed5424f7ba4ecf91053721890df33191c004 100644
--- a/contrib/configfiles/newcave/interaction xmls/navigation_flystick2_aroundstick.xml	
+++ b/contrib/configfiles/newcave/interaction xmls/navigation_flystick2_aroundstick.xml	
@@ -1,4 +1,4 @@
-<!-- $Id$ -->
+
 <!--
   -- Configuration for a flystick navigation controlled by pointing firection and the coolie hat.
   -- This variant uses the current position of the flystick as pivot for rotations,
diff --git a/contrib/configfiles/newcave/interaction xmls/navigation_flystick2_aroundstick_proxywarning.xml b/contrib/configfiles/newcave/interaction xmls/navigation_flystick2_aroundstick_proxywarning.xml
index 4a52eed5582bee4fcc5084f9aaf43e95f521cade..8bede1b64d6ac544db953d0cd2c07eeae4cb0cdc 100644
--- a/contrib/configfiles/newcave/interaction xmls/navigation_flystick2_aroundstick_proxywarning.xml	
+++ b/contrib/configfiles/newcave/interaction xmls/navigation_flystick2_aroundstick_proxywarning.xml	
@@ -1,4 +1,4 @@
-<!-- $Id$ -->
+
 <!--
 	configuration for a flystick navigation controlled by pointing position and the coolie hat
 	this variant uses the flystick's current position as pivot for the rotation
diff --git a/contrib/configfiles/newcave/interaction xmls/navigation_flystick2_arounduser.xml b/contrib/configfiles/newcave/interaction xmls/navigation_flystick2_arounduser.xml
index b699e0fabe2727e183494de17fad7ff459837971..1ec8eaeaed85a4c67804496ea143c3452fbbce60 100644
--- a/contrib/configfiles/newcave/interaction xmls/navigation_flystick2_arounduser.xml	
+++ b/contrib/configfiles/newcave/interaction xmls/navigation_flystick2_arounduser.xml	
@@ -1,4 +1,4 @@
-<!-- $Id$ -->
+
 <!--
   -- Configuration for a flystick navigation controlled by pointing firection and the coolie hat.
   -- This variant uses the room coordinate system (i.e. the cave floor center) as pivot for rotations,
diff --git a/contrib/configfiles/newcave/interaction xmls/navigation_flystick2_transonly.xml b/contrib/configfiles/newcave/interaction xmls/navigation_flystick2_transonly.xml
index fee9c4e1dd7f5ff4d68ddde8329e5429255fa890..b5f707cf6b62e91b0f5cfafa242c0da6b0d60c3e 100644
--- a/contrib/configfiles/newcave/interaction xmls/navigation_flystick2_transonly.xml	
+++ b/contrib/configfiles/newcave/interaction xmls/navigation_flystick2_transonly.xml	
@@ -1,4 +1,4 @@
-<!-- $Id$ -->
+
 <!--
   -- Configuration for a flystick navigation controlled by pointing direction and the coolie hat.
   -- This variant uses has only translation in the x-z-plane.
diff --git a/contrib/configfiles/newcave/interaction xmls/proximitywarningtoggle.xml b/contrib/configfiles/newcave/interaction xmls/proximitywarningtoggle.xml
index 13e620b419fb4d2fbdbcceb2cbd2899a1b02f38a..35c59fc995b7675690c0548e3663b81ea80423be 100644
--- a/contrib/configfiles/newcave/interaction xmls/proximitywarningtoggle.xml	
+++ b/contrib/configfiles/newcave/interaction xmls/proximitywarningtoggle.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
+
 <module>
 	<nodespace>
 	</nodespace>
diff --git a/contrib/configfiles/newcave/interaction xmls/ucp_newcave.xml b/contrib/configfiles/newcave/interaction xmls/ucp_newcave.xml
index 43bbefac67c65fbeca63c3bac488380d845cf60e..148607ca8a7b87a668420333849824c71cd31a6a 100644
--- a/contrib/configfiles/newcave/interaction xmls/ucp_newcave.xml	
+++ b/contrib/configfiles/newcave/interaction xmls/ucp_newcave.xml	
@@ -1,4 +1,4 @@
-<!-- $Id$ -->
+
 <!--
 	User centered projection for the new cave
 	fills the ViewerSink, and a proximity warning
diff --git a/contrib/configfiles/panasonicTH60/interaction xmls/generic_flystick_panasonic.xml b/contrib/configfiles/panasonicTH60/interaction xmls/generic_flystick_panasonic.xml
index a8a1e656dd68b100c09494d64c871bf2d60b1cde..4654e013b7036815db728e869d8e1311ce955833 100644
--- a/contrib/configfiles/panasonicTH60/interaction xmls/generic_flystick_panasonic.xml	
+++ b/contrib/configfiles/panasonicTH60/interaction xmls/generic_flystick_panasonic.xml	
@@ -1,4 +1,4 @@
-<!-- $Id: generic_flystick_data_newcave.xml 31721 2012-08-23 14:57:23Z dr165799 $ -->
+
 <!--
 	Generic base for receiving data from flystick2. Not working in itself - choose what you need,
 	and pipe data whereever you need it.
diff --git a/contrib/configfiles/panasonicTH60/interaction xmls/ucp_panasonic.xml b/contrib/configfiles/panasonicTH60/interaction xmls/ucp_panasonic.xml
index f8835873b5cca2722311c627c3ae3f2b888a716b..6e73e918c5be8eec2a4997f373da27c722e38394 100644
--- a/contrib/configfiles/panasonicTH60/interaction xmls/ucp_panasonic.xml	
+++ b/contrib/configfiles/panasonicTH60/interaction xmls/ucp_panasonic.xml	
@@ -1,4 +1,4 @@
-<!-- $Id: ucp_newcave.xml 31721 2012-08-23 14:57:23Z dr165799 $ -->
+
 <!--
 	User centered projection for the Panasonic TH60
 -->
diff --git a/contrib/configfiles/tdw/configfiles/interaction/ucp_tdw.xml b/contrib/configfiles/tdw/configfiles/interaction/ucp_tdw.xml
index e59f692ae6beb7a2d1c4894ce8eeba99810f9f61..f632e756f6b06803aff28d503e36b0d1339ec886 100644
--- a/contrib/configfiles/tdw/configfiles/interaction/ucp_tdw.xml
+++ b/contrib/configfiles/tdw/configfiles/interaction/ucp_tdw.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id: $ -->
+
 
 <module>
 	<nodespace>
diff --git a/contrib/dfn/editor/test/xml/worldpointer_by_6dof.xml b/contrib/dfn/editor/test/xml/worldpointer_by_6dof.xml
index b2cb8e026abeac9aa228eec65a742b38be1a79f3..beebf549fb8bc0dfbb23713adb97fd7d7d99674c 100644
--- a/contrib/dfn/editor/test/xml/worldpointer_by_6dof.xml
+++ b/contrib/dfn/editor/test/xml/worldpointer_by_6dof.xml
@@ -1,4 +1,4 @@
-<!-- $Id: worldpointer_by_6dof.xml,v 1.6 2009/05/28 08:21:57 dr165799 Exp $ -->
+
 <module>
 	<nodespace>
 	</nodespace>
diff --git a/contrib/dfn/editor/test/xml/worldpointer_by_mouse.xml b/contrib/dfn/editor/test/xml/worldpointer_by_mouse.xml
index ebb9766276c031e4df91ce6f04b3b1ea034e61c0..5273f8d3021e10c00d339b408574131f4f0ea6f2 100644
--- a/contrib/dfn/editor/test/xml/worldpointer_by_mouse.xml
+++ b/contrib/dfn/editor/test/xml/worldpointer_by_mouse.xml
@@ -1,4 +1,4 @@
-<!-- $Id: worldpointer_by_mouse.xml,v 1.7 2009/05/28 08:21:57 dr165799 Exp $ -->
+
 <module>
 	<nodespace>
 	</nodespace>
diff --git a/contrib/startscripts/startscripts/application_settings.sh b/contrib/startscripts/startscripts/application_settings.sh
index 53fe927af2706beceb6763548f045ede8446688d..fc609dcdd3ba36df8c8814085fd71f450e552e2d 100644
--- a/contrib/startscripts/startscripts/application_settings.sh
+++ b/contrib/startscripts/startscripts/application_settings.sh
@@ -10,7 +10,7 @@ EXECUTABLE_NAME_RELEASE=MyApplication
 EXECUTABLE_NAME_DEBUG=MyApplicationD
 
 # names of the path script (relative to executable path)
-PATH_SCRIPT=set_path_for_Inside.sh
+PATH_SCRIPT=set_path_for_MyApplication.sh
 
 # additional output that is printed by run.sh -h, or if errors occur
 # should contain all optional parameters that are parsed in run.sh
diff --git a/contrib/startscripts/startscripts/startslaves_aixcave.sh b/contrib/startscripts/startscripts/startslaves_aixcave.sh
index eaad3332c5de42fcc9731665e328e58edd4600ca..53f3a0ef952045f908082f29f2516d819df23ff1 100755
--- a/contrib/startscripts/startscripts/startslaves_aixcave.sh
+++ b/contrib/startscripts/startscripts/startslaves_aixcave.sh
@@ -80,10 +80,10 @@ fi
 SLAVELIST="$CHOSENCONFIG[@]"
 
 if [ "$REDIRECT_SLAVE_OUTPUT" == "" ]; then
-	$REDIRECT_SLAVE_OUTPUT=false
+	REDIRECT_SLAVE_OUTPUT=false
 fi
 if [ "$REDIRECT_SLAVE_OUTPUT_FOLDER" == "" ]; then
- 	$REDIRECT_SLAVE_OUTPUT_FOLDER="slavelogs"
+ 	REDIRECT_SLAVE_OUTPUT_FOLDER="slavelogs"
 fi
 
 # determine if slave output should be redirected