diff --git a/AMR/CMakeLists.txt b/AMR/CMakeLists.txt
deleted file mode 100644
index f36fde2358eb8744945a5f9c4981101260f8f096..0000000000000000000000000000000000000000
--- a/AMR/CMakeLists.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-## Set the Kit name
-SET(KIT AMR)
-SET(UKIT AMR)
-SET(KIT_TCL_LIBS vtkCommonTCL vtkFilteringTCL vtkParallelTCL vtkGenericFilteringTCL )
-SET(KIT_PYTHON_LIBS vtkCommonPythonD vtkFilteringPythonD vtkParallelPythonD vtkGenericFilteringPythonD )
-SET(KIT_JAVA_LIBS vtkCommonJava vtkFilteringJava vtkParallelJava vtkGenericFilteringJava )
-SET(KIT_INTERFACE_LIBRARIES vtkCommon vtkFiltering vtkParallel vtkGenericFiltering )
-
-## Get the kit sources
-SET(Kit_SRCS
-    vtkAMRBaseParticlesReader.cxx
-    vtkAMRBaseReader.cxx
-    vtkAMRCutPlane.cxx
-    vtkAMRDataSetCache.cxx
-    vtkAMREnzoParticlesReader.cxx
-    vtkAMREnzoReader.cxx
-    vtkAMREnzoReaderInternal.cxx
-    vtkAMRFlashParticlesReader.cxx
-    vtkAMRFlashReader.cxx
-    vtkAMRFlashReaderInternal.cxx
-    vtkAMRGaussianPulseSource.cxx
-    vtkAMRResampleFilter.cxx
-    vtkAMRSliceFilter.cxx
-    vtkAMRToMultiBlockFilter.cxx
-    )
-
-## Set the libraries required by this kit
-SET(KIT_LIBS vtkParallel vtkCommon vtkFiltering vtkGenericFiltering ${VTK_HDF5_LIBRARIES})
-
-SET_SOURCE_FILES_PROPERTIES(
-    vtkAMRBaseReader
-    vtkAMRBaseParticlesReader
-    ABSTRACT
-)
-
-SET_SOURCE_FILES_PROPERTIES(
-  vtkAMREnzoReaderInternal
-  vtkAMRFlashReaderInternal
-  WRAP_EXCLUDE
-)
-## Include CMAKE code common to all kits
-INCLUDE(${VTK_CMAKE_DIR}/KitCommonBlock.cmake )
diff --git a/AMR/Testing/CMakeLists.txt b/AMR/Testing/CMakeLists.txt
deleted file mode 100644
index 641988f26803e045fd18a3f0386fe4a12f3fbfe2..0000000000000000000000000000000000000000
--- a/AMR/Testing/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-ADD_SUBDIRECTORY(Cxx)
-
-IF(PYTHON_EXECUTABLE)
-  ADD_TEST(HeaderTesting-AMR ${PYTHON_EXECUTABLE}
-    ${VTK_SOURCE_DIR}/Common/Testing/HeaderTesting.py
-    "${VTK_SOURCE_DIR}/AMR"
-    VTK_AMR_EXPORT
-    vtkAMREnzoReaderInternal.h
-    vtkAMRFlashReaderInternal.h
-    )
-ENDIF(PYTHON_EXECUTABLE)
\ No newline at end of file
diff --git a/CMake/CMake2.4/FindBoost.cmake b/CMake/CMake2.4/FindBoost.cmake
deleted file mode 100644
index 60fa2e5a97202a38a24054472c1a30f86b6b3f83..0000000000000000000000000000000000000000
--- a/CMake/CMake2.4/FindBoost.cmake
+++ /dev/null
@@ -1,578 +0,0 @@
-# - Try to find Boost include dirs and libraries
-# Usage of this module as follows:
-#
-#     SET(Boost_USE_STATIC_LIBS ON)
-#     SET(Boost_USE_MULTITHREAD OFF)
-#     FIND_PACKAGE( Boost 1.34.1 COMPONENTS date_time filesystem iostreams ... )
-#
-# The Boost_ADDITIONAL_VERSIONS variable can be used to specify a list of
-# boost version numbers that should be taken into account when searching
-# for the libraries. Unfortunately boost puts the version number into the
-# actual filename for the libraries, so this might be needed in the future
-# when new Boost versions are released.
-#
-# Currently this module searches for the following version numbers:
-# 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1, 1.36.0,
-# 1.36.1
-#
-# The components list needs to be the actual names of boost libraries, that is
-# the part of the actual library files that differ on different libraries. So
-# its "date_time" for "libboost_date_time...". Anything else will result in
-# errors
-#
-# You can provide a minimum version number that should be used. If you provide this 
-# version number and specify the REQUIRED attribute, this module will fail if it
-# can't find the specified or a later version. If you specify a version number this is
-# automatically put into the considered list of version numbers and thus doesn't need
-# to be specified in the Boost_ADDITIONAL_VERSIONS variable
-#
-# Variables used by this module, they can change the default behaviour and need to be set
-# before calling find_package:
-#  Boost_USE_MULTITHREAD         Can be set to OFF to use the non-multithreaded
-#                                boost libraries. Defaults to ON.
-#  Boost_USE_STATIC_LIBS         Can be set to ON to force the use of the static
-#                                boost libraries. Defaults to OFF.
-#  Boost_ADDITIONAL_VERSIONS     A list of version numbers to use for searching
-#                                the boost include directory. The default list
-#                                of version numbers is:
-#                                1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 
-#                                1.35, 1.35.0, 1.35.1, 1.36.0, 1.36.1
-#                                If you want to look for an older or newer
-#                                version set this variable to a list of
-#                                strings, where each string contains a number, i.e.
-#                                SET(Boost_ADDITIONAL_VERSIONS "0.99.0" "1.35.0")
-#  BOOST_ROOT                    Preferred installation prefix for searching for Boost,
-#                                set this if the module has problems finding the proper Boost installation
-#  BOOST_INCLUDEDIR              Set this to the include directory of Boost, if the
-#                                module has problems finding the proper Boost installation
-#  BOOST_LIBRARYDIR              Set this to the lib directory of Boost, if the
-#                                module has problems finding the proper Boost installation
-#
-#  The last three variables are available also as environment variables
-#
-#
-# Variables defined by this module:
-#
-#  Boost_FOUND                          System has Boost, this means the include dir was found,
-#                                       as well as all the libraries specified in the COMPONENTS list
-#  Boost_INCLUDE_DIRS                   Boost include directories, not cached
-#  Boost_INCLUDE_DIR                    This is almost the same as above, but this one is cached and may be
-#                                       modified by advanced users
-#  Boost_LIBRARIES                      Link these to use the Boost libraries that you specified, not cached
-#  Boost_LIBRARY_DIRS                   The path to where the Boost library files are.
-#  Boost_VERSION                        The version number of the boost libraries that have been found,
-#                                       same as in version.hpp from Boost
-#  Boost_LIB_VERSION                    The version number in filename form as its appended to the library filenames
-#  Boost_MAJOR_VERSION                  major version number of boost
-#  Boost_MINOR_VERSION                  minor version number of boost
-#  Boost_SUBMINOR_VERSION               subminor version number of boost
-#  Boost_LIB_DIAGNOSTIC_DEFINITIONS     Only set on windows. Can be used with add_definitions 
-#                                       to print diagnostic information about the automatic 
-#                                       linking done on windows.
-
-# For each component you list the following variables are set.
-# ATTENTION: The component names need to be in lower case, just as the boost
-# library names however the cmake variables use upper case for the component
-# part. So you'd get Boost_SERIALIZATION_FOUND for example.
-#
-#  Boost_${COMPONENT}_FOUND             True IF the Boost library "component" was found.
-#  Boost_${COMPONENT}_LIBRARY           The absolute path of the Boost library "component".
-#  Boost_${COMPONENT}_LIBRARY_DEBUG     The absolute path of the debug version of the
-#                                       Boost library "component".
-#  Boost_${COMPONENT}_LIBRARY_RELEASE   The absolute path of the release version of the
-#                                       Boost library "component"
-#
-#  Copyright (c) 2006-2008 Andreas Schneider <mail@cynapses.org>
-#  Copyright (c) 2007      Wengo
-#  Copyright (c) 2007      Mike Jackson
-#  Copyright (c) 2008      Andreas Pakulat <apaku@gmx.de>
-#
-#  Redistribution AND use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-# this module required CMake 2.5 for the Boost_FIND_VERSION stuff
-CMAKE_MINIMUM_REQUIRED(VERSION "2.6" FATAL_ERROR)
-
-# MESSAGE(STATUS "Finding Boost libraries.... ")
-
-OPTION(Boost_USE_MULTITHREADED "Use the multithreaded versions of the boost libraries" ON)
-
-SET( _boost_TEST_VERSIONS ${Boost_ADDITIONAL_VERSIONS} "1.36.1" "1.36.0" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0" "1.34" "1.33.1" "1.33.0" "1.33" )
-
-
-############################################
-#
-# Check the existence of the libraries.
-#
-############################################
-# This macro was taken directly from the FindQt4.cmake file that is included
-# with the CMake distribution. This is NOT my work. All work was done by the
-# original authors of the FindQt4.cmake file. Only minor modifications were
-# made to remove references to Qt and make this file more generally applicable
-#########################################################################
-
-MACRO (_Boost_ADJUST_LIB_VARS basename)
-  IF (Boost_INCLUDE_DIR )
-    #MESSAGE(STATUS "Adjusting ${basename} ")
-
-    IF (Boost_${basename}_LIBRARY_DEBUG AND Boost_${basename}_LIBRARY_RELEASE)
-      # if the generator supports configuration types then set
-      # optimized and debug libraries, or if the CMAKE_BUILD_TYPE has a value
-      IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-        SET(Boost_${basename}_LIBRARY optimized ${Boost_${basename}_LIBRARY_RELEASE} debug ${Boost_${basename}_LIBRARY_DEBUG})
-      ELSE(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-        # if there are no configuration types and CMAKE_BUILD_TYPE has no value
-        # then just use the release libraries
-        SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_RELEASE} )
-      ENDIF(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-      SET(Boost_${basename}_LIBRARIES optimized ${Boost_${basename}_LIBRARY_RELEASE} debug ${Boost_${basename}_LIBRARY_DEBUG})
-    ENDIF (Boost_${basename}_LIBRARY_DEBUG AND Boost_${basename}_LIBRARY_RELEASE)
-
-    # if only the release version was found, set the debug variable also to the release version
-    IF (Boost_${basename}_LIBRARY_RELEASE AND NOT Boost_${basename}_LIBRARY_DEBUG)
-      SET(Boost_${basename}_LIBRARY_DEBUG ${Boost_${basename}_LIBRARY_RELEASE})
-      SET(Boost_${basename}_LIBRARY       ${Boost_${basename}_LIBRARY_RELEASE})
-      SET(Boost_${basename}_LIBRARIES     ${Boost_${basename}_LIBRARY_RELEASE})
-    ENDIF (Boost_${basename}_LIBRARY_RELEASE AND NOT Boost_${basename}_LIBRARY_DEBUG)
-
-    # if only the debug version was found, set the release variable also to the debug version
-    IF (Boost_${basename}_LIBRARY_DEBUG AND NOT Boost_${basename}_LIBRARY_RELEASE)
-      SET(Boost_${basename}_LIBRARY_RELEASE ${Boost_${basename}_LIBRARY_DEBUG})
-      SET(Boost_${basename}_LIBRARY         ${Boost_${basename}_LIBRARY_DEBUG})
-      SET(Boost_${basename}_LIBRARIES       ${Boost_${basename}_LIBRARY_DEBUG})
-    ENDIF (Boost_${basename}_LIBRARY_DEBUG AND NOT Boost_${basename}_LIBRARY_RELEASE)
-    
-    IF (Boost_${basename}_LIBRARY)
-      SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY} CACHE FILEPATH "The Boost ${basename} library")
-      GET_FILENAME_COMPONENT(Boost_LIBRARY_DIRS "${Boost_${basename}_LIBRARY}" PATH)
-      SET(Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIRS} CACHE FILEPATH "Boost library directory")
-      SET(Boost_${basename}_FOUND ON CACHE INTERNAL "Was the boost boost ${basename} library found")
-    ENDIF (Boost_${basename}_LIBRARY)
-
-  ENDIF (Boost_INCLUDE_DIR )
-  # Make variables changeble to the advanced user
-  MARK_AS_ADVANCED(
-      Boost_${basename}_LIBRARY
-      Boost_${basename}_LIBRARY_RELEASE
-      Boost_${basename}_LIBRARY_DEBUG
-  )
-ENDMACRO (_Boost_ADJUST_LIB_VARS)
-
-#-------------------------------------------------------------------------------
-
-
-SET( _boost_IN_CACHE TRUE)
-IF(Boost_INCLUDE_DIR)
-  FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
-    STRING(TOUPPER ${COMPONENT} COMPONENT)
-    IF(NOT Boost_${COMPONENT}_FOUND)
-      SET( _boost_IN_CACHE FALSE)
-    ENDIF(NOT Boost_${COMPONENT}_FOUND)
-  ENDFOREACH(COMPONENT)
-ELSE(Boost_INCLUDE_DIR)
-  SET( _boost_IN_CACHE FALSE)
-ENDIF(Boost_INCLUDE_DIR)
-
-IF (_boost_IN_CACHE)
-  # in cache already
-  SET(Boost_FOUND TRUE)
-  FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
-    STRING(TOUPPER ${COMPONENT} COMPONENT)
-    _Boost_ADJUST_LIB_VARS( ${COMPONENT} )
-    SET(Boost_LIBRARIES ${Boost_LIBRARIES} ${Boost_${COMPONENT}_LIBRARY})
-  ENDFOREACH(COMPONENT)
-  SET(Boost_INCLUDE_DIRS ${Boost_INCLUDE_DIR})
-  IF(Boost_VERSION AND NOT "${Boost_VERSION}" STREQUAL "0")
-    MATH(EXPR Boost_MAJOR_VERSION "${Boost_VERSION} / 100000")
-    MATH(EXPR Boost_MINOR_VERSION "${Boost_VERSION} / 100 % 1000")
-    MATH(EXPR Boost_SUBMINOR_VERSION "${Boost_VERSION} % 100")
-  ENDIF(Boost_VERSION AND NOT "${Boost_VERSION}" STREQUAL "0")
-ELSE (_boost_IN_CACHE)
-  # Need to search for boost
-
-  IF(WIN32)
-    # In windows, automatic linking is performed, so you do not have to specify the libraries.
-    # If you are linking to a dynamic runtime, then you can choose to link to either a static or a
-    # dynamic Boost library, the default is to do a static link.  You can alter this for a specific
-    # library "whatever" by defining BOOST_WHATEVER_DYN_LINK to force Boost library "whatever" to
-    # be linked dynamically.  Alternatively you can force all Boost libraries to dynamic link by
-    # defining BOOST_ALL_DYN_LINK.
-  
-    # This feature can be disabled for Boost library "whatever" by defining BOOST_WHATEVER_NO_LIB,
-    # or for all of Boost by defining BOOST_ALL_NO_LIB.
-  
-    # If you want to observe which libraries are being linked against then defining
-    # BOOST_LIB_DIAGNOSTIC will cause the auto-linking code to emit a #pragma message each time
-    # a library is selected for linking.
-    SET(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC" CACHE STRING "Boost diagnostic define")
-  ENDIF(WIN32)
-
-
-  SET(_boost_INCLUDE_SEARCH_DIRS
-    C:/boost/include
-    "C:/Program Files/boost/boost_${Boost_FIND_VERSION_MAJOR}_${Boost_FIND_VERSION_MINOR}_${Boost_FIND_VERSION_PATCH}"
-    # D: is very often the cdrom drive, IF you don't have a
-    # cdrom inserted it will popup a very annoying dialog
-    #D:/boost/include
-    /sw/local/include
-  )
-
-  SET(_boost_LIBRARIES_SEARCH_DIRS
-    C:/boost/lib
-    "C:/Program Files/boost/boost_${Boost_FIND_VERSION_MAJOR}_${Boost_FIND_VERSION_MINOR}_${Boost_FIND_VERSION_PATCH}/lib"
-    /sw/local/lib
-  )
-
-  IF( NOT $ENV{BOOST_ROOT} STREQUAL "" )
-    SET(_boost_INCLUDE_SEARCH_DIRS $ENV{BOOST_ROOT}/include ${_boost_INCLUDE_SEARCH_DIRS})
-    SET(_boost_LIBRARIES_SEARCH_DIRS $ENV{BOOST_ROOT}/lib ${_boost_INCLUDE_SEARCH_DIRS})
-  ENDIF( NOT $ENV{BOOST_ROOT} STREQUAL "" )
-
-  IF( NOT $ENV{BOOST_INCLUDEDIR} STREQUAL "" )
-    SET(_boost_INCLUDE_SEARCH_DIRS $ENV{BOOST_INCLUDEDIR} ${_boost_INCLUDE_SEARCH_DIRS})
-  ENDIF( NOT $ENV{BOOST_INCLUDEDIR} STREQUAL "" )
-
-  IF( NOT $ENV{BOOST_LIBRARYDIR} STREQUAL "" )
-    SET(_boost_LIBRARIES_SEARCH_DIRS $ENV{BOOST_LIBRARYDIR} ${_boost_INCLUDE_SEARCH_DIRS})
-  ENDIF( NOT $ENV{BOOST_LIBRARYDIR} STREQUAL "" )
-
-  IF( BOOST_ROOT )
-    IF( WIN32 )
-      SET(_boost_INCLUDE_SEARCH_DIRS ${BOOST_ROOT} ${_boost_INCLUDE_SEARCH_DIRS})
-    ELSE( WIN32 )
-      SET(_boost_INCLUDE_SEARCH_DIRS ${BOOST_ROOT}/include ${_boost_INCLUDE_SEARCH_DIRS})
-    ENDIF( WIN32 )
-    SET(_boost_LIBRARIES_SEARCH_DIRS ${BOOST_ROOT}/lib ${_boost_LIBRARIES_SEARCH_DIRS})
-  ENDIF( BOOST_ROOT )
-
-  IF( BOOST_INCLUDEDIR )
-    SET(_boost_INCLUDE_SEARCH_DIRS ${BOOST_INCLUDEDIR} ${_boost_INCLUDE_SEARCH_DIRS})
-  ENDIF( BOOST_INCLUDEDIR )
-
-  IF( BOOST_LIBRARYDIR )
-    SET(_boost_LIBRARIES_SEARCH_DIRS ${BOOST_LIBRARYDIR} ${_boost_LIBRARIES_SEARCH_DIRS})
-  ENDIF( BOOST_LIBRARYDIR )
-
-  #Try first in our own include search paths (e.g. BOOST_ROOT)
-  FOREACH(_boost_VER ${_boost_TEST_VERSIONS})
-    IF( NOT Boost_INCLUDE_DIR )
-
-      # Add in a path suffix, based on the required version, ideally we could
-      # read this from version.hpp, but for that to work we'd need to know the include
-      # dir already
-      SET(_boost_PATH_SUFFIX
-        boost-${_boost_VER}
-      )
-
-      IF(_boost_PATH_SUFFIX MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+")
-          STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1_\\2_\\3" _boost_PATH_SUFFIX ${_boost_PATH_SUFFIX})
-      ELSEIF(_boost_PATH_SUFFIX MATCHES "[0-9]+\\.[0-9]+")
-          STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\1_\\2" _boost_PATH_SUFFIX ${_boost_PATH_SUFFIX})
-      ENDIF(_boost_PATH_SUFFIX MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+")
-
-
-      FIND_PATH(Boost_INCLUDE_DIR
-          NAMES         boost/config.hpp
-          PATHS         ${_boost_INCLUDE_SEARCH_DIRS}
-          PATH_SUFFIXES ${_boost_PATH_SUFFIX}
-          NO_DEFAULT_PATH
-      )
-
-    ENDIF( NOT Boost_INCLUDE_DIR )
-  ENDFOREACH(_boost_VER)
-
-  # If nothing is found search again using system default paths
-  FOREACH(_boost_VER ${_boost_TEST_VERSIONS})
-    IF( NOT Boost_INCLUDE_DIR )
-
-      # Add in a path suffix, based on the required version, ideally we could
-      # read this from version.hpp, but for that to work we'd need to know the include
-      # dir already
-      SET(_boost_PATH_SUFFIX
-        boost-${_boost_VER}
-      )
-
-      IF(_boost_PATH_SUFFIX MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+")
-          STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1_\\2_\\3" _boost_PATH_SUFFIX ${_boost_PATH_SUFFIX})
-      ELSEIF(_boost_PATH_SUFFIX MATCHES "[0-9]+\\.[0-9]+")
-          STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\1_\\2" _boost_PATH_SUFFIX ${_boost_PATH_SUFFIX})
-      ENDIF(_boost_PATH_SUFFIX MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+")
-
-      FIND_PATH(Boost_INCLUDE_DIR
-          NAMES         boost/config.hpp
-          PATH_SUFFIXES ${_boost_PATH_SUFFIX}
-      )
- 
-    ENDIF( NOT Boost_INCLUDE_DIR )
-  ENDFOREACH(_boost_VER)
-  IF(Boost_INCLUDE_DIR)
-    # Extract Boost_VERSION and Boost_LIB_VERSION from version.hpp
-    # Read the whole file:
-    #
-    SET(BOOST_VERSION 0)
-    SET(BOOST_LIB_VERSION "")
-    FILE(READ "${Boost_INCLUDE_DIR}/boost/version.hpp" _boost_VERSION_HPP_CONTENTS)
-  
-    STRING(REGEX REPLACE ".*#define BOOST_VERSION ([0-9]+).*" "\\1" Boost_VERSION "${_boost_VERSION_HPP_CONTENTS}")
-    STRING(REGEX REPLACE ".*#define BOOST_LIB_VERSION \"([0-9_]+)\".*" "\\1" Boost_LIB_VERSION "${_boost_VERSION_HPP_CONTENTS}")
-  
-    SET(Boost_LIB_VERSION ${Boost_LIB_VERSION} CACHE INTERNAL "The library version string for boost libraries")
-    SET(Boost_VERSION ${Boost_VERSION} CACHE INTERNAL "The version number for boost libraries")
-    
-    IF(NOT "${Boost_VERSION}" STREQUAL "0")
-      MATH(EXPR Boost_MAJOR_VERSION "${Boost_VERSION} / 100000")
-      MATH(EXPR Boost_MINOR_VERSION "${Boost_VERSION} / 100 % 1000")
-      MATH(EXPR Boost_SUBMINOR_VERSION "${Boost_VERSION} % 100")
-  
-    ENDIF(NOT "${Boost_VERSION}" STREQUAL "0")
-  ENDIF(Boost_INCLUDE_DIR)
-
-
-  #Setting some more suffixes for the library
-  SET (Boost_LIB_PREFIX "")
-  IF ( WIN32 AND Boost_USE_STATIC_LIBS )
-    SET (Boost_LIB_PREFIX "lib")
-  ENDIF ( WIN32 AND Boost_USE_STATIC_LIBS )
-  SET (_boost_COMPILER "-gcc")
-  IF (MSVC71)
-    SET (_boost_COMPILER "-vc71")
-  ENDIF(MSVC71)
-  IF (MSVC80)
-    SET (_boost_COMPILER "-vc80")
-  ENDIF(MSVC80)
-  IF (MSVC90)
-    SET (_boost_COMPILER "-vc90")
-  ENDIF (MSVC90)
-  IF (MINGW)
-    EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
-      ARGS --version
-      OUTPUT_VARIABLE _boost_COMPILER_VERSION
-      )
-    STRING(REGEX REPLACE ".* ([0-9])\\.([0-9])\\.[0-9] .*" "\\1\\2"
-      _boost_COMPILER_VERSION ${_boost_COMPILER_VERSION})
-    SET (_boost_COMPILER "-mgw${_boost_COMPILER_VERSION}")
-  ENDIF(MINGW)
-  IF (CYGWIN)
-    SET (_boost_COMPILER "-gcc")
-  ENDIF (CYGWIN)
-  IF (UNIX)
-    IF (APPLE)
-      IF(${Boost_MINOR_VERSION} GREATER 35)
-        #find out the version of gcc being used.
-        EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
-            ARGS --version
-            OUTPUT_VARIABLE _boost_COMPILER_VERSION
-        )
-        STRING(REGEX REPLACE ".* ([0-9])\\.([0-9])\\.[0-9] .*" "\\1\\2"
-               _boost_COMPILER_VERSION ${_boost_COMPILER_VERSION})
-        SET (_boost_COMPILER "-xgcc${_boost_COMPILER_VERSION}")
-      ELSE(${Boost_MINOR_VERSION} GREATER 35)
-        SET (_boost_COMPILER "")
-      ENDIF(${Boost_MINOR_VERSION} GREATER 35)
-    ELSE (APPLE)
-      IF (NOT CMAKE_COMPILER_IS_GNUCC)
-        # This is for the intel compiler
-        SET (_boost_COMPILER "-il")
-      ELSE (NOT CMAKE_COMPILER_IS_GNUCC)
-        #find out the version of gcc being used.
-        EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
-            ARGS --version
-            OUTPUT_VARIABLE _boost_COMPILER_VERSION
-        )
-        STRING(REGEX REPLACE ".* ([0-9])\\.([0-9])\\.[0-9] .*" "\\1\\2"
-               _boost_COMPILER_VERSION ${_boost_COMPILER_VERSION})
-        SET (_boost_COMPILER "-gcc${_boost_COMPILER_VERSION}")
-      ENDIF (NOT CMAKE_COMPILER_IS_GNUCC)
-    ENDIF (APPLE)
-  ENDIF(UNIX)
-
-  SET (_boost_MULTITHREADED "-mt")
-
-  IF( NOT Boost_USE_MULTITHREADED )
-    SET (_boost_MULTITHREADED "")
-  ENDIF( NOT Boost_USE_MULTITHREADED )
-
-  SET( _boost_STATIC_TAG "")
-  IF (WIN32)
-    IF(MSVC)
-      SET (_boost_ABI_TAG "g")
-    ENDIF(MSVC)
-    IF( Boost_USE_STATIC_LIBS )
-      SET( _boost_STATIC_TAG "-s")
-    ENDIF( Boost_USE_STATIC_LIBS )
-  ENDIF(WIN32)
-  SET (_boost_ABI_TAG "${_boost_ABI_TAG}d")
-
-  # ------------------------------------------------------------------------
-  #  Begin finding boost libraries
-  # ------------------------------------------------------------------------
-  FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
-    STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-    SET( Boost_${UPPERCOMPONENT}_LIBRARY "Boost_${UPPERCOMPONENT}_LIBRARY-NOTFOUND" )
-    SET( Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE "Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE-NOTFOUND" )
-    SET( Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG "Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG-NOTFOUND")
-
-    # Support preference of static libs by adjusting CMAKE_FIND_LIBRARY_SUFFIXES
-    IF( Boost_USE_STATIC_LIBS )
-      SET( _boost_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
-      IF(WIN32)
-        SET(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
-      ELSE(WIN32)
-        SET(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
-      ENDIF(WIN32)
-    ENDIF( Boost_USE_STATIC_LIBS )
-
-    FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE
-        NAMES  ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${Boost_LIB_VERSION}
-               ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}-${Boost_LIB_VERSION}
-               ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
-               ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}
-               ${Boost_LIB_PREFIX}boost_${COMPONENT}
-        PATHS  ${_boost_LIBRARIES_SEARCH_DIRS}
-        NO_DEFAULT_PATH
-    )
-
-    IF( NOT ${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE} )
-      FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE
-          NAMES  ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${Boost_LIB_VERSION}
-                 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}-${Boost_LIB_VERSION}
-                 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
-                 ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}
-                 ${Boost_LIB_PREFIX}boost_${COMPONENT}
-      )
-    ENDIF( NOT ${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE} )
-
-    FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG
-        NAMES  ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${_boost_ABI_TAG}-${Boost_LIB_VERSION}
-               ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}-${Boost_LIB_VERSION}
-               ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${_boost_ABI_TAG}
-               ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}
-               ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_boost_ABI_TAG}
-        PATHS  ${_boost_LIBRARIES_SEARCH_DIRS}
-        NO_DEFAULT_PATH
-    )
-
-    IF( NOT ${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG} )
-      FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG
-          NAMES  ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${_boost_ABI_TAG}-${Boost_LIB_VERSION}
-               ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}-${Boost_LIB_VERSION}
-               ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${_boost_ABI_TAG}
-               ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}
-               ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_boost_ABI_TAG}
-      )
-    ENDIF( NOT ${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG} )
-    _Boost_ADJUST_LIB_VARS(${UPPERCOMPONENT})
-    IF( Boost_USE_STATIC_LIBS )
-      SET(CMAKE_FIND_LIBRARY_SUFFIXES ${_boost_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
-    ENDIF( Boost_USE_STATIC_LIBS )
-  ENDFOREACH(COMPONENT)
-  # ------------------------------------------------------------------------
-  #  End finding boost libraries
-  # ------------------------------------------------------------------------
-
-  SET(Boost_INCLUDE_DIRS
-    ${Boost_INCLUDE_DIR}
-  )
-
-  # MESSAGE(STATUS "Boost_INCLUDE_DIRS: ${Boost_INCLUDE_DIRS}")
-  # MESSAGE(STATUS "Boost_LIBRARIES: ${Boost_LIBRARIES}")
-
-  SET(Boost_FOUND FALSE)
-  IF(Boost_INCLUDE_DIR)
-    SET( Boost_FOUND TRUE )
-    IF( Boost_FIND_VERSION_MAJOR AND Boost_VERSION_MAJOR LESS "${Boost_FIND_VERSION_MAJOR}" )
-      SET( Boost_FOUND FALSE )
-    ELSE( Boost_FIND_VERSION_MAJOR AND Boost_VERSION_MAJOR LESS "${Boost_FIND_VERSION_MAJOR}" )
-      IF( Boost_FIND_VERSION_MINOR AND Boost_VERSION_MINOR LESS "${Boost_FIND_VERSION_MINOR}" )
-        SET( Boost_FOUND FALSE )
-      ELSE( Boost_FIND_VERSION_MINOR AND Boost_VERSION_MINOR LESS "${Boost_FIND_VERSION_MINOR}" )
-        IF( Boost_FIND_VERSION_PATCH AND Boost_VERSION_SUBMINOR LESS "${Boost_FIND_VERSION_PATCH}" )
-          SET( Boost_FOUND FALSE )
-        ENDIF( Boost_FIND_VERSION_PATCH AND Boost_VERSION_SUBMINOR LESS "${Boost_FIND_VERSION_PATCH}" )
-      ENDIF( Boost_FIND_VERSION_MINOR AND Boost_VERSION_MINOR LESS "${Boost_FIND_VERSION_MINOR}" )
-    ENDIF( Boost_FIND_VERSION_MAJOR AND Boost_VERSION_MAJOR LESS "${Boost_FIND_VERSION_MAJOR}" )
-    set(_boost_CHECKED_COMPONENT FALSE)
-    FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
-      STRING(TOUPPER ${COMPONENT} COMPONENT)
-      set(_boost_CHECKED_COMPONENT TRUE)
-      IF(NOT Boost_${COMPONENT}_FOUND)
-        SET( Boost_FOUND FALSE)
-      ENDIF(NOT Boost_${COMPONENT}_FOUND)
-    ENDFOREACH(COMPONENT)
-    IF( NOT Boost_LIBRARY_DIRS AND NOT _boost_CHECKED_COMPONENT )
-      # Compatibility Code for backwards compatibility with CMake 2.4
-
-      # Look for the boost library path.
-      # Note that the user may not have installed any libraries
-      # so it is quite possible the Boost_LIBRARY_PATH may not exist.
-      SET(_boost_LIB_DIR ${Boost_INCLUDE_DIR})
-    
-      IF("${_boost_LIB_DIR}" MATCHES "boost-[0-9]+")
-        GET_FILENAME_COMPONENT(_boost_LIB_DIR ${_boost_LIB_DIR} PATH)
-      ENDIF ("${_boost_LIB_DIR}" MATCHES "boost-[0-9]+")
-    
-      IF("${_boost_LIB_DIR}" MATCHES "/include$")
-        # Strip off the trailing "/include" in the path.
-        GET_FILENAME_COMPONENT(_boost_LIB_DIR ${_boost_LIB_DIR} PATH)
-      ENDIF("${_boost_LIB_DIR}" MATCHES "/include$")
-    
-      IF(EXISTS "${_boost_LIB_DIR}/lib")
-        SET (_boost_LIB_DIR ${_boost_LIB_DIR}/lib)
-      ELSE(EXISTS "${_boost_LIB_DIR}/lib")
-        IF(EXISTS "${_boost_LIB_DIR}/stage/lib")
-          SET(_boost_LIB_DIR ${_boost_LIB_DIR}/stage/lib)
-        ELSE(EXISTS "${_boost_LIB_DIR}/stage/lib")
-          SET(_boost_LIB_DIR "")
-        ENDIF(EXISTS "${_boost_LIB_DIR}/stage/lib")
-      ENDIF(EXISTS "${_boost_LIB_DIR}/lib")
-    
-      IF(_boost_LIB_DIR AND EXISTS "${_boost_LIB_DIR}")
-        SET(Boost_LIBRARY_DIRS ${_boost_LIB_DIR} CACHE FILEPATH "Boost library directory")
-      ENDIF(_boost_LIB_DIR AND EXISTS "${_boost_LIB_DIR}")
-
-    ENDIF( NOT Boost_LIBRARY_DIRS AND NOT _boost_CHECKED_COMPONENT )
-
-  ELSE(Boost_INCLUDE_DIR)
-    SET( Boost_FOUND FALSE)
-  ENDIF(Boost_INCLUDE_DIR)
-
-  IF (Boost_FOUND)
-      IF (NOT Boost_FIND_QUIETLY)
-        MESSAGE(STATUS "Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
-      ENDIF(NOT Boost_FIND_QUIETLY)
-      IF (NOT Boost_FIND_QUIETLY)
-        MESSAGE(STATUS "Found the following Boost libraries:")
-      ENDIF(NOT Boost_FIND_QUIETLY)
-      FOREACH ( COMPONENT  ${Boost_FIND_COMPONENTS} )
-        STRING( TOUPPER ${COMPONENT} UPPERCOMPONENT )
-        IF ( Boost_${UPPERCOMPONENT}_FOUND )
-          IF (NOT Boost_FIND_QUIETLY)
-            MESSAGE (STATUS "  ${COMPONENT}")
-          ENDIF(NOT Boost_FIND_QUIETLY)
-          SET(Boost_LIBRARIES ${Boost_LIBRARIES} ${Boost_${UPPERCOMPONENT}_LIBRARY})
-        ENDIF ( Boost_${UPPERCOMPONENT}_FOUND )
-      ENDFOREACH(COMPONENT)
-  ELSE (Boost_FOUND)
-      IF (Boost_FIND_REQUIRED)
-        MESSAGE(STATUS "Boost version required: ${Boost_FIND_VERSION}. Found: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
-        MESSAGE(FATAL_ERROR "Couldn't find the Boost libraries and/or include directory, or the version found is too old. Please install the Boost libraries AND development packages. You can set BOOST_ROOT, BOOST_INCLUDEDIR and BOOST_LIBRARYDIR to help find Boost.")
-      ENDIF(Boost_FIND_REQUIRED)
-  ENDIF(Boost_FOUND)
-
-  # Under Windows, automatic linking is performed, so no need to specify the libraries.
-  IF (WIN32)
-    IF (NOT MINGW)
-      SET(Boost_LIBRARIES "")
-    ENDIF (NOT MINGW)
-  ENDIF(WIN32)
-
-  # show the Boost_INCLUDE_DIRS AND Boost_LIBRARIES variables only in the advanced view
-  MARK_AS_ADVANCED(Boost_INCLUDE_DIR
-      Boost_INCLUDE_DIRS
-      Boost_LIBRARY_DIRS
-      Boost_USE_MULTITHREADED
-  )
-ENDIF(_boost_IN_CACHE)
-
diff --git a/CMake/FindEXPAT.cmake b/CMake/FindEXPAT.cmake
deleted file mode 100644
index 68f62167b3e2b5050868b203b42898ab9c632ca6..0000000000000000000000000000000000000000
--- a/CMake/FindEXPAT.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Find the native EXPAT includes and library
-#
-# This module defines
-# EXPAT_INCLUDE_DIR, where to find expat.h, etc.
-# EXPAT_LIBRARIES, the libraries to link against to use EXPAT.
-# EXPAT_FOUND, If false, do not try to use EXPAT.
-
-# also defined, but not for general use are
-# EXPAT_LIBRARY, where to find the EXPAT library.
-
-FIND_PATH(EXPAT_INCLUDE_DIR expat.h)
-
-FIND_LIBRARY(EXPAT_LIBRARY expat)
-
-IF(EXPAT_INCLUDE_DIR)
-  IF(EXPAT_LIBRARY)
-    SET( EXPAT_FOUND "YES" )
-    SET( EXPAT_LIBRARIES ${EXPAT_LIBRARY} )
-  ENDIF(EXPAT_LIBRARY)
-ENDIF(EXPAT_INCLUDE_DIR)
diff --git a/CMake/FindFREETYPE.cmake b/CMake/FindFREETYPE.cmake
deleted file mode 100644
index dd1d4e4f674563f3c668de0b57b5dd94b3f70785..0000000000000000000000000000000000000000
--- a/CMake/FindFREETYPE.cmake
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Find the native FREETYPE includes and library
-# 
-
-# This module defines
-# FREETYPE_INCLUDE_DIR, where to find ft2build.h, ftheader.h, ...
-# FREETYPE_LIBRARIES, the libraries to link against to use FREETYPE.
-# FREETYPE_FOUND, If false, do not try to use FREETYPE.
-
-# also defined, but not for general use are
-# FREETYPE_LIBRARY, where to find the FREETYPE library.
-
-FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h)
-
-FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER freetype/config/ftheader.h
-  /usr/include/freetype2
-  /usr/local/include/freetype2
-  PATH_SUFFIXES freetype2  
-)
-
-FIND_LIBRARY(FREETYPE_LIBRARY freetype)
-
-IF (FREETYPE_LIBRARY)
-  IF (FREETYPE_INCLUDE_DIR_FTHEADER AND FREETYPE_INCLUDE_DIR_FT2BUILD)
-    SET( FREETYPE_FOUND "YES" )
-    SET( FREETYPE_INCLUDE_DIR 
-      ${FREETYPE_INCLUDE_DIR_FT2BUILD}
-      ${FREETYPE_INCLUDE_DIR_FTHEADER} )
-    SET( FREETYPE_LIBRARIES ${FREETYPE_LIBRARY} )
-  ENDIF (FREETYPE_INCLUDE_DIR_FTHEADER AND FREETYPE_INCLUDE_DIR_FT2BUILD)
-ENDIF (FREETYPE_LIBRARY)
-
-MARK_AS_ADVANCED(
-  FREETYPE_INCLUDE_DIR_FT2BUILD
-  FREETYPE_INCLUDE_DIR_FTHEADER
-  )
-
diff --git a/CMake/FindHDF5.cmake b/CMake/FindHDF5.cmake
deleted file mode 100644
index bf0526613565b780f3a9cecfb3b6609cc12c97e0..0000000000000000000000000000000000000000
--- a/CMake/FindHDF5.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Find the native HDF5 includes and library
-# Note: this is deprecated, and will be removed entirely
-# once vtk's min cmake >= 2.8.0
-#
-# HDF5_INCLUDE_DIR - where to find H5public.h, etc.
-# HDF5_LIBRARIES   - List of fully qualified libraries to link against when using hdf5.
-# HDF5_FOUND       - Do not attempt to use hdf5 if "no" or undefined.
-
-FIND_PATH(HDF5_INCLUDE_DIR H5public.h
-  /usr/local/include
-  /usr/include
-)
-
-FIND_LIBRARY(HDF5_LIBRARY hdf5
-  /usr/local/lib
-  /usr/lib
-)
-
-IF(HDF5_INCLUDE_DIR)
-  IF(HDF5_LIBRARY)
-    SET( HDF5_LIBRARIES ${HDF5_LIBRARY} )
-    SET( HDF5_FOUND "YES" )
-  ENDIF(HDF5_LIBRARY)
-ENDIF(HDF5_INCLUDE_DIR)
diff --git a/CMake/FindLIBXML2.cmake b/CMake/FindLIBXML2.cmake
deleted file mode 100644
index 1c097db23f2d2a8a6d53b5ef59d3cc909dd5dc56..0000000000000000000000000000000000000000
--- a/CMake/FindLIBXML2.cmake
+++ /dev/null
@@ -1 +0,0 @@
-INCLUDE(${CMAKE_ROOT}/Modules/FindLibXml2.cmake)
diff --git a/CMake/FindPOSTGRES.cmake b/CMake/FindPOSTGRES.cmake
deleted file mode 100644
index aae96164fd981cc7d8248301b77d9cfb775eb7aa..0000000000000000000000000000000000000000
--- a/CMake/FindPOSTGRES.cmake
+++ /dev/null
@@ -1,57 +0,0 @@
-# Find POSTGRESQL library and header file
-# Sets
-#   POSTGRES_FOUND               to 0 or 1 depending on the result
-#   POSTGRES_INCLUDE_DIRECTORIES to directories required for using libpq
-#   POSTGRES_LIBRARIES           to libpq and any dependent libraries
-# If POSTGRES_REQUIRED is defined, then a fatal error message will be generated if libpq is not found
-
-if ( NOT POSTGRES_INCLUDE_DIRECTORIES OR NOT POSTGRES_LIBRARIES OR NOT POSTGRES_FOUND )
-
-  if ( $ENV{POSTGRES_DIR} )
-    file( TO_CMAKE_PATH "$ENV{POSTGRES_DIR}" _POSTGRES_DIR )
-  endif ( $ENV{POSTGRES_DIR} )
-
-  find_library( POSTGRES_LIBRARIES
-    NAMES pq libpq
-    PATHS
-      ${_POSTGRES_DIR}/lib64
-      ${CMAKE_INSTALL_PREFIX}/lib64
-      /usr/local/pgsql/lib64
-      /usr/local/lib64
-      /usr/lib64
-      ${_POSTGRES_DIR}
-      ${_POSTGRES_DIR}/lib
-      ${CMAKE_INSTALL_PREFIX}/bin
-      ${CMAKE_INSTALL_PREFIX}/lib
-      /usr/local/pgsql/lib
-      /usr/local/lib
-      /usr/lib
-    NO_DEFAULT_PATH
-  )
-
-  find_path( POSTGRES_INCLUDE_DIRECTORIES
-    NAMES libpq-fe.h
-    PATHS
-      ${_POSTGRES_DIR}
-      ${_POSTGRES_DIR}/include
-      ${CMAKE_INSTALL_PREFIX}/include
-      /usr/local/pgsql/include
-      /usr/local/include
-      /usr/include
-      /usr/include/postgresql
-    NO_DEFAULT_PATH
-  )
-
-  if ( NOT POSTGRES_INCLUDE_DIRECTORIES OR NOT POSTGRES_LIBRARIES ) 
-    if ( POSTGRES_REQUIRED )
-      message( FATAL_ERROR "POSTGRES is required. Set POSTGRES_DIR" )
-    endif ( POSTGRES_REQUIRED )
-  else ( NOT POSTGRES_INCLUDE_DIRECTORIES OR NOT POSTGRES_LIBRARIES ) 
-    set( POSTGRES_FOUND 1 )
-    mark_as_advanced( POSTGRES_FOUND )
-  endif ( NOT POSTGRES_INCLUDE_DIRECTORIES OR NOT POSTGRES_LIBRARIES )
-
-endif ( NOT POSTGRES_INCLUDE_DIRECTORIES OR NOT POSTGRES_LIBRARIES OR NOT POSTGRES_FOUND )
-
-mark_as_advanced( FORCE POSTGRES_INCLUDE_DIRECTORIES )
-mark_as_advanced( FORCE POSTGRES_LIBRARIES )
diff --git a/CMake/KitCommonBlock.cmake b/CMake/KitCommonBlock.cmake
deleted file mode 100644
index b5e0fd831817e1e19c642718f67b863bafad50e6..0000000000000000000000000000000000000000
--- a/CMake/KitCommonBlock.cmake
+++ /dev/null
@@ -1,111 +0,0 @@
-# Setup vtkInstantiator registration for this library's classes.
-VTK_MAKE_INSTANTIATOR3(vtk${KIT}Instantiator KitInstantiator_SRCS
-                       "${Kit_SRCS}"
-                       VTK_${UKIT}_EXPORT
-                       ${VTK_BINARY_DIR} "")
-
-VTK_ADD_LIBRARY(vtk${KIT} ${Kit_SRCS} ${Kit_EXTRA_SRCS} ${KitInstantiator_SRCS})
-SET(KIT_LIBRARY_TARGETS ${KIT_LIBRARY_TARGETS} vtk${KIT})
-
-# accumulate list of kit library target names
-# we export these in VTKConfig as VTK_LIBRARIES.
-set_property(GLOBAL APPEND PROPERTY VTK_LIBRARIES vtk${KIT})
-
-# Add target specific compile flags for ABI setttings
-IF(VTK_ABI_CXX_FLAGS)
-  SET_PROPERTY(TARGET vtk${KIT} APPEND
-    PROPERTY COMPILE_FLAGS "${VTK_ABI_CXX_FLAGS}")
-ENDIF(VTK_ABI_CXX_FLAGS)
-
-# Allow the user to customize their build with some local options
-#
-SET(LOCALUSERMACRODEFINED 0)
-INCLUDE (${VTK_BINARY_DIR}/${KIT}/LocalUserOptions.cmake OPTIONAL)
-INCLUDE (${VTK_SOURCE_DIR}/${KIT}/LocalUserOptions.cmake OPTIONAL)
-
-IF (VTK_WRAP_TCL OR VTK_WRAP_PYTHON OR VTK_WRAP_JAVA)
-  # set the include directories for the wrappers
-  SET(VTK_WRAP_INCLUDE_DIRS
-    ${VTK_INCLUDE_DIRS_BUILD_TREE}
-    ${VTK_INCLUDE_DIRS_SOURCE_TREE}
-    ${VTK_INCLUDE_DIRS_SYSTEM}
-  )
-  # if we are wrapping anything, then build hierarchy files
-  IF(VTK_IGNORE_BTX)
-  SET(KIT_HIERARCHY_FILE ${CMAKE_CURRENT_BINARY_DIR}/vtk${KIT}Hierarchy.txt)
-  VTK_WRAP_HIERARCHY(vtk${KIT}Hierarchy
-    ${CMAKE_CURRENT_BINARY_DIR} "${Kit_SRCS}")
-  ENDIF(VTK_IGNORE_BTX)
-ENDIF (VTK_WRAP_TCL OR VTK_WRAP_PYTHON OR VTK_WRAP_JAVA)
-
-# if we are wrapping into Tcl then add the library and extra
-# source files
-#
-IF (VTK_WRAP_TCL)
-  INCLUDE(KitCommonTclWrapBlock)
-ENDIF (VTK_WRAP_TCL)
-
-# if we are wrapping into Python then add the library and extra
-# source files
-#
-IF (VTK_WRAP_PYTHON)
-  INCLUDE(KitCommonPythonWrapBlock)
-ENDIF (VTK_WRAP_PYTHON)
-
-# if we are wrapping into Java then add the library and extra
-# source files
-#
-IF (VTK_WRAP_JAVA)
-  INCLUDE(KitCommonJavaWrapBlock)
-ENDIF (VTK_WRAP_JAVA)
-
-TARGET_LINK_LIBRARIES(vtk${KIT} ${KIT_INTERFACE_LIBRARIES} ${KIT_LIBS})
-
-IF(NOT VTK_INSTALL_NO_LIBRARIES)
-  INSTALL(TARGETS vtk${KIT}
-    EXPORT ${VTK_INSTALL_EXPORT_NAME}
-    RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
-ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
-IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-  SET(__files.h)
-  FOREACH(__file ${Kit_SRCS})
-    GET_FILENAME_COMPONENT(__fname ${__file} ABSOLUTE)
-    GET_FILENAME_COMPONENT(__fname.path ${__fname} PATH)
-    GET_FILENAME_COMPONENT(__fname.name ${__fname} NAME_WE)
-    IF ( EXISTS "${__fname.path}/${__fname.name}.h" )
-      SET(__files.h ${__files.h} "${__fname.path}/${__fname.name}.h")
-    ENDIF ( EXISTS "${__fname.path}/${__fname.name}.h" )
-  ENDFOREACH(__file)
-  INSTALL(FILES ${__files.h}
-    DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}
-    COMPONENT Development)
-ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-
-IF(Kit_WRAP_HEADERS)
-  SET_SOURCE_FILES_PROPERTIES(${Kit_WRAP_HEADERS} PROPERTIES WRAP_HEADER 1)
-ENDIF(Kit_WRAP_HEADERS)
-SET(TMP_FILES ${Kit_SRCS} ${Kit_WRAP_HEADERS})
-VTK_EXPORT_KIT("${KIT}" "${UKIT}" "${TMP_FILES}")
-
-# If the user defined a custom macro, execute it now and pass in all the srcs
-#
-IF(LOCALUSERMACRODEFINED)
-  LocalUserOptionsMacro( "${Kit_SRCS}"       "${Kit_EXTRA_SRCS}"
-                         "${KitTCL_SRCS}"    "${Kit_TCL_EXTRA_SRCS}"
-                         "${KitJava_SRCS}"   "${Kit_JAVA_EXTRA_SRCS}"
-                         "${KitPython_SRCS}" "${Kit_PYTHON_EXTRA_SRCS}")
-ENDIF(LOCALUSERMACRODEFINED)
-
-
-# Apply user-defined properties to the library targets.
-IF(VTK_LIBRARY_PROPERTIES)
-  SET_TARGET_PROPERTIES(${KIT_LIBRARY_TARGETS} PROPERTIES
-    ${VTK_LIBRARY_PROPERTIES}
-    )
-ENDIF(VTK_LIBRARY_PROPERTIES)
-# Mark KIT_INTERFACE_LIBRARIES as LINK_INTERFACE_LIBRARIES such that any executable
-# or library that links vtk${KIT} also links against KIT_INTERFACE_LIBRARIES
-TARGET_LINK_LIBRARIES(vtk${KIT} LINK_INTERFACE_LIBRARIES ${KIT_INTERFACE_LIBRARIES})
-
diff --git a/CMake/KitCommonJavaWrapBlock.cmake b/CMake/KitCommonJavaWrapBlock.cmake
deleted file mode 100644
index 66495a87b44e947cc4ae996a52d715c2f3fb8388..0000000000000000000000000000000000000000
--- a/CMake/KitCommonJavaWrapBlock.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-VTK_WRAP_JAVA3(vtk${KIT}Java KitJava_SRCS "${Kit_SRCS};${Kit_JAVA_EXTRA_WRAP_SRCS}")
-VTK_ADD_LIBRARY(vtk${KIT}Java SHARED ${KitJava_SRCS} ${Kit_JAVA_EXTRA_SRCS})
-# Force JavaClasses to build in the right order by adding a depenency.
-ADD_DEPENDENCIES(vtk${KIT}JavaJavaClasses vtk${KIT}Java)
-SET(KIT_LIBRARY_TARGETS ${KIT_LIBRARY_TARGETS} vtk${KIT}Java)
-TARGET_LINK_LIBRARIES(vtk${KIT}Java vtk${KIT} ${KIT_JAVA_LIBS})
-IF(NOT VTK_INSTALL_NO_LIBRARIES)
-  INSTALL(TARGETS vtk${KIT}Java
-    EXPORT ${VTK_INSTALL_EXPORT_NAME}
-    RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
-ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
-ADD_DEPENDENCIES(vtk${KIT}Java vtk${KIT})
-IF(KIT_JAVA_DEPS)
-  ADD_DEPENDENCIES(vtk${KIT}Java ${KIT_JAVA_DEPS})
-ENDIF(KIT_JAVA_DEPS)
-
diff --git a/CMake/KitCommonPythonWrapBlock.cmake b/CMake/KitCommonPythonWrapBlock.cmake
deleted file mode 100644
index 82462f236a6e291fbe4e4f4c8aa56407aa3085d4..0000000000000000000000000000000000000000
--- a/CMake/KitCommonPythonWrapBlock.cmake
+++ /dev/null
@@ -1,99 +0,0 @@
-# Create custom commands to generate the python wrappers for this kit.
-SET(TMP_WRAP_FILES ${Kit_SRCS} ${Kit_WRAP_HEADERS})
-VTK_WRAP_PYTHON3(vtk${KIT}Python KitPython_SRCS "${TMP_WRAP_FILES}")
-
-INCLUDE_DIRECTORIES("${PYTHON_INCLUDE_PATH}")
-
-# Create a shared library containing the python wrappers.  Executables
-# can link to this but it is not directly loaded dynamically as a
-# module.
-VTK_ADD_LIBRARY(vtk${KIT}PythonD ${KitPython_SRCS} ${Kit_PYTHON_EXTRA_SRCS})
-TARGET_LINK_LIBRARIES(
-  vtk${KIT}PythonD vtk${KIT} vtkPythonCore ${KIT_PYTHON_LIBS})
-IF(NOT VTK_INSTALL_NO_LIBRARIES)
-  INSTALL(TARGETS vtk${KIT}PythonD
-    EXPORT ${VTK_INSTALL_EXPORT_NAME}
-    RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
-  SET(KIT_LIBRARY_TARGETS ${KIT_LIBRARY_TARGETS} vtk${KIT}PythonD)
-ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
-
-IF(VTK_WRAP_PYTHON_SIP)
-  INCLUDE(${VTK_CMAKE_DIR}/vtkWrapPythonSIP.cmake)
-  VTK_CREATE_SIP_MODULE(${KIT} "${Kit_SRCS}")
-ENDIF(VTK_WRAP_PYTHON_SIP)
-
-
-# Underlinking on purpose. The following library will not compile
-# with LDFLAGS=-Wl,--no-undefined by design:
-# On some UNIX platforms the python library is static and therefore
-# should not be linked into the shared library.  Instead the symbols
-# are exported from the python executable so that they can be used by
-# shared libraries that are linked or loaded.  On Windows and OSX we
-# want to link to the python libray to resolve its symbols
-# immediately.
-#IF(WIN32 OR APPLE)
-#  TARGET_LINK_LIBRARIES (vtk${KIT}PythonD ${VTK_PYTHON_LIBRARIES})
-#ENDIF(WIN32 OR APPLE)
-
-# Add a top-level dependency on the main kit library.  This is needed
-# to make sure no python source files are generated until the
-# hierarchy file is built (it is built when the kit library builds)
-ADD_DEPENDENCIES(vtk${KIT}PythonD vtk${KIT})
-
-# Add dependencies that may have been generated by VTK_WRAP_PYTHON3 to
-# the python wrapper library.  This is needed for the
-# pre-custom-command hack in Visual Studio 6.
-IF(KIT_PYTHON_DEPS)
-  ADD_DEPENDENCIES(vtk${KIT}PythonD ${KIT_PYTHON_DEPS})
-ENDIF(KIT_PYTHON_DEPS)
-
-# Create a python module that can be loaded dynamically.  It links to
-# the shared library containing the wrappers for this kit.
-PYTHON_ADD_MODULE(vtk${KIT}Python vtk${KIT}PythonInit.cxx)
-IF(PYTHON_ENABLE_MODULE_vtk${KIT}Python)
-  TARGET_LINK_LIBRARIES(vtk${KIT}Python vtk${KIT}PythonD)
-  
-  # Python extension modules on Windows must have the extension ".pyd"
-  # instead of ".dll" as of Python 2.5.  Older python versions do support
-  # this suffix.
-  IF(WIN32 AND NOT CYGWIN)
-    SET_TARGET_PROPERTIES(vtk${KIT}Python PROPERTIES SUFFIX ".pyd")
-  ENDIF(WIN32 AND NOT CYGWIN)
-
-  # Make sure that no prefix is set on the library
-  SET_TARGET_PROPERTIES(vtk${KIT}Python PROPERTIES PREFIX "")
-
-  # Compatibility for projects that still expect the "lib" prefix
-  IF(CYGWIN OR NOT WIN32)
-    SET(suf ${CMAKE_SHARED_MODULE_SUFFIX})
-    SET(src vtk${KIT}Python${suf})
-    SET(tgt ${LIBRARY_OUTPUT_PATH}/libvtk${KIT}Python${suf})
-    ADD_CUSTOM_COMMAND(TARGET vtk${KIT}Python POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -E create_symlink ${src} ${tgt})
-  ENDIF(CYGWIN OR NOT WIN32)
-
-  # The python modules are installed by a setup.py script which does
-  # not know how to adjust the RPATH field of the binary.  Therefore
-  # we must simply build the modules with no RPATH at all.  The
-  # vtkpython executable in the build tree should have the needed
-  # RPATH anyway.
-  SET_TARGET_PROPERTIES(vtk${KIT}Python PROPERTIES SKIP_BUILD_RPATH 1)
-  
-  IF(WIN32 OR APPLE)
-    TARGET_LINK_LIBRARIES (vtk${KIT}Python ${VTK_PYTHON_LIBRARIES})
-  ENDIF(WIN32 OR APPLE)
-
-  # Generally the pyhon extension module created is installed using setup.py.
-  # However projects that include VTK (such as ParaView) can override this
-  # behaviour by not using setup.py, instead directly installing the extension
-  # module at the same location as other libraries.
-  IF (VTK_INSTALL_PYTHON_USING_CMAKE AND NOT VTK_INSTALL_NO_LIBRARIES)
-    INSTALL(TARGETS vtk${KIT}Python
-      EXPORT ${VTK_INSTALL_EXPORT_NAME}
-      RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-      LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-      ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
-  ENDIF (VTK_INSTALL_PYTHON_USING_CMAKE AND NOT VTK_INSTALL_NO_LIBRARIES)
-ENDIF(PYTHON_ENABLE_MODULE_vtk${KIT}Python)
diff --git a/CMake/KitCommonTclWrapBlock.cmake b/CMake/KitCommonTclWrapBlock.cmake
deleted file mode 100644
index a12ecf9d8c6a03dd7dfd35a928c586911c3423d2..0000000000000000000000000000000000000000
--- a/CMake/KitCommonTclWrapBlock.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-VTK_WRAP_TCL3(vtk${KIT}TCL KitTCL_SRCS
-  "${Kit_SRCS}"
-  "${Kit_TCL_EXTRA_CMDS}")
-VTK_ADD_LIBRARY(vtk${KIT}TCL ${KitTCL_SRCS} ${Kit_TCL_EXTRA_SRCS})
-SET(KIT_LIBRARY_TARGETS ${KIT_LIBRARY_TARGETS} vtk${KIT}TCL)
-TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS})
-IF(NOT VTK_INSTALL_NO_LIBRARIES)
-  INSTALL(TARGETS vtk${KIT}TCL
-    EXPORT ${VTK_INSTALL_EXPORT_NAME}
-    RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
-ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
-ADD_DEPENDENCIES(vtk${KIT}TCL vtk${KIT})
-IF(KIT_TCL_DEPS)
-  ADD_DEPENDENCIES(vtk${KIT}TCL ${KIT_TCL_DEPS})
-ENDIF(KIT_TCL_DEPS)
-
diff --git a/CMake/vtkHDF5Library.cmake b/CMake/vtkHDF5Library.cmake
deleted file mode 100644
index 9319b1c62de8a70253fce6e00388caa35f901b47..0000000000000000000000000000000000000000
--- a/CMake/vtkHDF5Library.cmake
+++ /dev/null
@@ -1,79 +0,0 @@
-#########################################################################
-# Configure HDF5
-
-IF(NOT VTK_USE_SYSTEM_HDF5)
-
-  # Tell hdf5 that we are manually overriding certain settings
-  SET(HDF5_EXTERNALLY_CONFIGURED ON)
-  # Avoid duplicating names of installed libraries
-  SET(HDF5_EXTERNAL_LIB_PREFIX "vtk")
-  # Export configuration to this export variable
-  SET(HDF5_EXPORTED_TARGETS ${VTK_INSTALL_EXPORT_NAME})
-  
-  # Silence HDF5's warnings. We'll let them get fixed upstream
-  # and merge in updates as necessary.
-  SET(HDF5_DISABLE_COMPILER_WARNINGS ON CACHE BOOL "Disable HDF5 warnings" FORCE)
-
-  SET(HDF5_INSTALL_NO_DEVELOPMENT ${VTK_INSTALL_NO_DEVELOPMENT})
-  SET(HDF5_INSTALL_BIN_DIR ${VTK_INSTALL_BIN_DIR})
-  SET(HDF5_INSTALL_LIB_DIR ${VTK_INSTALL_LIB_DIR})
-  SET(HDF5_INSTALL_INCLUDE_DIR ${VTK_INSTALL_INCLUDE_DIR})
-
-  SET(HDF5_ENABLE_Z_LIB_SUPPORT ON CACHE BOOL "Enable Zlib Filters" FORCE)
-  SET(HDF5_BUILD_HL_LIB ON CACHE BOOL "Build HIGH Level HDF5 Library" FORCE)
-
-  # Setup all necessary overrides for zlib so that HDF5 uses our
-  # internally compiled zlib rather than any other version
-  IF(HDF5_ENABLE_Z_LIB_SUPPORT)
-    # We must tell the main HDF5 library that it depends on our zlib
-    SET(HDF5_LIB_DEPENDENCIES vtkzlib)
-    # Override the zlib header file
-    IF(VTK_USE_SYSTEM_ZLIB)
-      SET(H5_ZLIB_HEADER "zlib.h")
-    ELSE(VTK_USE_SYSTEM_ZLIB)
-      SET(H5_ZLIB_HEADER "vtk_zlib.h")
-      # Set vars that FindZlib would have set if used in sub project
-      SET(ZLIB_INCLUDE_DIRS "${VTK_ZLIB_INCLUDE_DIRS}")
-      SET(ZLIB_LIBRARIES vtkzlib)
-    ENDIF(VTK_USE_SYSTEM_ZLIB)
-  ENDIF(HDF5_ENABLE_Z_LIB_SUPPORT)
-
-  LIST(APPEND VTK_HDF5_LIBRARIES vtkhdf5_hl)
-
-  MARK_AS_ADVANCED(
-    H5_SET_LIB_OPTIONS
-    H5_LEGACY_NAMING
-    HDF5_ENABLE_COVERAGE
-    HDF5_DISABLE_COMPILER_WARNINGS
-    HDF5_ENABLE_PARALLEL
-    HDF5_USE_16_API_DEFAULT
-    HDF5_USE_FILTER_FLETCHER32
-    HDF5_USE_FILTER_NBIT
-    HDF5_USE_FILTER_SCALEOFFSET
-    HDF5_USE_FILTER_SHUFFLE
-    HDF5_ENABLE_Z_LIB_SUPPORT
-    HDF5_ENABLE_SZIP_SUPPORT
-    HDF5_ENABLE_SZIP_ENCODING
-    HDF5_ENABLE_THREADSAFE
-    HDF5_ENABLE_TRACE
-    HDF5_USE_H5DUMP_PACKED_BITS
-    HDF5_BUILD_FORTRAN
-    HDF5_BUILD_EXAMPLES
-    HDF5_BUILD_CPP_LIB
-    HDF5_BUILD_TOOLS
-    HDF5_BUILD_HL_LIB
-    HDF5_Enable_Clear_File_Buffers
-    HDF5_Enable_Instrument
-    HDF5_STRICT_FORMAT_CHECKS
-    HDF5_METADATA_TRACE_FILE
-    HDF5_WANT_DATA_ACCURACY
-    HDF5_WANT_DCONV_EXCEPTION
-    HDF5_ENABLE_LARGE_FILE
-    HDF5_STREAM_VFD
-    HDF5_ENABLE_HSIZET
-    H5_SET_LIB_OPTIONS
-    HDF5_BUILD_WITH_INSTALL_NAME
-    HDF5_PACKAGE_EXTLIBS
-    )
-
-ENDIF(NOT VTK_USE_SYSTEM_HDF5)
diff --git a/CMake/vtkTargetExportMacros.cmake b/CMake/vtkTargetExportMacros.cmake
deleted file mode 100644
index a6420c1360cd2ac00901ff872ab1fef5708c009f..0000000000000000000000000000000000000000
--- a/CMake/vtkTargetExportMacros.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-if(NOT VTK_INSTALL_EXPORT_NAME)
-  set(VTK_INSTALL_EXPORT_NAME VTKTargets)
-endif()
-
-MACRO(VTK_ADD_LIBRARY name)
-  add_library(${name} ${ARGN})
-  if (NOT VTK_INSTALL_NO_LIBRARIES)
-    set_property(GLOBAL APPEND PROPERTY VTK_TARGETS ${name})
-  endif (NOT VTK_INSTALL_NO_LIBRARIES)
-ENDMACRO(VTK_ADD_LIBRARY)
-
-MACRO(VTK_ADD_EXECUTABLE name)
-  if(UNIX AND VTK_BUILD_FORWARDING_EXECUTABLES)
-    vtk_add_executable_with_forwarding(VTK_EXE_SUFFIX ${name} ${ARGN})
-    set_property(GLOBAL APPEND PROPERTY VTK_TARGETS ${name})
-  else()
-    add_executable(${name} ${ARGN})
-    set_property(GLOBAL APPEND PROPERTY VTK_TARGETS ${name})
-  endif()
-ENDMACRO(VTK_ADD_EXECUTABLE)
diff --git a/Charts/CMakeLists.txt b/Charts/CMakeLists.txt
deleted file mode 100644
index 7d44f97f816e562b32842336a0050a3eb8e285dc..0000000000000000000000000000000000000000
--- a/Charts/CMakeLists.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-SET(KIT Charts)
-SET(UKIT CHARTS)
-
-SET(KIT_TCL_LIBS vtkViewsTCL ${VTK_TK_LIBRARIES})
-SET(KIT_PYTHON_LIBS vtkViewsPythonD)
-SET(KIT_JAVA_LIBS vtkViewsJava)
-
-IF (JAVA_AWT_LIBRARY)
-  SET(KIT_JAVA_LIBS ${KIT_JAVA_LIBS} ${JAVA_AWT_LIBRARY})
-ENDIF (JAVA_AWT_LIBRARY)
-
-SET(KIT_INTERFACE_LIBRARIES vtkViews)
-SET(KIT_LIBS vtkftgl)
-
-SET(Kit_SRCS
-  vtkAbstractContextBufferId.cxx
-  vtkAbstractContextItem.cxx
-  vtkAxis.cxx
-  vtkAxisExtended.cxx
-  vtkBlockItem.cxx
-  vtkBrush.cxx
-  vtkChart.cxx
-  vtkChartLegend.cxx
-  vtkChartHistogram2D.cxx
-  vtkChartMatrix.cxx
-  vtkChartParallelCoordinates.cxx
-  vtkChartXY.cxx
-  vtkChartXYZ.cxx
-  vtkChartPie.cxx
-  vtkColorLegend.cxx
-  vtkPlotPie.cxx
-  vtkColorSeries.cxx
-  vtkColorTransferFunctionItem.cxx
-  vtkColorTransferControlPointsItem.cxx
-  vtkCompositeControlPointsItem.cxx
-  vtkCompositeTransferFunctionItem.cxx
-  vtkContext2D.cxx
-  vtkContext3D.cxx
-  vtkContextActor.cxx
-  vtkContextBufferId.cxx
-  vtkContextClip.cxx
-  vtkContextDevice2D.cxx
-  vtkContextDevice3D.cxx
-  vtkContextInteractorStyle.cxx
-  vtkContextItem.cxx
-  vtkContextKeyEvent.cxx
-  vtkContextMapper2D.cxx
-  vtkContextMouseEvent.cxx
-  vtkContextScene.cxx
-  vtkContextTransform.cxx
-  vtkContextView.cxx
-  vtkControlPointsItem.cxx
-  vtkImageItem.cxx
-  vtkLookupTableItem.cxx
-  vtkOpenGLContextBufferId.cxx
-  vtkOpenGL2ContextDevice2D.cxx
-  vtkOpenGLContextDevice2D.cxx
-  vtkOpenGLContextDevice3D.cxx
-  vtkPen.cxx
-  vtkPiecewiseControlPointsItem.cxx
-  vtkPiecewiseFunctionItem.cxx
-  vtkPiecewisePointHandleItem.cxx
-  vtkPlot.cxx
-  vtkPlotBar.cxx
-  vtkPlotGrid.cxx
-  vtkPlotHistogram2D.cxx
-  vtkPlotLine.cxx
-  vtkPlotStacked.cxx
-  vtkPlotParallelCoordinates.cxx
-  vtkPlotPoints.cxx
-  vtkScalarsToColorsItem.cxx
-  vtkScatterPlotMatrix.cxx
-  vtkTooltipItem.cxx
-  )
-
-SET_SOURCE_FILES_PROPERTIES(
-  vtkAbstractContextBufferId
-  vtkAbstractContextItem
-  vtkChart
-  vtkContextDevice2D
-  vtkContextDevice3D
-  vtkContextItem
-  vtkContextMapper2D
-  vtkControlPointsItem
-  vtkPlot
-  vtkScalarsToColorsItem
-  ABSTRACT
-  )
-
-SET_SOURCE_FILES_PROPERTIES(
-  vtkAbstractContextBufferId
-  vtkContextBufferId
-  vtkContextKeyEvent
-  vtkContextMouseEvent
-  vtkChartColors
-  vtkOpenGLContextBufferId
-  vtkOpenGL2ContextDevice2D
-  vtkOpenGLContextDevice2D
-  vtkOpenGLContextDevice3D
-  WRAP_EXCLUDE
-)
-
-# Need to be able to include QApplication if Qt is used for runtime checks
-IF(VTK_USE_QT)
-  SET(QT_DONT_USE_QTGUI)
-  INCLUDE(${QT_USE_FILE})
-  IF (APPLE)
-    LIST (APPEND KIT_INTERFACE_LIBRARIES ${QT_LIBRARIES})
-  ELSE (APPLE)
-    LIST (APPEND KIT_LIBS ${QT_LIBRARIES})
-  ENDIF (APPLE)
-ENDIF(VTK_USE_QT)
-
-#-----------------------------------------------------------------------------
-# Include CMake code common to all kits.
-INCLUDE(${VTK_CMAKE_DIR}/KitCommonBlock.cmake)
-#-----------------------------------------------------------------------------
diff --git a/Charts/Testing/CMakeLists.txt b/Charts/Testing/CMakeLists.txt
deleted file mode 100644
index 40f55b830de000ef28c897d29ce8b427edfe6643..0000000000000000000000000000000000000000
--- a/Charts/Testing/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-ADD_SUBDIRECTORY(Cxx)
-
-#IF (VTK_WRAP_TCL)
-#  ADD_SUBDIRECTORY(Tcl)
-#ENDIF (VTK_WRAP_TCL)
-
-IF(VTK_WRAP_PYTHON)
-  ADD_SUBDIRECTORY(Python)
-ENDIF(VTK_WRAP_PYTHON)
-
-IF(PYTHON_EXECUTABLE)
-  ADD_TEST(HeaderTesting-Charts ${PYTHON_EXECUTABLE}
-    ${VTK_SOURCE_DIR}/Common/Testing/HeaderTesting.py
-    "${VTK_SOURCE_DIR}/Charts"
-    VTK_CHARTS_EXPORT
-    vtkContextKeyEvent.h
-    vtkContextMouseEvent.h
-    vtkContextScenePrivate.h
-    vtkOpenGLContextDevice2DPrivate.h
-    )
-ENDIF(PYTHON_EXECUTABLE)
diff --git a/Charts/Testing/Python/CMakeLists.txt b/Charts/Testing/Python/CMakeLists.txt
deleted file mode 100644
index d7722b9ff134efb29a9532e25be33d65ebc0be7d..0000000000000000000000000000000000000000
--- a/Charts/Testing/Python/CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-
-  IF(VTK_PYTHON_EXE)
-    SET(tests)
-    IF(VTK_DATA_ROOT)
-      # Tests written in Python that require VTKData
-      # These tests should use vtk.test.Testing.
-      SET(tests
-        ${tests}
-        TestBarGraph
-        TestLinePlot
-        TestStackedPlot
-        TestLinePlotColors
-        TestParallelCoordinatesColors
-        TestScatterPlotColors
-      )
-    ELSE()
-      # Tests written in Python that do NOT require VTKData
-      # These tests should use vtk.test.Testing.
-      SET(tests
-        ${tests}
-      )
-    ENDIF()
-    IF(tests)
-      FOREACH(tfile ${tests})
-        ADD_TEST(Charts-${tfile}Python ${VTK_PYTHON_EXE}
-          ${VTK_SOURCE_DIR}/Charts/Testing/Python/${tfile}.py
-          -D ${VTK_DATA_ROOT}
-          -B ${VTK_DATA_ROOT}/Baseline/Charts)
-      ENDFOREACH()
-    ENDIF()
-  ENDIF()
-ENDIF()
diff --git a/Chemistry/Testing/CMakeLists.txt b/Chemistry/Testing/CMakeLists.txt
deleted file mode 100644
index 08f15ee14df91635332186455b3ed55f21396888..0000000000000000000000000000000000000000
--- a/Chemistry/Testing/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-ADD_SUBDIRECTORY(Cxx)
diff --git a/Chemistry/Testing/Cxx/CMakeLists.txt b/Chemistry/Testing/Cxx/CMakeLists.txt
deleted file mode 100644
index ee09d0a6c64d2a42b2c2a5b3191bb82cff5b9324..0000000000000000000000000000000000000000
--- a/Chemistry/Testing/Cxx/CMakeLists.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-IF (VTK_USE_RENDERING AND VTK_USE_CHEMISTRY)
-
-  SET(KIT Chemistry)
-
-  SET(MyTests
-    TestBallAndStick.cxx
-    TestBondColorModeDiscreteByAtom.cxx
-    TestBondColorModeSingleColor.cxx
-    TestCompositeRender.cxx
-    TestFastRender.cxx
-    TestLiquoriceSticks.cxx
-    TestMolecule.cxx
-    TestMoleculeSelection.cxx
-    TestMultiCylinderOn.cxx
-    TestMultiCylinderOff.cxx
-    TestPeriodicTable.cxx
-    TestProgrammableElectronicData.cxx
-    TestSimpleBondPerceiver.cxx
-    TestVDWSpheres.cxx
-    )
-
-  # Tests with data
-  IF(VTK_DATA_ROOT)
-    SET(MyTests
-      ${MyTests}
-      TestCMLMoleculeReader.cxx
-      )
-    IF(VTK_USE_OPENQUBE)
-      INCLUDE(${QT_USE_FILE})
-      # Add Eigen to the include path for the OpenQube headers
-      INCLUDE_DIRECTORIES(${EIGEN2_INCLUDE_DIR})
-      SET(MyTests
-        ${MyTests}
-        TestOpenQubeElectronicData.cxx
-        TestOpenQubeMOPACDensity.cxx
-        TestOpenQubeMOPACOrbital.cxx
-      )
-    ENDIF(VTK_USE_OPENQUBE)
-  ENDIF(VTK_DATA_ROOT)
-
-  # Use the testing object factory, to reduce boilerplate code in tests.
-  INCLUDE("${VTK_SOURCE_DIR}/Rendering/vtkTestingObjectFactory.cmake")
-  ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
-  TARGET_LINK_LIBRARIES(${KIT}CxxTests
-                        vtkChemistry
-                        vtkRendering
-                        vtkVolumeRendering)
-
-  SET (TestsToRun ${Tests})
-  REMOVE (TestsToRun ${KIT}CxxTests.cxx)
-
-  # Add all the executables
-  FOREACH (test ${TestsToRun})
-    GET_FILENAME_COMPONENT(TName ${test} NAME_WE)
-    IF (VTK_DATA_ROOT)
-      IF(${${TName}Error})
-        SET(_error_threshold ${${TName}Error})
-      ELSE()
-        SET(_error_threshold 10)
-      ENDIF()
-      ADD_TEST(Chemistry-${TName} ${CXX_TEST_PATH}/${KIT}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
-        -V Baseline/${KIT}/${TName}.png
-        -E ${_error_threshold})
-    ELSE (VTK_DATA_ROOT)
-      ADD_TEST(Chemistry-${TName} ${CXX_TEST_PATH}/${KIT}CxxTests ${TName})
-    ENDIF (VTK_DATA_ROOT)
-  ENDFOREACH (test)
-
-ENDIF (VTK_USE_RENDERING AND VTK_USE_CHEMISTRY)
diff --git a/Common/Testing/CMakeLists.txt b/Common/Testing/CMakeLists.txt
deleted file mode 100644
index 48dcae9179d2c319ab2bdb08a8987bb1b8df8ee1..0000000000000000000000000000000000000000
--- a/Common/Testing/CMakeLists.txt
+++ /dev/null
@@ -1,170 +0,0 @@
-ADD_SUBDIRECTORY(Cxx)
-
-IF (VTK_WRAP_TCL)
-  ADD_SUBDIRECTORY(Tcl)
-ENDIF (VTK_WRAP_TCL)
-
-IF (VTK_WRAP_PYTHON)
-  ADD_SUBDIRECTORY(Python)
-ENDIF (VTK_WRAP_PYTHON)
-
-IF(PYTHON_EXECUTABLE)
-  ADD_TEST(HeaderTesting-Common ${PYTHON_EXECUTABLE}
-    ${VTK_SOURCE_DIR}/Common/Testing/HeaderTesting.py
-    "${VTK_SOURCE_DIR}/Common"
-    VTK_COMMON_EXPORT
-    vtkABI.h
-    vtkAbstractIterator.h
-    vtkAbstractList.h
-    vtkAbstractMap.h
-    vtkArray.h
-    vtkArrayCoordinateIterator.h
-    vtkArrayCoordinates.h
-    vtkArrayExtents.h
-    vtkArrayExtentsList.h
-    vtkArrayInterpolate.h
-    vtkArrayIteratorIncludes.h
-    vtkArrayIteratorTemplate.h
-    vtkArrayMap.h
-    vtkArrayMapIterator.h
-    vtkArrayPrint.h
-    vtkArrayRange.h
-    vtkArraySort.h
-    vtkArrayWeights.h
-    vtkAssemblyPaths.h
-    vtkBoundingBox.h
-    vtkBreakPoint.h
-    vtkByteSwap.h
-    vtkCallbackCommand.h
-    vtkColor.h
-    vtkCommand.h
-    vtkCommonInformationKeyManager.h
-    vtkContainer.h
-    vtkDataArrayCollection.h
-    vtkDataArrayTemplate.h
-    vtkDebugLeaks.h
-    vtkDebugLeaksManager.h
-    vtkDenseArray.h
-    vtkDynamicLoader.h
-    vtkErrorCode.h
-    vtkEventForwarderCommand.h
-    vtkFloatingPointExceptions.h
-    vtkGarbageCollector.h
-    vtkGarbageCollectorManager.h
-    vtkHashMap.h
-    vtkHashMapIterator.h
-    vtkIOStream.h
-    vtkIOStreamFwd.h
-    vtkIdListCollection.h
-    vtkImplicitFunctionCollection.h
-    vtkIndent.h
-    vtkInformation.h
-    vtkInformationInternals.h
-    vtkJavaAwt.h
-    vtkJavaUtil.h
-    vtkLargeInteger.h
-    vtkLinkedList.h
-    vtkLinkedListIterator.h
-    vtkMathUtilities.h
-    vtkNew.h
-    vtkOStrStreamWrapper.h
-    vtkOStreamWrapper.h
-    vtkObject.h
-    vtkObjectBase.h
-    vtkObjectFactoryCollection.h
-    vtkOldStyleCallbackCommand.h
-    vtkOnePieceExtentTranslator.h
-    vtkOverrideInformationCollection.h
-    vtkPlaneCollection.h
-    vtkPropCollection.h
-    vtkPythonCommand.h
-    vtkRayCastStructures.h
-    vtkRect.h
-    vtkRungeKutta2.h 
-    vtkSetGet.h
-    vtkSmartPointer.h
-    vtkSmartPointerBase.h
-    vtkSparseArray.h
-    vtkStdString.h
-    vtkStructuredData.h
-    vtkSystemIncludes.h
-    vtkTcl.h
-    vtkTclUtil.h
-    vtkTemplateAliasMacro.h
-    vtkTimeStamp.h
-    vtkTk.h
-    vtkTransformCollection.h
-    vtkTryDowncast.h
-    vtkType.h
-    vtkTypeTemplate.h
-    vtkTypeTraits.h
-    vtkTypedArray.h
-    vtkUnicodeString.h
-    vtkVariant.h
-    vtkVariantBoostSerialization.h
-    vtkVariantCast.h
-    vtkVariantCreate.h
-    vtkVariantExtract.h
-    vtkVariantInlineOperators.h
-    vtkVector.h
-    vtkTuple.h
-    vtkVectorIterator.h
-    vtkVectorOperators.h
-    vtkVersion.h
-    vtkWeakPointer.h
-    vtkWeakPointerBase.h
-    vtkWin32Header.h
-    vtkWindows.h
-    vtkXMLFileOutputWindow.h
-    )
-ENDIF(PYTHON_EXECUTABLE)
-
-#-----------------------------------------------------------------------------
-# Configure the VTK install test.  It is enabled only if the install
-# prefix is set to an InstallTest/Root directory under the top of the build
-# tree.  Note that the install prefix used for the install test must
-# not be a 1-level deep subdirectory under the top of the build tree.
-# If it were such then a few executables may be confused into thinking
-# they are running from the build tree instead of the install tree.
-IF(WIN32 OR APPLE)
-  STRING(TOLOWER "${CMAKE_INSTALL_PREFIX}" VTK_TEST_INSTALL_LEFT)
-  STRING(TOLOWER "${VTK_BINARY_DIR}/InstallTest/Root" VTK_TEST_INSTALL_RIGHT)
-ELSE(WIN32 OR APPLE)
-  SET(VTK_TEST_INSTALL_LEFT "${CMAKE_INSTALL_PREFIX}")
-  SET(VTK_TEST_INSTALL_RIGHT "${VTK_BINARY_DIR}/InstallTest/Root")
-ENDIF(WIN32 OR APPLE)
-STRING(COMPARE EQUAL "${VTK_TEST_INSTALL_LEFT}" "${VTK_TEST_INSTALL_RIGHT}"
-  VTK_TEST_INSTALL)
-
-# We cannot safely implement the install test unless the configuration
-# type is known when the test is run.
-IF(NOT VTK_TEST_CONFIG_TYPE_KNOWN)
-  SET(VTK_TEST_INSTALL 0)
-ENDIF(NOT VTK_TEST_CONFIG_TYPE_KNOWN)
-
-IF(VTK_TEST_INSTALL)
-  IF(CMAKE_CONFIGURATION_TYPES)
-    # There are multiple configurations.  Make sure the tested
-    # configuration is the one that is installed.
-    SET(DOLLAR "$")
-    SET(VTK_INSTALL_TEST_CONFIG_TYPE -C "${DOLLAR}{CTEST_CONFIGURATION_TYPE}")
-  ELSE(CMAKE_CONFIGURATION_TYPES)
-    # There is only one configuration.  It will be installed.
-    SET(VTK_INSTALL_TEST_CONFIG_TYPE)
-  ENDIF(CMAKE_CONFIGURATION_TYPES)
-
-  # Add a test to install VTK through the build system install target.
-  ADD_TEST(Install
-    ${CMAKE_CTEST_COMMAND}
-    ${VTK_INSTALL_TEST_CONFIG_TYPE}
-    --build-and-test ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}
-    --build-generator ${CMAKE_GENERATOR}
-    --build-project VTK
-    --build-makeprogram ${CMAKE_MAKE_PROGRAM}
-    --build-noclean
-    --build-target install)
-ENDIF(VTK_TEST_INSTALL)
-
-# Suppress memory checking of some tests
-CONFIGURE_FILE(${VTK_SOURCE_DIR}/Common/Testing/CTestCustom.ctest.in
-  ${VTK_BINARY_DIR}/Common/Testing/CTestCustom.ctest @ONLY)
diff --git a/Common/Testing/CTestCustom.ctest.in b/Common/Testing/CTestCustom.ctest.in
deleted file mode 100644
index 1c03872617f95e4cf518a6e262547c839425c510..0000000000000000000000000000000000000000
--- a/Common/Testing/CTestCustom.ctest.in
+++ /dev/null
@@ -1,41 +0,0 @@
-SET(CTEST_CUSTOM_MEMCHECK_IGNORE
-  ${CTEST_CUSTOM_MEMCHECK_IGNORE}
-  HeaderTesting-Common
-  HeaderTesting-GenericFiltering
-  HeaderTesting-Filtering
-  HeaderTesting-Graphics
-  HeaderTesting-Hybrid
-  HeaderTesting-IO
-  HeaderTesting-Imaging
-  HeaderTesting-Parallel
-  HeaderTesting-Rendering
-  PrintSelf-Common
-  PrintSelf-GenericFiltering
-  PrintSelf-Filtering
-  PrintSelf-Graphics
-  PrintSelf-Hybrid
-  PrintSelf-IO
-  PrintSelf-Imaging
-  PrintSelf-Parallel
-  PrintSelf-Rendering
-  SystemInformation
-  TestSetObjectMacro-Common
-  TestSetObjectMacro-GenericFiltering
-  TestSetObjectMacro-Filtering
-  TestSetObjectMacro-Graphics
-  TestSetObjectMacro-Hybrid
-  TestSetObjectMacro-IO
-  TestSetObjectMacro-Imaging
-  TestSetObjectMacro-Parallel
-  TestSetObjectMacro-Rendering
-  Install
-  Example-vtkMy
-  )
-
-SET(CTEST_CUSTOM_MEMCHECK_IGNORE
-  ${CTEST_CUSTOM_MEMCHECK_IGNORE}
-  largeImageOffset-image
-  largeImageParallel-image
-  Sockets-image
-  )
-
diff --git a/Common/Testing/Python/CMakeLists.txt b/Common/Testing/Python/CMakeLists.txt
deleted file mode 100644
index 2210436af716ab85eae0668a7ba2abe580dd953f..0000000000000000000000000000000000000000
--- a/Common/Testing/Python/CMakeLists.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Add tests, with the data
-#
-IF (VTK_PYTHON_EXE)
-  FOREACH ( tfile
-      PythonSmoke
-      TestArrayArguments
-      TestCommand
-      TestGhost
-      TestMutable
-      TestSubClass
-      TestTemplates
-      TestWeakref
-      TestNumpySupport
-      TestTerminationCrash
-      TestExecuteMethodFinalizeCrash
-      TestIgnoreBTX
-      )
-    ADD_TEST(${tfile}Python ${VTK_PYTHON_EXE}
-      ${VTK_SOURCE_DIR}/Common/Testing/Python/${tfile}.py)
-  ENDFOREACH( tfile )
-  IF (VTK_USE_N_WAY_ARRAYS)
-    FOREACH ( tfile
-      TestStrings
-      TestVariant
-      TestOperators
-      )
-      ADD_TEST(${tfile}Python ${VTK_PYTHON_EXE}
-        ${VTK_SOURCE_DIR}/Common/Testing/Python/${tfile}.py)
-    ENDFOREACH ( tfile )
-  ENDIF (VTK_USE_N_WAY_ARRAYS)
-ENDIF (VTK_PYTHON_EXE)
diff --git a/Common/Testing/Tcl/CMakeLists.txt b/Common/Testing/Tcl/CMakeLists.txt
deleted file mode 100644
index 57e4f4aa9622d85476e3b0cee3a3db6b22c8eb20..0000000000000000000000000000000000000000
--- a/Common/Testing/Tcl/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-ADD_TEST(otherInterp ${VTK_EXECUTABLE}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/otherInterp.tcl
-         -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-ADD_TEST(otherPrint ${VTK_EXECUTABLE}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/otherPrint.tcl
-         -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-ADD_TEST(TestEmptyInput ${VTK_EXECUTABLE}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/TestEmptyInput.tcl
-         -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-ADD_TEST(TestSetGet ${VTK_EXECUTABLE}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/TestSetGet.tcl
-         -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-ADD_TEST(TestArrays ${VTK_EXECUTABLE}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/TestArrays.tcl
-         -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-ADD_TEST(TestString ${VTK_EXECUTABLE}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/TestString.tcl)
-ADD_TEST(TestIgnoreBTX ${VTK_EXECUTABLE}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/TestIgnoreBTX.tcl)
-ADD_TEST(TestAmoebaMinimizer ${VTK_EXECUTABLE}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/TestAmoebaMinimizer.tcl)
-ADD_TEST(PrintSelf-Common ${TCL_TCLSH}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/PrintSelfCheck.tcl
-         ${VTK_SOURCE_DIR}/Common)
-ADD_TEST(TestSetObjectMacro-Common ${TCL_TCLSH}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/FindString.tcl
-         "${VTK_SOURCE_DIR}/Common/vtk\\\\*.h"
-         "vtkSetObjectMacro"
-         ${VTK_SOURCE_DIR}/Common/vtkSetGet.h
-         )
diff --git a/Filtering/CMakeLists.txt b/Filtering/CMakeLists.txt
deleted file mode 100644
index a700f307a61044e967d47bf25250482b1b157ab5..0000000000000000000000000000000000000000
--- a/Filtering/CMakeLists.txt
+++ /dev/null
@@ -1,382 +0,0 @@
-SET(KIT Filtering)
-SET(UKIT FILTERING)
-SET(KIT_TCL_LIBS vtkCommonTCL)
-SET(KIT_PYTHON_LIBS vtkCommonPythonD)
-SET(KIT_JAVA_LIBS vtkCommonJava)
-SET(KIT_INTERFACE_LIBRARIES vtkCommon)
-
-SET( Kit_SRCS
-vtkImageToStructuredGrid.cxx
-vtkAbstractCellLocator.cxx
-vtkAbstractGridConnectivity.cxx
-vtkAbstractImageInterpolator.cxx
-vtkAbstractInterpolatedVelocityField.cxx
-vtkAbstractMapper.cxx
-vtkAbstractPointLocator.cxx
-vtkActor2DCollection.cxx
-vtkActor2D.cxx
-vtkAdjacentVertexIterator.cxx
-vtkAlgorithm.cxx
-vtkAlgorithmOutput.cxx
-vtkAMRBox.cxx
-vtkAnnotation.cxx
-vtkAnnotationLayers.cxx
-vtkAnnotationLayersAlgorithm.cxx
-vtkAtom.cxx
-vtkAttributesErrorMetric.cxx
-vtkBiQuadraticQuad.cxx
-vtkBiQuadraticQuadraticHexahedron.cxx
-vtkBiQuadraticQuadraticWedge.cxx
-vtkBiQuadraticTriangle.cxx
-vtkBond.cxx
-vtkBSPCuts.cxx
-vtkBSPIntersections.cxx
-vtkCachedStreamingDemandDrivenPipeline.cxx
-vtkCardinalSpline.cxx
-vtkCastToConcrete.cxx
-vtkCell3D.cxx
-vtkCellArray.cxx
-vtkCell.cxx
-vtkCellData.cxx
-vtkCellLinks.cxx
-vtkCellLocator.cxx
-vtkCellTreeLocator.cxx
-vtkCellTypes.cxx
-vtkColorTransferFunction.cxx
-vtkCompositeDataIterator.cxx
-vtkCompositeDataPipeline.cxx
-vtkCompositeDataSetAlgorithm.cxx
-vtkCompositeDataSet.cxx
-vtkComputingResources.cxx
-vtkCone.cxx
-vtkConvexPointSet.cxx
-vtkCoordinate.cxx
-vtkCubicLine.cxx
-vtkCylinder.cxx
-vtkDataObjectAlgorithm.cxx
-vtkDataObjectCollection.cxx
-vtkDataObject.cxx
-vtkDataObjectTypes.cxx
-vtkDataSetAlgorithm.cxx
-vtkDataSetAttributes.cxx
-vtkDataSetCollection.cxx
-vtkDataSet.cxx
-vtkDataSetGhostGenerator.cxx
-vtkDemandDrivenPipeline.cxx
-vtkDirectedAcyclicGraph.cxx
-vtkDirectedGraphAlgorithm.cxx
-vtkDirectedGraph.cxx
-vtkDiscretizableColorTransferFunction.cxx
-vtkDistributedGraphHelper.cxx
-vtkEdgeListIterator.cxx
-vtkEmptyCell.cxx
-vtkExecutionScheduler.cxx
-vtkExecutionSchedulerManager.cxx
-vtkExecutive.cxx
-vtkExecutiveCollection.cxx
-vtkExplicitCell.cxx
-vtkFieldData.cxx
-vtkFilteringInformationKeyManager.cxx
-vtkGenericAdaptorCell.cxx
-vtkGenericAttributeCollection.cxx
-vtkGenericAttribute.cxx
-vtkGenericCell.cxx
-vtkGenericCellIterator.cxx
-vtkGenericCellTessellator.cxx
-vtkGenericDataSet.cxx
-vtkGenericEdgeTable.cxx
-vtkGenericInterpolatedVelocityField.cxx
-vtkGenericPointIterator.cxx
-vtkGenericSubdivisionErrorMetric.cxx
-vtkGeometricErrorMetric.cxx
-vtkGraphAlgorithm.cxx
-vtkGraph.cxx
-vtkGraphEdge.cxx
-vtkGraphInternals.cxx
-vtkGraphWeightFilter.cxx
-vtkGraphWeightEuclideanDistanceFilter.cxx
-vtkHexagonalPrism.cxx
-vtkHexahedron.cxx
-vtkHierarchicalBoxDataIterator.cxx
-vtkHierarchicalBoxDataSetAlgorithm.cxx
-vtkHierarchicalBoxDataSet.cxx
-vtkHyperOctreeAlgorithm.cxx
-vtkHyperOctreeCursor.cxx
-vtkHyperOctree.cxx
-vtkHyperOctreePointsGrabber.cxx
-vtkImageAlgorithm.cxx
-vtkImageBSplineInternals.cxx
-vtkImageBSplineInterpolator.cxx
-vtkImageData.cxx
-vtkImageInPlaceFilter.cxx
-vtkImageInterpolator.cxx
-vtkImageIterator.cxx
-vtkImageProgressIterator.cxx
-vtkImageSincInterpolator.cxx
-vtkImageToStructuredPoints.cxx
-vtkImplicitBoolean.cxx
-vtkImplicitDataSet.cxx
-vtkImplicitHalo.cxx
-vtkImplicitSelectionLoop.cxx
-vtkImplicitSum.cxx
-vtkImplicitVolume.cxx
-vtkImplicitWindowFunction.cxx
-vtkIncrementalOctreeNode.cxx
-vtkIncrementalOctreePointLocator.cxx
-vtkIncrementalPointLocator.cxx
-vtkInEdgeIterator.cxx
-vtkInformationExecutivePortKey.cxx
-vtkInformationExecutivePortVectorKey.cxx
-vtkInterpolatedVelocityField.cxx
-vtkKdNode.cxx
-vtkKdTree.cxx
-vtkKdTreePointLocator.cxx
-vtkKochanekSpline.cxx
-vtkLine.cxx
-vtkLinearSelector.cxx
-vtkLocator.cxx
-vtkMapper2D.cxx
-vtkMeanValueCoordinatesInterpolator.cxx
-vtkMergePoints.cxx
-vtkMarchingSquaresLineCases.cxx
-vtkMarchingCubesTriangleCases.cxx
-vtkMolecule.cxx
-vtkMultiBlockDataSetAlgorithm.cxx
-vtkMultiBlockDataSet.cxx
-vtkMultiPieceDataSet.cxx
-vtkMutableDirectedGraph.cxx
-vtkMutableUndirectedGraph.cxx
-vtkNonLinearCell.cxx
-vtkNonMergingPointLocator.cxx
-vtkNonOverlappingAMR.cxx
-vtkNonOverlappingAMRAlgorithm.cxx
-vtkOctreePointLocator.cxx
-vtkOctreePointLocatorNode.cxx
-vtkOrderedTriangulator.cxx
-vtkOutEdgeIterator.cxx
-vtkOverlappingAMR.cxx
-vtkOverlappingAMRAlgorithm.cxx
-vtkParametricSpline.cxx
-vtkPassInputTypeAlgorithm.cxx
-vtkPentagonalPrism.cxx
-vtkPerlinNoise.cxx
-vtkPiecewiseFunctionAlgorithm.cxx
-vtkPiecewiseFunction.cxx
-vtkPiecewiseFunctionShiftScale.cxx
-vtkPixel.cxx
-vtkPlanesIntersection.cxx
-vtkPointData.cxx
-vtkPointLocator.cxx
-vtkPointSetAlgorithm.cxx
-vtkPointSet.cxx
-vtkPointsProjectedHull.cxx
-vtkPolyDataAlgorithm.cxx
-vtkPolyDataCollection.cxx
-vtkPolyData.cxx
-vtkPolygon.cxx
-vtkPolyhedron.cxx
-vtkPolyLine.cxx
-vtkPolyPlane.cxx
-vtkPolyVertex.cxx
-vtkPropAssembly.cxx
-vtkPyramid.cxx
-vtkQuad.cxx
-vtkQuadraticEdge.cxx
-vtkQuadraticHexahedron.cxx
-vtkQuadraticLinearQuad.cxx
-vtkQuadraticLinearWedge.cxx
-vtkQuadraticPyramid.cxx
-vtkQuadraticQuad.cxx
-vtkQuadraticTetra.cxx
-vtkQuadraticTriangle.cxx
-vtkQuadraticWedge.cxx
-vtkRectilinearGridAlgorithm.cxx
-vtkRectilinearGrid.cxx
-vtkRectilinearGridPartitioner.cxx
-vtkReebGraph.cxx
-vtkReebGraphSimplificationMetric.cxx
-vtkScalarTree.cxx
-vtkSelectionAlgorithm.cxx
-vtkSelection.cxx
-vtkSelectionNode.cxx
-vtkSimpleCellTessellator.cxx
-vtkSimpleImageToImageFilter.cxx
-vtkSimpleScalarTree.cxx
-vtkSmoothErrorMetric.cxx
-vtkSphere.cxx
-vtkSpline.cxx
-vtkStreamingDemandDrivenPipeline.cxx
-vtkStructuredGridAlgorithm.cxx
-vtkStructuredGrid.cxx
-vtkStructuredGridConnectivity.cxx
-vtkStructuredGridGhostDataGenerator.cxx
-vtkStructuredGridPartitioner.cxx
-vtkStructuredNeighbor.cxx
-vtkStructuredPointsCollection.cxx
-vtkStructuredPoints.cxx
-vtkSuperquadric.cxx
-vtkTableAlgorithm.cxx
-vtkTable.cxx
-vtkTemporalDataSetAlgorithm.cxx
-vtkTemporalDataSet.cxx
-vtkTetra.cxx
-vtkThreadedImageAlgorithm.cxx
-vtkThreadedStreamingPipeline.cxx
-vtkTreeAlgorithm.cxx
-vtkTree.cxx
-vtkTreeBFSIterator.cxx
-vtkTreeDFSIterator.cxx
-vtkTreeIterator.cxx
-vtkTriangle.cxx
-vtkTriangleStrip.cxx
-vtkTriQuadraticHexahedron.cxx
-vtkTrivialProducer.cxx
-vtkUndirectedGraphAlgorithm.cxx
-vtkUndirectedGraph.cxx
-vtkUniformGrid.cxx
-vtkUniformGridGhostDataGenerator.cxx
-vtkUniformGridPartitioner.cxx
-vtkUnstructuredGridAlgorithm.cxx
-vtkUniformGridAMR.cxx
-vtkUniformGridAMRAlgorithm.cxx
-vtkUniformGridAMRDataIterator.cxx
-vtkUniformGridPartitioner.cxx
-vtkUnstructuredGrid.cxx
-vtkVertex.cxx
-vtkVertexListIterator.cxx
-vtkViewDependentErrorMetric.cxx
-vtkViewport.cxx
-vtkVoxel.cxx
-vtkWedge.cxx
-)
-
-SET_SOURCE_FILES_PROPERTIES(
-vtkAbstractCellLocator
-vtkAbstractGridConnectivity
-vtkAbstractImageInterpolator
-vtkAbstractInterpolatedVelocityField
-vtkAbstractMapper
-vtkAbstractPointLocator
-vtkCell
-vtkCell3D
-vtkCompositeDataIterator
-vtkCompositeDataSet
-vtkDataSet
-vtkDataSetGhostGenerator
-vtkDataSetToDataSetFilter
-vtkDataSetToImageFilter
-vtkDataSetToPolyDataFilter
-vtkDataSetToStructuredGridFilter
-vtkDataSetToStructuredPointsFilter
-vtkDataSetToUnstructuredGridFilter
-vtkDistributedGraphHelper
-vtkExecutive
-vtkExplicitCell
-vtkFilteringInformationKeyManager
-vtkGenericAdaptorCell
-vtkGenericAttribute
-vtkGenericCellIterator
-vtkGenericCellTessellator
-vtkGenericDataSet
-vtkGenericPointIterator
-vtkGenericSubdivisionErrorMetric
-vtkGraph
-vtkGraphWeightFilter
-vtkHyperOctreeAlgorithm
-vtkHyperOctreeCursor
-vtkHyperOctreePointsGrabber
-vtkImageAlgorithm
-vtkImageInPlaceFilter
-vtkImageIterator
-vtkImageProgressIterator
-vtkIncrementalPointLocator
-vtkInformationExecutivePortKey
-vtkInformationExecutivePortVectorKey
-vtkLocator
-vtkMapper2D
-vtkNonLinearCell
-vtkPointSet
-vtkScalarTree
-vtkSimpleImageToImageFilter
-vtkSpline
-vtkThreadedImageAlgorithm
-vtkTreeIterator
-vtkUniformGridAMR
-vtkViewport
-  ABSTRACT
-)
-
-SET_SOURCE_FILES_PROPERTIES(
-  vtkAMRBox.cxx
-  vtkAtom.cxx
-  vtkBond.cxx
-  vtkExecutionSchedulerManager.cxx
-  vtkFilteringInformationKeyManager.cxx
-  vtkImageBSplineInternals.cxx
-  vtkImageIterator.cxx
-  vtkImageProgressIterator.cxx
-  vtkMarchingSquaresLineCases.cxx
-  vtkMarchingCubesTriangleCases.cxx
-  vtkStructuredNeighbor.cxx
-  WRAP_EXCLUDE
-)
-
-SET_SOURCE_FILES_PROPERTIES(
-  vtkAtom.cxx
-  vtkBond.cxx
-  vtkImageBSplineInternals.cxx
-
-  PROPERTIES WRAP_SPECIAL 1
-)
-
-SET(Kit_EXTRA_SRCS)
-SET(Kit_EXTRA_CMDS)
-SET(Kit_TCL_EXTRA_SRCS)
-SET(Kit_PYTHON_EXTRA_SRCS)
-SET(Kit_JAVA_EXTRA_SRCS)
-SET(KIT_TCL_DEPS)
-SET(KIT_PYTHON_DEPS)
-SET(KIT_JAVA_DEPS)
-
-IF(VTK_USE_N_WAY_ARRAYS)
-
-  SET(Kit_SRCS
-    ${Kit_SRCS}
-    vtkArrayData.cxx
-    vtkArrayDataAlgorithm.cxx
-    )
-
-ENDIF(VTK_USE_N_WAY_ARRAYS)
-
-SET(Kit_WRAP_HEADERS
-  vtkCellType.h
-  )
-
-#-----------------------------------------------------------------------------
-# Include CMake code common to all kits.
-INCLUDE(${VTK_CMAKE_DIR}/KitCommonBlock.cmake)
-#-----------------------------------------------------------------------------
-
-IF(CMAKE_COMPILER_IS_GNUCXX AND MINGW)
-  # MinGW fails to dllexport the explicit instantiations of
-  # the image iterators, so we must export all symbols.
-  GET_TARGET_PROPERTY(VTK_FILTERING_LINK_FLAGS vtkFiltering LINK_FLAGS)
-  IF(VTK_FILTERING_LINK_FLAGS)
-    SET(VTK_FILTERING_LINK_FLAGS "${VTK_FILTERING_LINK_FLAGS} ")
-  ELSE(VTK_FILTERING_LINK_FLAGS)
-    SET(VTK_FILTERING_LINK_FLAGS)
-  ENDIF(VTK_FILTERING_LINK_FLAGS)
-  SET_TARGET_PROPERTIES(vtkFiltering PROPERTIES
-    LINK_FLAGS "${VTK_FILTERING_LINK_FLAGS}-Wl,--export-all-symbols")
-ENDIF(CMAKE_COMPILER_IS_GNUCXX AND MINGW)
-
-IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-  INSTALL(FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/vtkCellType.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/vtkImageIterator.txx
-    ${CMAKE_CURRENT_SOURCE_DIR}/vtkImageProgressIterator.txx
-    ${CMAKE_CURRENT_SOURCE_DIR}/vtkImageInterpolatorInternals.h
-    DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}
-    COMPONENT Development
-    )
-ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
diff --git a/Filtering/Testing/CMakeLists.txt b/Filtering/Testing/CMakeLists.txt
deleted file mode 100644
index ce1a6d02e148bb7a81ad77063649e5190ac34489..0000000000000000000000000000000000000000
--- a/Filtering/Testing/CMakeLists.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-ADD_SUBDIRECTORY(Cxx)
-
-IF (VTK_WRAP_TCL)
-  ADD_SUBDIRECTORY(Tcl)
-ENDIF (VTK_WRAP_TCL)
-
-IF (VTK_WRAP_PYTHON)
-  ADD_SUBDIRECTORY(Python)
-ENDIF (VTK_WRAP_PYTHON)
-
-IF(PYTHON_EXECUTABLE)
-  ADD_TEST(HeaderTesting-Filtering ${PYTHON_EXECUTABLE}
-    ${VTK_SOURCE_DIR}/Common/Testing/HeaderTesting.py
-    "${VTK_SOURCE_DIR}/Filtering"
-    VTK_FILTERING_EXPORT
-    vtkActor2DCollection.h
-    vtkAMRBox.h
-    vtkApplyFilterCommandInternal.h
-    vtkArrayData.h
-    vtkArrayDataAlgorithm.h
-    vtkAtom.h
-    vtkBond.h
-    vtkCellType.h
-    vtkCompositeDataSetInternals.h
-    vtkDataObjectCollection.h
-    vtkDataSetCollection.h
-    vtkExecutionSchedulerManager.h
-    vtkFactoredArrayData.h
-    vtkFactoredArrayDataAlgorithm.h
-    vtkFilteringInformationKeyManager.h
-    vtkGraphInternals.h
-    vtkImageBSplineInternals.h
-    vtkImageInterpolatorInternals.h
-    vtkImageIterator.h
-    vtkImageProgressIterator.h
-    vtkMarchingCubesCases.h
-    vtkMarchingCubesTriangleCases.h
-    vtkMarchingSquaresCases.h
-    vtkMarchingSquaresLineCases.h
-    vtkStructuredPoints.h
-    vtkStructuredNeighbor.h
-    )
-ENDIF(PYTHON_EXECUTABLE)
diff --git a/Filtering/Testing/Cxx/CMakeLists.txt b/Filtering/Testing/Cxx/CMakeLists.txt
deleted file mode 100644
index 18b773d174e94ef1c95dd9963c354c51c4daa6bb..0000000000000000000000000000000000000000
--- a/Filtering/Testing/Cxx/CMakeLists.txt
+++ /dev/null
@@ -1,91 +0,0 @@
-SET(KIT Filtering)
-# Add tests that require data
-IF (VTK_DATA_ROOT)
-  SET(DataBasedTests
-      TestLinearSelector2D.cxx
-      TestLinearSelector3D.cxx
-      )
-ENDIF (VTK_DATA_ROOT)
-
-IF (VTK_USE_PARALLEL)
-  SET(AMRTests 
-      TestAMRIterator.cxx
-      TestAMRBlanking.cxx)
-  SET(EXTRALIBS vtkAMR vtkParallel)
-ENDIF(VTK_USE_PARALLEL)
-
-#
-# Create a test lists
-CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx
-  CellTreeLocator.cxx
-  otherCellArray.cxx
-  otherCellBoundaries.cxx
-  otherCellPosition.cxx
-  otherCellTypes.cxx
-  otherColorTransferFunction.cxx
-  otherEmptyCell.cxx
-  otherFieldData.cxx
-  otherRectilinearGrid.cxx
-  otherStructuredGrid.cxx
-  quadCellConsistency.cxx
-  quadraticEvaluation.cxx
-  TestAMRBox.cxx
-  TestInterpolationFunctions.cxx
-  TestInterpolationDerivs.cxx
-  TestImageDataFindCell.cxx
-  TestImageIterator.cxx
-  TestGenericCell.cxx
-  TestGraph2.cxx
-  TestGraphWeightEuclideanDistanceFilter.cxx
-  TestHigherOrderCell.cxx
-  TestPointLocators.cxx
-  TestPolyDataRemoveCell.cxx
-  TestPolygon.cxx
-  TestSelectionSubtract.cxx
-  TestTreeBFSIterator.cxx
-  TestTreeDFSIterator.cxx
-  TestTriangle.cxx
-  TestImageDataInterpolation.cxx
-  TestImageDataToStructuredGrid.cxx
-  TestUniformGridGhostDataGenerator.cxx
-  ${DataBasedTests}
-  ${AMRTests}
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-                                                    
-ADD_EXECUTABLE(TestStructuredGridGhostDataGenerator TestStructuredGridGhostDataGenerator.cxx)
-ADD_TEST(StructuredGridGhostDataGeneratorTest ${CXX_TEST_PATH}/TestStructuredGridGhostDataGenerator)
-TARGET_LINK_LIBRARIES(TestStructuredGridGhostDataGenerator vtkCommon vtkFiltering vtkIO)
-
-ADD_EXECUTABLE(TestRectilinearGridPartitioner TestRectilinearGridPartitioner.cxx)
-TARGET_LINK_LIBRARIES(TestRectilinearGridPartitioner vtkCommon vtkFiltering vtkIO)
-
-ADD_EXECUTABLE(TestStructuredGridPartitioner TestStructuredGridPartitioner.cxx)
-TARGET_LINK_LIBRARIES(TestStructuredGridPartitioner vtkCommon vtkFiltering vtkIO)
-
-ADD_EXECUTABLE(TestStructuredGridConnectivity TestStructuredGridConnectivity.cxx)
-ADD_TEST(StructuredGridConnectivityTest ${CXX_TEST_PATH}/TestStructuredGridConnectivity)
-TARGET_LINK_LIBRARIES(TestStructuredGridConnectivity vtkCommon vtkFiltering vtkIO)
-
-ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
-TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkIO vtkFiltering vtkGraphics ${EXTRALIBS})
-
-SET (TestsToRun ${Tests})
-REMOVE (TestsToRun ${KIT}CxxTests.cxx)
-
-#
-# Add all the executables
-FOREACH (test ${TestsToRun})
-  GET_FILENAME_COMPONENT(TName ${test} NAME_WE)
-  IF (VTK_DATA_ROOT)
-    ADD_TEST(${TName} ${CXX_TEST_PATH}/${KIT}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
-        -V Baseline/${KIT}/${TName}.png)
-  ELSE (VTK_DATA_ROOT)
-    ADD_TEST(${TName} ${CXX_TEST_PATH}/${KIT}CxxTests ${TName}
-      -T ${VTK_BINARY_DIR}/Testing/Temporary
-      )
-  ENDIF (VTK_DATA_ROOT)
-ENDFOREACH (test)
-
diff --git a/Filtering/Testing/Python/CMakeLists.txt b/Filtering/Testing/Python/CMakeLists.txt
deleted file mode 100644
index c8ece1f9f5b835bd4d259eda2ddfdbfed226c26e..0000000000000000000000000000000000000000
--- a/Filtering/Testing/Python/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-INCLUDE(${VTK_SOURCE_DIR}/Utilities/vtkTclTest2Py/vtkConvertTclTestToPy.cmake)
-IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-  #
-  # Add tests, with the data
-  #
-  IF (VTK_DATA_ROOT)
-    IF (VTK_PYTHON_EXE)
-      SET(tests
-        closedSplines
-        CSpline
-        KSpline
-        SelectionLoop
-        ImplicitSum
-        PerlinNoise 
-        )
-
-      CONVERT_TCL_TEST_TO_PY (
-        tests
-        Filtering)
-    ENDIF (VTK_PYTHON_EXE)
-  ENDIF (VTK_DATA_ROOT)
-ENDIF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
diff --git a/Filtering/Testing/Tcl/CMakeLists.txt b/Filtering/Testing/Tcl/CMakeLists.txt
deleted file mode 100644
index ceddb5a32a1bf977bb8f6b4f60c3bb93785d25a8..0000000000000000000000000000000000000000
--- a/Filtering/Testing/Tcl/CMakeLists.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-
-  #
-  # Add tests, with the data
-  #
-  IF (VTK_DATA_ROOT)
-    FOREACH ( tfile 
-      closedSplines
-      CSpline
-      KSpline
-      SelectionLoop
-      ImplicitSum
-      PerlinNoise
-      )
-      ADD_TEST(${tfile}-image ${VTK_EXECUTABLE}
-        ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-        ${VTK_SOURCE_DIR}/Filtering/Testing/Tcl/${tfile}.tcl
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
-        -V Baseline/Filtering/${tfile}.png
-        -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-    ENDFOREACH( tfile )
-    IF(VTK_USE_TK)
-      ADD_TEST(squadViewer-image ${VTK_EXECUTABLE}
-        ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-        ${VTK_SOURCE_DIR}/Filtering/Testing/Tcl/squadViewer.tcl
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
-        -V Baseline/Filtering/squadViewer.png
-        -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-    ENDIF(VTK_USE_TK)
-  #
-  # If we do not have the data, still run the tests that we can
-  #
-  ELSE (VTK_DATA_ROOT)
-  ENDIF (VTK_DATA_ROOT)
-
-ENDIF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-
-ADD_TEST(PrintSelf-Filtering ${TCL_TCLSH}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/PrintSelfCheck.tcl  
-         ${VTK_SOURCE_DIR}/Filtering)
-
-ADD_TEST(TestSetObjectMacro-Filtering ${TCL_TCLSH}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/FindString.tcl
-         "${VTK_SOURCE_DIR}/Filtering/vtk\\\\*.h"
-         "vtkSetObjectMacro"
-         )
-ADD_TEST(otherDataSetAttributes ${VTK_EXECUTABLE}
-         ${VTK_SOURCE_DIR}/Filtering/Testing/Tcl/otherDataSetAttributes.tcl 
-         -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
diff --git a/GUISupport/CMakeLists.txt b/GUISupport/CMakeLists.txt
deleted file mode 100644
index 721b219759f9c7940f6782478931f3ce819ade5e..0000000000000000000000000000000000000000
--- a/GUISupport/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-VTK_DEPENDENT_OPTION(VTK_USE_QVTK_QTOPENGL "Use QtOpenGL in QVTK" OFF
-                     "VTK_USE_QVTK" OFF)
-MARK_AS_ADVANCED(VTK_USE_QVTK_QTOPENGL)
-
-IF(WIN32)
-  VTK_DEPENDENT_OPTION(VTK_USE_MFC "Build MFC classes for VTK" OFF
-                       "VTK_USE_GUISUPPORT;VTK_USE_RENDERING" OFF)
-ENDIF(WIN32)
-
-IF(VTK_USE_QVTK)
-  ADD_SUBDIRECTORY(Qt)
-ENDIF(VTK_USE_QVTK)
-
-IF(VTK_USE_MFC)
-  ADD_SUBDIRECTORY(MFC)
-ENDIF(VTK_USE_MFC)
diff --git a/GUISupport/Qt/Testing/Python/CMakeLists.txt b/GUISupport/Qt/Testing/Python/CMakeLists.txt
deleted file mode 100644
index 99277c5e3efccb500bb10ed8e2d03eb3bbfb9692..0000000000000000000000000000000000000000
--- a/GUISupport/Qt/Testing/Python/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-
-set(TESTS
-    TestTimeUtility
-    TestQVTKWidget
-    TestvtkQtTableView
-    TestConnection
-    )
-
-IF(VTK_USE_QVTK_QTOPENGL)
-  set(TESTS
-      ${TESTS}
-    TestQVTKWidget2
-    )
-ENDIF(VTK_USE_QVTK_QTOPENGL)
-
-FOREACH(tfile ${TESTS})
-  ADD_TEST(Qt${tfile}Python ${VTK_PYTHON_EXE} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py)
-ENDFOREACH(tfile)
diff --git a/GenericFiltering/CMakeLists.txt b/GenericFiltering/CMakeLists.txt
deleted file mode 100644
index b6d741ed111bfaa349cbed6d42b2c031744c2b09..0000000000000000000000000000000000000000
--- a/GenericFiltering/CMakeLists.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-SET(KIT GenericFiltering)
-SET(UKIT GENERIC_FILTERING)
-SET(KIT_TCL_LIBS vtkFilteringTCL vtkGraphicsTCL)
-SET(KIT_PYTHON_LIBS vtkFilteringPythonD vtkGraphicsPythonD)
-SET(KIT_JAVA_LIBS vtkFilteringJava vtkGraphicsJava)
-SET(KIT_INTERFACE_LIBRARIES vtkFiltering vtkGraphics)
-
-SET( Kit_SRCS
-vtkGenericContourFilter.cxx
-vtkGenericGeometryFilter.cxx
-vtkGenericClip.cxx
-vtkGenericProbeFilter.cxx
-vtkGenericDataSetTessellator.cxx
-vtkGenericCutter.cxx
-vtkGenericGlyph3DFilter.cxx
-vtkGenericStreamTracer.cxx
-vtkGenericOutlineFilter.cxx
-)
-
-SET(Kit_EXTRA_SRCS)
-SET(Kit_EXTRA_CMDS)
-SET(Kit_TCL_EXTRA_SRCS)
-SET(Kit_PYTHON_EXTRA_SRCS)
-SET(Kit_JAVA_EXTRA_SRCS)
-SET(KIT_TCL_DEPS)
-SET(KIT_PYTHON_DEPS)
-SET(KIT_JAVA_DEPS)
-
-#-----------------------------------------------------------------------------
-# Include CMake code common to all kits.
-INCLUDE(${VTK_CMAKE_DIR}/KitCommonBlock.cmake)
-#-----------------------------------------------------------------------------
diff --git a/GenericFiltering/README.html b/GenericFiltering/README.html
deleted file mode 100644
index 862ab5528ba854b0b80b953cc3428ce6b0ba853b..0000000000000000000000000000000000000000
--- a/GenericFiltering/README.html
+++ /dev/null
@@ -1,145 +0,0 @@
-<HTML>
-<header>
-<title>VTK Adaptor Framework README</title>
-<!-- Created by: will schroeder,  11-Aug-2004 -->
-
-</header>
-<body>
-
-<h1>
-<IMG ALIGN="middle" SRC=../vtkBanner.gif><br>
-The VTK Adaptor Framework and Generic Filtering
-</h1>
-    <UL>
-    <LI> <A HREF="#Overview">Overview</A>
-    <LI> <A HREF="#Compatibility">Compatibility Warning</A>
-    <LI> <A HREF="#Commercial">Commercial Expression</A>
-    <LI> <A HREF="#Acknowledgements">Acknowledgements</A>
-    </UL>
-<HR>
-<h1><A NAME="Overview">Overview</h1>
-The classes in this directory are part of a body of work that support the
-interface of VTK to external simulation packages. These external packages may
-be finite element programs, CFD systems, or other simulation systems that are
-based on discretizing a domain into elements, where the element (or in VTK
-terminology, cell) basis functions are of arbitrary complexity. The purpose
-of this work is to avoid duplicating data in order to visualize it with VTK,
-and to take advantage of basis function formulations that are already
-implemented in existing simulation packages. (For further details, please see
-the paper "Framework for Visualizing Higher-Order Basis Functions" by
-Schroeder, Bertel, Malaterre, Thompson, Pebay, O'Bara and Tendulkar, in the
-<i>Proceedings of IEEE Visualization 2005</i>, October 2005.)
-<p>
-In the past, systems that interface with VTK typically require writing output
-data in VTK format, or require writing a special VTK reader. Further, cells
-of higher-order basis (e.g., cubic, quadric, or even mixed-order
-formulations) had no counterpart in VTK, so the user was responsible for
-tessellating the cells into linear forms, often at the cost of excessive
-memory consumption or inaccuracy.
-<p>
-We refer to this work as the "adaptor framework". That is, it adapts VTK to a
-particular simulation system. It does this by generalizing the VTK dataset,
-cell, and attribute classes, and providing special filters that operate on
-these new general classes. Further, because we assume that the cells may be
-of arbitrary complexity in terms of their basis functions, tessellation
-functions (with associated error metric) are used to automatically subdivide
-complex cells into linear primitives. This allows the use of standard linear
-visualization algorithms: algorithms that have been proven to be robust,
-fast, and dependable.
-<p>
-The adaptor framework consists of a few basic components: new implementations
-of data objects (vtkGenericDataSet and vtkGenericAdaptorCell), classes to
-support the tessellation of cells (vtkGenericCellTessellator and
-vtkGenericSubdivisionErrorMetric), and classes that filter the new data
-objects (e.g., vtkGenericContourFilter).
-<p>
-Note that we choose to implement a select number of filters. One filter
-simply performs tessellation on a vtkGenericDataSet to produce a linearized
-vtkUnstructuredGrid (vtkGenericDataSetTessellator). The others are common
-filters used in a wide variety of visualization applications:
-<ul>
-  <li> vtkGenericDataSetTessellator </li>
-  <li> vtkGenericContourFilter </li>
-  <li> vtkGenericCutter </li>
-  <li> vtkGenericClip </li>
-  <li> vtkGenericProbeFilter </li>
-  <li> vtkGenericGlyph3DFilter </li>
-  <li> vtkGenericStreamTracer </li>
-  <li> vtkGenericGeometryFilter </li>
-</ul>
-
-At the same time that we were designing the adaptor framework, we also found
-it necessary to rework the vtkDataSet/vtkCell/vtkDataArray API. We found that
-the assumptions of contiguous data (manifested in the form of monotonically
-increasing, contiguous, integral ids) to be overly limiting. Thus we moved
-to an iterator-based framework.
-
-It is possible that in time the vtkGenericDataSet may replace the current
-vtkDataSet, and that the existing filters that input vtkDataSet may be
-rewritten. However, this is a future undertaking.
-
-<HR>
-<h1><A NAME="Compatibility">Compatibility Warning</h1>
-The classes in this directory (and the classes found in
-VTK/Common/vtkGeneric*) are undergoing rapid development. The names of these
-classes, and their API, may change. Please use them only if you are prepared
-to deal with the inevitable changes that will occur over the next six
-months.<p>
-
-<HR>
-<h1><A NAME="Commercial">Commercial Expression</h1>
-Kitware 
-<a href="http://www.kitware.com">http://www.kitware.com</a>
-is teaming with Simmetrix, Inc.
-<a href="http://www.simmetrix.com">http://www.simmetrix.com</a>
-to create commercial tools that integrate the VTK visualization
-environment to Simmetrix's products, and to integrate Simmetrix's
-integration framework into ParaView.
-<p>
-If you are interested in building an adapted framework to VTK from
-your analysis/simulation package, please email sales "at" kitware.com
-for more information.
-
-<HR>
-<h1><A NAME="Acknowledgements">Acknowledgements</h1>
-This work has been supported through the efforts of several organizations
-and individuals.
-<p>
-<b>The National Science Foundation</b>
-   <ul>
-   <li>NSF SBIR Phase II Grant #DMI-0238964<br>
-   Title:<i>Visualizing Arbitrary Basis Functions for Advanced Engineering 
-      Analysis and Simulation</i><br>
-   PI: William J. Schroeder</li> 
-   </ul>
-<p>
-<b>The US National Tri-Lab Community (Sandia, Livermore, Los Alamos)</b>
-   <ul>
-   <li>David Thompson</li>
-   <li>Philippe Pebay</li>
-   <li>Brian Wylie</li>
-   <li>Gary Templet</li>
-   <li>Jim Ahrens</li>
-   </ul>
-<p>
-<b>Kitware, Inc.</b>
-   <ul>
-   <li>Will Schroeder</li>
-   <li>Francois Bertel</li>
-   <li>Mathieu Malaterre</li>
-   </ul>
-<p>
-<b>Simmetrix, Inc.</b>
-   <ul>
-   <li>Bob O'Bara</li>
-   <li>Saurabh Tendulkar</li>
-   <li>Mark Beall</li>
-   </ul>
-<b>LeHigh University</b>
-   <ul>
-   <li>Dr. Herman Nied</li>
-   </ul>
-
-
-</body>
-</HTML>
diff --git a/GenericFiltering/Testing/CMakeLists.txt b/GenericFiltering/Testing/CMakeLists.txt
deleted file mode 100644
index 92c26abf745c1de560c2ca88b40433c2c4df9c97..0000000000000000000000000000000000000000
--- a/GenericFiltering/Testing/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-ADD_SUBDIRECTORY(Cxx)
-
-IF (VTK_WRAP_TCL)
-  ADD_SUBDIRECTORY(Tcl)
-ENDIF (VTK_WRAP_TCL)
-
-IF(PYTHON_EXECUTABLE)
-  ADD_TEST(HeaderTesting-GenericFiltering ${PYTHON_EXECUTABLE}
-    ${VTK_SOURCE_DIR}/Common/Testing/HeaderTesting.py
-    "${VTK_SOURCE_DIR}/GenericFiltering"
-    VTK_GENERIC_FILTERING_EXPORT
-    )
-ENDIF(PYTHON_EXECUTABLE)
diff --git a/GenericFiltering/Testing/Cxx/CMakeLists.txt b/GenericFiltering/Testing/Cxx/CMakeLists.txt
deleted file mode 100644
index 13c18f154e9e6d0328be8ad1e6c6ba1902c30774..0000000000000000000000000000000000000000
--- a/GenericFiltering/Testing/Cxx/CMakeLists.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-# The bridge serves two purposes:
-# 1. Show the users how to implement a vtkGenericDataSet
-# 2. Test and validate the filters on a vtkGenericDataset on standard VTK
-# classes.
-
-# C++ tests for the bridge between standard VTK classes and the
-# vtkGenericDataSet.
-
-IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-
-
-#SET(KIT Bridge)
-SET(KIT GenericFiltering)
-SET(UKIT BRIDGE)
-SET( Kit_SRCS
-vtkBridgeCell.cxx
-vtkBridgeDataSet.cxx
-vtkBridgeAttribute.cxx
-vtkBridgeCellIterator.cxx
-vtkBridgePointIterator.cxx
-vtkBridgePointIteratorOnCell.cxx
-vtkBridgePointIteratorOnDataSet.cxx
-vtkBridgePointIteratorOne.cxx
-vtkBridgeCellIteratorStrategy.cxx
-vtkBridgeCellIteratorOnDataSet.cxx
-vtkBridgeCellIteratorOne.cxx
-vtkBridgeCellIteratorOnCellBoundaries.cxx
-vtkBridgeCellIteratorOnCellList.cxx
-)
-
-SET_SOURCE_FILES_PROPERTIES(
-vtkBridgeCell.cxx
-vtkBridgeCellIterator.cxx
-vtkBridgePointIterator.cxx
-vtkBridgePointIteratorOnCell.cxx
-vtkBridgePointIteratorOnDataSet.cxx
-vtkBridgePointIteratorOne.cxx
-vtkBridgeAttribute.cxx
-vtkBridgeCellIteratorStrategy.cxx
-vtkBridgeCellIteratorOnDataSet.cxx
-vtkBridgeCellIteratorOne.cxx
-vtkBridgeCellIteratorOnCellBoundaries.cxx
-vtkBridgeCellIteratorOnCellList.cxx
-  WRAP_EXCLUDE
-)
-
-# add tests that do not require data
-SET(MyTests
- otherCreation.cxx
-)
-
-# add tests that require data
-IF (VTK_DATA_ROOT)
- SET(MyTests ${MyTests}
-  TestGenericDataSetTessellator.cxx
-  TestGenericGeometryFilter.cxx
-  TestGenericGlyph3DFilter.cxx
-  TestGenericContourFilter.cxx
-  TestGenericClip.cxx
-  TestGenericCutter.cxx
-  TestGenericProbeFilter.cxx
-  TestGenericStreamTracer.cxx
-  TestSmoothErrorMetric.cxx
-  TestViewDependentErrorMetric.cxx
- )
-ENDIF (VTK_DATA_ROOT)
-
-#
-# Create a test lists
-CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx ${MyTests}
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-ADD_EXECUTABLE(${KIT}CxxTests ${Tests} ${Kit_SRCS} )
-TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkGenericFiltering vtkRendering vtkIO)
-
-SET (TestsToRun ${Tests})
-REMOVE (TestsToRun ${KIT}CxxTests.cxx)
-
-#
-# Add all the executables
-#FOREACH (test ${TestsToRun})
-#  GET_FILENAME_COMPONENT(TName ${test} NAME_WE)
-#  ADD_TEST(${TName} ${CXX_TEST_PATH}/${KIT}CxxTests ${TName})
-#ENDFOREACH (test)
-
- #
-  # Add all the executables 
-  FOREACH (test ${TestsToRun})
-    GET_FILENAME_COMPONENT(TName ${test} NAME_WE)
-    IF (VTK_DATA_ROOT)
-      ADD_TEST(${TName} ${CXX_TEST_PATH}/${KIT}CxxTests ${TName}
-          -D ${VTK_DATA_ROOT}
-          -T ${VTK_BINARY_DIR}/Testing/Temporary
-          -V Baseline/${KIT}/${TName}.png)
-    ELSE (VTK_DATA_ROOT)
-      ADD_TEST(${TName} ${CXX_TEST_PATH}/${KIT}CxxTests ${TName}) 
-    ENDIF (VTK_DATA_ROOT)
-  ENDFOREACH (test) 
-
-ENDIF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
diff --git a/GenericFiltering/Testing/Tcl/CMakeLists.txt b/GenericFiltering/Testing/Tcl/CMakeLists.txt
deleted file mode 100644
index 1587c7a96b2537ab44ff147268b9323c05eb8c4a..0000000000000000000000000000000000000000
--- a/GenericFiltering/Testing/Tcl/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-ADD_TEST(PrintSelf-GenericFiltering ${TCL_TCLSH}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/PrintSelfCheck.tcl  
-         ${VTK_SOURCE_DIR}/GenericFiltering)
-
-ADD_TEST(TestSetObjectMacro-GenericFiltering ${TCL_TCLSH}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/FindString.tcl
-         "${VTK_SOURCE_DIR}/GenericFiltering/vtk\\\\*.h"
-         "vtkSetObjectMacro"
-         )
diff --git a/Geovis/Testing/CMakeLists.txt b/Geovis/Testing/CMakeLists.txt
deleted file mode 100644
index 6ff403e64139ac2320aa1057bd7a773c0ea99487..0000000000000000000000000000000000000000
--- a/Geovis/Testing/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-ADD_SUBDIRECTORY(Cxx)
-
-IF (VTK_WRAP_TCL)
-  ADD_SUBDIRECTORY(Tcl)
-ENDIF (VTK_WRAP_TCL)
-
-IF(PYTHON_EXECUTABLE)
-  ADD_TEST(HeaderTesting-Geovis ${PYTHON_EXECUTABLE}
-    ${VTK_SOURCE_DIR}/Common/Testing/HeaderTesting.py
-    "${VTK_SOURCE_DIR}/Geovis"
-    VTK_GEOVIS_EXPORT
-    vtkGeoPatch.h
-    )
-ENDIF(PYTHON_EXECUTABLE)
diff --git a/Geovis/Testing/Cxx/CMakeLists.txt b/Geovis/Testing/Cxx/CMakeLists.txt
deleted file mode 100644
index 30d8da0d9a54283f3c4f0c1836dcfbd73d7cddc7..0000000000000000000000000000000000000000
--- a/Geovis/Testing/Cxx/CMakeLists.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-# if we have rendering add the following tests
-IF (VTK_USE_DISPLAY)
-  SET(KIT Geovis)
-  # add tests that do not require data
-  SET(MyTests
-    TestGeoAssignCoordinates.cxx
-    )
-  IF (VTK_DATA_ROOT)
-    # add tests that require data
-    SET(MyTests ${MyTests}
-      TestCoincidentGeoGraphRepresentation2D.cxx
-      TestGeoGraticule.cxx
-      TestGeoProjection.cxx
-      TestGeoView2D.cxx
-      TestGeoView.cxx
-      TestGlobeSource.cxx
-      TestLabeledGeoView2D.cxx
-      )
-  ENDIF (VTK_DATA_ROOT)
-
-  CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx ${MyTests}
-                         EXTRA_INCLUDE vtkTestDriver.h)
-  ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
-  TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkGeovis vtkRendering vtkIO)
-
-  SET (TestsToRun ${Tests})
-  REMOVE (TestsToRun ${KIT}CxxTests.cxx)
-
-  #
-     # Add all the executables
-  FOREACH (test ${TestsToRun})
-    GET_FILENAME_COMPONENT(TName ${test} NAME_WE)
-    IF (VTK_DATA_ROOT)
-      ADD_TEST(Geovis-${TName} ${CXX_TEST_PATH}/${KIT}CxxTests ${TName}
-          -D ${VTK_DATA_ROOT}
-          -T ${VTK_BINARY_DIR}/Testing/Temporary
-          -V Baseline/${KIT}/${TName}.png)
-    ELSE (VTK_DATA_ROOT)
-      ADD_TEST(Geovis-${TName} ${CXX_TEST_PATH}/${KIT}CxxTests ${TName})
-    ENDIF (VTK_DATA_ROOT)
-  ENDFOREACH (test)
-
-  IF (VTK_DATA_ROOT)
-    set_tests_properties(Geovis-TestGeoView PROPERTIES RUN_SERIAL ON)
-    set_tests_properties(Geovis-TestGeoView2D PROPERTIES RUN_SERIAL ON)
-  ENDIF (VTK_DATA_ROOT)
-
-ENDIF (VTK_USE_DISPLAY)
diff --git a/Geovis/Testing/Tcl/CMakeLists.txt b/Geovis/Testing/Tcl/CMakeLists.txt
deleted file mode 100644
index 55c72f171cec04128d262cf699e1d83dd4c891b6..0000000000000000000000000000000000000000
--- a/Geovis/Testing/Tcl/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-ADD_TEST(PrintSelf-Geovis ${TCL_TCLSH}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/PrintSelfCheck.tcl  
-         ${VTK_SOURCE_DIR}/Geovis)
-
-ADD_TEST(TestSetObjectMacro-Geovis ${TCL_TCLSH}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/FindString.tcl
-         "${VTK_SOURCE_DIR}/Geovis/vtk\\\\*.h"
-         "vtkSetObjectMacro"
-         )
diff --git a/Graphics/CMakeLists.txt b/Graphics/CMakeLists.txt
deleted file mode 100644
index e7774ef918802a7bba1be356ba778dc25f39265a..0000000000000000000000000000000000000000
--- a/Graphics/CMakeLists.txt
+++ /dev/null
@@ -1,368 +0,0 @@
-SET(KIT Graphics)
-SET(UKIT GRAPHICS)
-SET(KIT_TCL_LIBS vtkFilteringTCL)
-SET(KIT_PYTHON_LIBS vtkFilteringPythonD)
-SET(KIT_JAVA_LIBS vtkFilteringJava)
-IF(JAVA_AWT_LIBRARY)
-  SET(KIT_JAVA_LIBS ${KIT_JAVA_LIBS} ${JAVA_AWT_LIBRARY})
-ENDIF(JAVA_AWT_LIBRARY)
-SET(KIT_INTERFACE_LIBRARIES vtkFiltering)
-SET(KIT_LIBS vtkverdict )
-SET( Kit_SRCS
-vtkAnnotationLink.cxx
-vtkAppendCompositeDataLeaves.cxx
-vtkAppendFilter.cxx
-vtkAppendPolyData.cxx
-vtkAppendSelection.cxx
-vtkApproximatingSubdivisionFilter.cxx
-vtkArcSource.cxx
-vtkAreaContourSpectrumFilter.cxx
-vtkArrayCalculator.cxx
-vtkArrowSource.cxx
-vtkAssignAttribute.cxx
-vtkAttributeDataToFieldDataFilter.cxx
-vtkAxes.cxx
-vtkBandedPolyDataContourFilter.cxx
-vtkBlankStructuredGrid.cxx
-vtkBlankStructuredGridWithImage.cxx
-vtkBlockIdScalars.cxx
-vtkBooleanOperationPolyDataFilter.cxx
-vtkBoxClipDataSet.cxx
-vtkBrownianPoints.cxx
-vtkButterflySubdivisionFilter.cxx
-vtkButtonSource.cxx
-vtkCellCenters.cxx
-vtkCellDataToPointData.cxx
-vtkCellDerivatives.cxx
-vtkCellLocatorInterpolatedVelocityField.cxx
-vtkCellQuality.cxx
-vtkCenterOfMass.cxx
-vtkCleanPolyData.cxx
-vtkClipClosedSurface.cxx
-vtkClipConvexPolyData.cxx
-vtkClipDataSet.cxx
-vtkClipHyperOctree.cxx
-vtkClipPolyData.cxx
-vtkClipVolume.cxx
-vtkCoincidentPoints.cxx
-vtkCompositeDataGeometryFilter.cxx
-vtkCompositeDataProbeFilter.cxx
-vtkConeSource.cxx
-vtkConnectivityFilter.cxx
-vtkContourFilter.cxx
-vtkContourGrid.cxx
-vtkConvertSelection.cxx
-vtkCubeSource.cxx
-vtkCursor2D.cxx
-vtkCursor3D.cxx
-vtkCurvatures.cxx
-vtkCutter.cxx
-vtkCylinderSource.cxx
-vtkDashedStreamLine.cxx
-vtkDataObjectGenerator.cxx
-vtkDataObjectToDataSetFilter.cxx
-vtkDataSetEdgeSubdivisionCriterion.cxx
-vtkDataSetGradient.cxx
-vtkDataSetGradientPrecompute.cxx
-vtkDataSetSurfaceFilter.cxx
-vtkDataSetToDataObjectFilter.cxx
-vtkDataSetTriangleFilter.cxx
-vtkDecimatePolylineFilter.cxx
-vtkDecimatePro.cxx
-vtkDelaunay2D.cxx
-vtkDelaunay3D.cxx
-vtkDensifyPolyData.cxx
-vtkDicer.cxx
-vtkDijkstraGraphGeodesicPath.cxx
-vtkDijkstraImageGeodesicPath.cxx
-vtkDiscreteMarchingCubes.cxx
-vtkDiskSource.cxx
-vtkDistancePolyDataFilter.cxx
-vtkEdgePoints.cxx
-vtkEdgeSubdivisionCriterion.cxx
-vtkElevationFilter.cxx
-vtkEllipticalButtonSource.cxx
-vtkExtractArraysOverTime.cxx
-vtkExtractBlock.cxx
-vtkExtractCells.cxx
-vtkExtractDataOverTime.cxx
-vtkExtractDataSets.cxx
-vtkExtractEdges.cxx
-vtkExtractGeometry.cxx
-vtkExtractGrid.cxx
-vtkExtractLevel.cxx
-vtkExtractPolyDataGeometry.cxx
-vtkExtractRectilinearGrid.cxx
-vtkExtractSelectedBlock.cxx
-vtkExtractSelectedFrustum.cxx
-vtkExtractSelectedIds.cxx
-vtkExtractSelectedLocations.cxx
-vtkExtractSelectedPolyDataIds.cxx
-vtkExtractSelectedRows.cxx
-vtkExtractSelectedThresholds.cxx
-vtkExtractSelectionBase.cxx
-vtkExtractSelection.cxx
-vtkExtractTemporalFieldData.cxx
-vtkExtractTensorComponents.cxx
-vtkExtractUnstructuredGrid.cxx
-vtkExtractVectorComponents.cxx
-vtkFeatureEdges.cxx
-vtkFieldDataToAttributeDataFilter.cxx
-vtkFillHolesFilter.cxx
-vtkFrustumSource.cxx
-vtkGeodesicPath.cxx
-vtkGeometryFilter.cxx
-vtkGlyph2D.cxx
-vtkGlyph3D.cxx
-vtkGlyphSource2D.cxx
-vtkGradientFilter.cxx
-vtkGraphGeodesicPath.cxx
-vtkGraphLayoutFilter.cxx
-vtkGraphToPoints.cxx
-vtkGraphToPolyData.cxx
-vtkGridSynchronizedTemplates3D.cxx
-vtkHedgeHog.cxx
-vtkHierarchicalDataExtractDataSets.cxx
-vtkHierarchicalDataExtractLevel.cxx
-vtkHierarchicalDataLevelFilter.cxx
-vtkHierarchicalDataSetGeometryFilter.cxx
-vtkHull.cxx
-vtkHyperOctreeClipCutPointsGrabber.cxx
-vtkHyperOctreeContourFilter.cxx
-vtkHyperOctreeCutter.cxx
-vtkHyperOctreeDepth.cxx
-vtkHyperOctreeDualGridContourFilter.cxx
-vtkHyperOctreeFractalSource.cxx
-vtkHyperOctreeLimiter.cxx
-vtkHyperOctreeSampleFunction.cxx
-vtkHyperOctreeSurfaceFilter.cxx
-vtkHyperOctreeToUniformGridFilter.cxx
-vtkHyperStreamline.cxx
-vtkIconGlyphFilter.cxx
-vtkIdFilter.cxx
-vtkImageDataGeometryFilter.cxx
-vtkImageDataToPointSet.cxx
-vtkImageMarchingCubes.cxx
-vtkImplicitPolyDataDistance.cxx
-vtkImplicitTextureCoords.cxx
-vtkInterpolateDataSetAttributes.cxx
-vtkInterpolatingSubdivisionFilter.cxx
-vtkIntersectionPolyDataFilter.cxx
-vtkKdTreeSelector.cxx
-vtkLevelIdScalars.cxx
-vtkLinearExtrusionFilter.cxx
-vtkLinearSubdivisionFilter.cxx
-vtkLineSource.cxx
-vtkLinkEdgels.cxx
-vtkLoopSubdivisionFilter.cxx
-vtkMarchingContourFilter.cxx
-vtkMarchingCubes.cxx
-vtkMarchingSquares.cxx
-vtkMaskFields.cxx
-vtkMaskPoints.cxx
-vtkMaskPolyData.cxx
-vtkMassProperties.cxx
-vtkMatrixMathFilter.cxx
-vtkMergeCells.cxx
-vtkMergeDataObjectFilter.cxx
-vtkMergeFields.cxx
-vtkMergeFilter.cxx
-vtkMeshQuality.cxx
-vtkModelMetadata.cxx
-vtkModifiedBSPTree.cxx
-vtkMultiBlockDataGroupFilter.cxx
-vtkMultiBlockMergeFilter.cxx
-vtkMultiThreshold.cxx
-vtkNonOverlappingAMRLevelIdScalars.cxx
-vtkOBBDicer.cxx
-vtkOBBTree.cxx
-vtkOutlineCornerFilter.cxx
-vtkOutlineCornerSource.cxx
-vtkOutlineFilter.cxx
-vtkOutlineSource.cxx
-vtkOverlappingAMRLevelIdScalars.cxx
-vtkParametricFunctionSource.cxx
-vtkPlaneSource.cxx
-vtkPlatonicSolidSource.cxx
-vtkPointDataToCellData.cxx
-vtkPointSource.cxx
-vtkPolyDataConnectivityFilter.cxx
-vtkPolyDataNormals.cxx
-vtkPolyDataPointSampler.cxx
-vtkPolyDataStreamer.cxx
-vtkPolyDataToReebGraphFilter.cxx
-vtkProbeFilter.cxx
-vtkProbePolyhedron.cxx
-vtkProbeSelectedLocations.cxx
-vtkProgrammableAttributeDataFilter.cxx
-vtkProgrammableDataObjectSource.cxx
-vtkProgrammableFilter.cxx
-vtkProgrammableGlyphFilter.cxx
-vtkProgrammableSource.cxx
-vtkProjectedTexture.cxx
-vtkQuadraturePointInterpolator.cxx
-vtkQuadraturePointsGenerator.cxx
-vtkQuadratureSchemeDictionaryGenerator.cxx
-vtkQuadricClustering.cxx
-vtkQuadricDecimation.cxx
-vtkQuantizePolyDataPoints.cxx
-vtkQuadRotationalExtrusionFilter.cxx
-vtkRandomAttributeGenerator.cxx
-vtkRearrangeFields.cxx
-vtkRectangularButtonSource.cxx
-vtkRectilinearGridClip.cxx
-vtkRectilinearGridGeometryFilter.cxx
-vtkRectilinearGridToPointSet.cxx
-vtkRectilinearGridToTetrahedra.cxx
-vtkRectilinearSynchronizedTemplates.cxx
-vtkRecursiveDividingCubes.cxx
-vtkReebGraphSimplificationFilter.cxx
-vtkReebGraphSurfaceSkeletonFilter.cxx
-vtkReebGraphVolumeSkeletonFilter.cxx
-vtkReflectionFilter.cxx
-vtkRegularPolygonSource.cxx
-vtkResliceCursor.cxx
-vtkResliceCursorPolyDataAlgorithm.cxx
-vtkReverseSense.cxx
-vtkRibbonFilter.cxx
-vtkRotationalExtrusionFilter.cxx
-vtkRotationFilter.cxx
-vtkRuledSurfaceFilter.cxx
-vtkSectorSource.cxx
-vtkSelectEnclosedPoints.cxx
-vtkSelectionSource.cxx
-vtkSelectPolyData.cxx
-vtkShrinkFilter.cxx
-vtkShrinkPolyData.cxx
-vtkSimpleElevationFilter.cxx
-vtkSliceCubes.cxx
-vtkSmoothPolyDataFilter.cxx
-vtkSpatialRepresentationFilter.cxx
-vtkSpherePuzzleArrows.cxx
-vtkSpherePuzzle.cxx
-vtkSphereSource.cxx
-vtkSplineFilter.cxx
-vtkSplitField.cxx
-vtkStreamer.cxx
-vtkStreamerBase.cxx
-vtkStreamingTessellator.cxx
-vtkStreamLine.cxx
-vtkStreamPoints.cxx
-vtkStreamTracer.cxx
-vtkStripper.cxx
-vtkStructuredGridClip.cxx
-vtkStructuredGridGeometryFilter.cxx
-vtkStructuredGridOutlineFilter.cxx
-vtkStructuredPointsGeometryFilter.cxx
-vtkSubdivideTetra.cxx
-vtkSubPixelPositionEdgels.cxx
-vtkSuperquadricSource.cxx
-vtkSynchronizedTemplates2D.cxx
-vtkSynchronizedTemplates3D.cxx
-vtkSynchronizedTemplatesCutter3D.cxx
-vtkTableBasedClipDataSet.cxx
-vtkTableToPolyData.cxx
-vtkTableToStructuredGrid.cxx
-vtkTemporalPathLineFilter.cxx
-vtkTemporalStatistics.cxx
-vtkTensorGlyph.cxx
-vtkTessellatorFilter.cxx
-vtkTessellatedBoxSource.cxx
-vtkTextSource.cxx
-vtkTexturedSphereSource.cxx
-vtkTextureMapToCylinder.cxx
-vtkTextureMapToPlane.cxx
-vtkTextureMapToSphere.cxx
-vtkThreshold.cxx
-vtkThresholdPoints.cxx
-vtkThresholdTextureCoords.cxx
-vtkTimeSourceExample.cxx
-vtkTransformCoordinateSystems.cxx
-vtkTransformFilter.cxx
-vtkTransformPolyDataFilter.cxx
-vtkTransformTextureCoords.cxx
-vtkTriangleFilter.cxx
-vtkTriangularTCoords.cxx
-vtkTubeFilter.cxx
-vtkUncertaintyTubeFilter.cxx
-vtkUnstructuredGridGeometryFilter.cxx
-vtkUnstructuredGridToReebGraphFilter.cxx
-vtkVectorDot.cxx
-vtkVectorNorm.cxx
-vtkVertexGlyphFilter.cxx
-vtkVolumeContourSpectrumFilter.cxx
-vtkVoxelContoursToSurfaceFilter.cxx
-vtkWarpLens.cxx
-vtkWarpScalar.cxx
-vtkWarpTo.cxx
-vtkWarpVector.cxx
-vtkWindowedSincPolyDataFilter.cxx
-vtkYoungsMaterialInterface.cxx
-)
-SET_SOURCE_FILES_PROPERTIES(
-vtkApproximatingSubdivisionFilter
-vtkButtonSource
-vtkDicer
-vtkEdgeSubdivisionCriterion.cxx
-vtkExtractSelectionBase
-vtkGeodesicPath
-vtkGraphGeodesicPath
-vtkInterpolatingSubdivisionFilter
-vtkStreamer
-vtkStreamerBase
-ABSTRACT
-)
-
-IF(VTK_USE_BOOST)
-  INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
-  SET(Kit_SRCS
-    ${Kit_SRCS}
-    vtkReebGraphToJoinSplitTreeFilter.cxx
-    )
-ENDIF(VTK_USE_BOOST)
-
-# Add Matlab Engine and Matlab Mex related files.
-IF(VTK_USE_MATLAB_MEX)
-  INCLUDE(${MATLAB_MEX_USE_FILE})
-  SET(Kit_SRCS
-    ${Kit_SRCS}
-    vtkMatlabMexAdapter.cxx
-    vtkMatlabEngineInterface.cxx
-    vtkMatlabEngineFilter.cxx
-  )
-  SET_SOURCE_FILES_PROPERTIES(
-    vtkMatlabMexAdapter.cxx
-    WRAP_EXCLUDE
-  )
-  SET(KIT_LIBS ${KIT_LIBS} ${MEX_LIBRARIES} ${MATLAB_ENGINE_LIBRARIES})
-ENDIF(VTK_USE_MATLAB_MEX)
-
-# Add Gnu R interface related files.
-IF(VTK_USE_GNU_R)
-  SET(Kit_SRCS
-    ${Kit_SRCS}
-    vtkRRandomTableSource.cxx
-    vtkRCalculatorFilter.cxx
-    vtkRInterface.cxx
-    vtkRAdapter.cxx
-  )
-  SET_SOURCE_FILES_PROPERTIES(
-    vtkRAdapter.cxx
-    WRAP_EXCLUDE
-  )
-
-  SET(KIT_LIBS ${KIT_LIBS} ${R_LIBRARIES})
-
-ENDIF(VTK_USE_GNU_R)
-
-SET(Kit_EXTRA_SRCS)
-SET(Kit_EXTRA_CMDS)
-SET(Kit_TCL_EXTRA_SRCS)
-SET(Kit_PYTHON_EXTRA_SRCS)
-SET(KIT_TCL_DEPS)
-SET(KIT_PYTHON_DEPS)
-SET(KIT_JAVA_DEPS)
-#-----------------------------------------------------------------------------
-# Include CMake code common to all kits.
-INCLUDE(${VTK_CMAKE_DIR}/KitCommonBlock.cmake)
-#-----------------------------------------------------------------------------
diff --git a/Graphics/Testing/CMakeLists.txt b/Graphics/Testing/CMakeLists.txt
deleted file mode 100644
index 6b24f651d33cc8778f0a6008d3eb3224bed61308..0000000000000000000000000000000000000000
--- a/Graphics/Testing/CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-ADD_SUBDIRECTORY(Cxx)
-
-IF (VTK_WRAP_TCL)
-  ADD_SUBDIRECTORY(Tcl)
-ENDIF (VTK_WRAP_TCL)
-
-IF (VTK_WRAP_PYTHON)
-  ADD_SUBDIRECTORY(Python)
-ENDIF (VTK_WRAP_PYTHON)
-
-IF(PYTHON_EXECUTABLE)
-  ADD_TEST(HeaderTesting-Graphics ${PYTHON_EXECUTABLE}
-    ${VTK_SOURCE_DIR}/Common/Testing/HeaderTesting.py
-    "${VTK_SOURCE_DIR}/Graphics"
-    VTK_GRAPHICS_EXPORT
-    vtkButterflySubdivisionFilter.h
-    vtkDijkstraGraphInternals.h
-    vtkLinearSubdivisionFilter.h
-    vtkLoopSubdivisionFilter.h
-    vtkOutlineFilter.h
-    vtkProgrammableFilter.h
-    vtkProgrammableSource.h
-    vtkStructuredGridOutlineFilter.h
-    vtkStructuredPointsGeometryFilter.h
-    vtkTableBasedClipCases.h
-    )
-ENDIF(PYTHON_EXECUTABLE)
diff --git a/Graphics/Testing/Cxx/CMakeLists.txt b/Graphics/Testing/Cxx/CMakeLists.txt
deleted file mode 100644
index 6d87951d8eacf1ef269c00b934985f0b4b8bd53a..0000000000000000000000000000000000000000
--- a/Graphics/Testing/Cxx/CMakeLists.txt
+++ /dev/null
@@ -1,144 +0,0 @@
-# Always add these tests
-SET(MyTests
-  TestCenterOfMass.cxx
-  )
-
-# if we have rendering add the following tests
-IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-  SET(KIT Graphics)
-  # add tests that do not require data
-  SET(MyTests
-    ${MyTests}
-    Mace.cxx
-    expCos.cxx
-    BoxClipTriangulate.cxx
-    CellLocator.cxx
-    PointLocator.cxx
-    FrustumClip.cxx
-    RGrid.cxx
-    TestAppendSelection.cxx
-#    TestAppendPolyData.cxx #pending a bug fix
-    TestAssignAttribute.cxx
-    TestBareScalarsToColors.cxx
-    TestBSPTree.cxx
-    TestCellDataToPointData.cxx
-    TestDensifyPolyData.cxx
-    TestClipHyperOctree.cxx
-    TestConvertSelection.cxx
-    TestDelaunay2D.cxx
-    TestGlyph3D.cxx
-    TestExtraction.cxx
-    TestExtractSelection.cxx
-    TestExtractSurfaceNonLinearSubdivision.cxx
-    TestHyperOctreeContourFilter.cxx
-    TestHyperOctreeCutter.cxx
-    TestHyperOctreeDual.cxx
-    TestHyperOctreeSurfaceFilter.cxx
-    TestHyperOctreeToUniformGrid.cxx
-    TestImageDataToPointSet.cxx
-    TestLineSource.cxx
-    TestMapVectorsAsRGBColors.cxx
-    TestMapVectorsToColors.cxx
-    TestNamedComponents.cxx
-    TestMeanValueCoordinatesInterpolation1.cxx
-    TestMeanValueCoordinatesInterpolation2.cxx
-    TestPolyDataPointSampler.cxx
-    TestPolyhedron0.cxx
-    TestPolyhedron1.cxx
-    TestQuadRotationalExtrusion.cxx
-    TestRectilinearGridToPointSet.cxx
-    TestReflectionFilter.cxx
-    TestRotationalExtrusion.cxx
-    TestSelectEnclosedPoints.cxx
-    TestTessellatedBoxSource.cxx
-    TestTessellator.cxx
-    TestUncertaintyTubeFilter.cxx
-    TestDecimatePolylineFilter.cxx
-    TestImplicitPolyDataDistance.cxx
-    )
-
-  IF(VTK_USE_BOOST)
-    SET(MyTests
-      ${MyTests}
-      TestReebGraph.cxx
-      )
-  ENDIF(VTK_USE_BOOST)
-
-  # Add Matlab Engine and Matlab Mex related tests.
-  IF(VTK_USE_MATLAB_MEX)
-    INCLUDE(${MATLAB_MEX_USE_FILE})
-    SET(MyTests ${MyTests}
-      TestMatlabEngineInterface.cxx
-      TestMatlabEngineFilter.cxx
-    )
-  ENDIF(VTK_USE_MATLAB_MEX)
-
-  # Add Gnu R interface related files.
-  IF(VTK_USE_GNU_R)
-    SET(MyTests ${MyTests}
-      TestRRandomTableSource.cxx
-      TestRCalculatorFilter.cxx
-      TestRInterface.cxx
-      )
-  ENDIF(VTK_USE_GNU_R)
-
-  IF (VTK_DATA_ROOT)
-    # add tests that require data
-    SET(MyTests ${MyTests}
-      BoxClipPolyData.cxx
-      BoxClipTetrahedra.cxx
-      BoxClipTriangulateAndInterpolate.cxx
-      MeshQuality.cxx
-      TestActor2DTextures.cxx
-      TestArrayCalculator.cxx
-      TestGradientAndVorticity.cxx
-      TestHierarchicalBoxPipeline.cxx
-      TestIconGlyphFilterGravity.cxx
-      TestIncrementalOctreePointLocator.cxx
-      TestMultiBlock.cxx
-      TestQuadraturePoints.cxx
-      TestQuadRotationalExtrusionMultiBlock.cxx
-      TestUnstructuredGridGeometryFilter.cxx
-      UnstructuredGridGradients.cxx
-      UnstructuredGridCellGradients.cxx
-      UnstructuredGridFastGradients.cxx
-      TestBooleanOperationPolyDataFilter.cxx
-      TestBooleanOperationPolyDataFilter2.cxx
-      TestDistancePolyDataFilter.cxx
-      TestIntersectionPolyDataFilter.cxx
-      TestYoungsMaterialInterface.cxx
-      )
-    IF (VTK_USE_PARALLEL)
-      SET(MyTests ${MyTests}
-        TemporalStatistics.cxx
-        )
-    ENDIF (VTK_USE_PARALLEL)
-  ENDIF (VTK_DATA_ROOT)
-
-  INCLUDE(${VTK_SOURCE_DIR}/Rendering/vtkTestingObjectFactory.cmake)
-
-  ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
-  TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkRendering vtkIO)
-  IF (VTK_USE_PARALLEL)
-    TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkParallel ${OPENGL_gl_LIBRARY})
-  ENDIF (VTK_USE_PARALLEL)
-  IF (VTK_USE_GNU_R OR VTK_USE_MATLAB_MEX)
-    TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkInfovis)
-  ENDIF (VTK_USE_GNU_R OR VTK_USE_MATLAB_MEX)
-  SET (TestsToRun ${Tests})
-  REMOVE (TestsToRun ${KIT}CxxTests.cxx)
-
-  #
-  # Add all the executables
-  FOREACH (test ${TestsToRun})
-    GET_FILENAME_COMPONENT(TName ${test} NAME_WE)
-    IF (VTK_DATA_ROOT)
-      ADD_TEST(${TName} ${CXX_TEST_PATH}/${KIT}CxxTests ${TName}
-          -D ${VTK_DATA_ROOT}
-          -T ${VTK_BINARY_DIR}/Testing/Temporary
-          -V Baseline/${KIT}/${TName}.png)
-    ELSE (VTK_DATA_ROOT)
-      ADD_TEST(${TName} ${CXX_TEST_PATH}/${KIT}CxxTests ${TName})
-    ENDIF (VTK_DATA_ROOT)
-  ENDFOREACH (test)
-ENDIF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
diff --git a/Graphics/Testing/Python/CMakeLists.txt b/Graphics/Testing/Python/CMakeLists.txt
deleted file mode 100644
index 1c925510d0ae4e155da78134e7c15e4f237a9083..0000000000000000000000000000000000000000
--- a/Graphics/Testing/Python/CMakeLists.txt
+++ /dev/null
@@ -1,225 +0,0 @@
-INCLUDE(${VTK_SOURCE_DIR}/Utilities/vtkTclTest2Py/vtkConvertTclTestToPy.cmake)
-IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-
-  IF (VTK_PYTHON_EXE)
-    SET(tests)
-    
-    IF (VTK_DATA_ROOT)
-      # Tests written in Python
-      FOREACH ( tfile
-                cameraWarpedCone
-                glyphComb
-                streamComb
-                tubeComb
-                streamSurface
-                streamSurface2
-                )
-        ADD_TEST(${tfile}Python-image ${VTK_PYTHON_EXE}
-          ${VTK_BINARY_DIR}/Utilities/vtkTclTest2Py/rtImageTest.py
-          ${VTK_SOURCE_DIR}/Graphics/Testing/Python/${tfile}.py
-          -D ${VTK_DATA_ROOT}
-          -T ${VTK_BINARY_DIR}/Testing/Temporary
-          -V Baseline/Graphics/${tfile}.png
-          -A "${VTK_BINARY_DIR}/Utilities/vtkTclTest2Py" 
-          -A "${VTK_LIBRARY_DIR}"
-          )
-      ENDFOREACH( tfile )
-
-      # Add tests converted from Tcl
-      SET( tests ${tests}
-          AutomaticPlaneGeneration
-          Canny
-          CellDataToPointData
-          Delaunay2D
-          Delaunay2DAlpha
-          Delaunay2DTransform
-          Delaunay3D
-          Disk
-          EnSight6Elements
-          EnSight6OfficeBin
-          EnSightBlow1ASCII
-          EnSightBlow1Bin
-          EnSightBlow2ASCII
-          EnSightBlow2Bin
-          EnSightBlow3Bin
-          EnSightBlow4Bin
-          EnSightBlow5ASCII
-          EnSightCompound
-          EnSightGoldElements
-          EnSightIronProtASCII
-          EnSightIronProtBin
-          EnSightMandelbrot
-          EnSightNfacedASCII
-          EnSightNfacedBin
-          EnSightOfficeASCII
-          EnSightOfficeBin
-          EnSightRectGridASCII
-          EnSightRectGridBin
-          EnSightSelectArrays
-          ExtractEdgesQuadraticCells
-          ExtractTensors
-          Hyper
-          HyperScalarBar
-          KlineBottle
-          LineIntersectQuadraticCells
-          MatrixToTransform
-          MultidimensionalSolution
-          NoLightGeneration
-          OBBCylinder
-          OSCone
-          PolyDataMapperAllPolygons 
-          PolyDataMapperAllWireframe
-          QuadricDecimation
-          StreamPolyData
-          TenEllip
-          TestBandedContourFilter
-          TestBoxFunction
-          TestButtonSource
-          TestCameraInterpolator
-          TestCellDerivs
-          TestClipClosedSurface
-          TestClipOutline
-          TestCurvatures
-          TestDiscreteMarchingCubes
-          TestGraphLayoutFilter
-          TestGridSynchronizedTemplates3D
-          TestImageMarchingCubes
-          TestMarchingSquares
-          TestMultiBlockStreamer
-          TestParametricFunctions
-          #TestPlatonicSolids -- uses eval to expand list
-          TestQuadricClustering
-          TestRectilinearGridToTetrahedra
-          TestRectilinearSynchronizedTemplates
-          TestRegularPolygonSource
-          TestRibbonAndTube
-          TestRotate
-          TestRuledSurface
-          TestRuledSurface2
-          TestSpherePuzzle
-          TestSpherePuzzleArrows
-          TestSplineFilter
-          TestStructuredGrid
-          TestSynchronizedTemplates2D
-          TestSynchronizedTemplates3D
-          TestTransformInterpolator
-          TestTriangleFilter
-          TransformConcatenation
-          TransformCoverage
-          TransformImageData
-          TransformPolyData
-          WarpToImage
-
-          blankGrid
-          capCow
-          capSphere
-          clipArt 
-          clipComb 
-          clipImage
-          clipQuadraticCells 
-          clipVolume
-          clipVolume2
-          clipVolume3
-          combStreamers
-          combStreamers2
-          coneResolution
-          constrainedDelaunay
-          #contour2DAll -- complex use of string eval.
-          #contour3DAll -- complex use of string eval.
-          contourCells
-          contourQuadraticCells
-          contoursToSurface
-          cowHair
-          cowHair2
-          createBFont
-          cursor3D
-          cutLoop
-          cylindrical
-          cylMap
-          dataSetSurfaceFilter
-          #deciPlane  -- complex use of string eval
-          dicer
-          dispPlot
-          edgePoints
-          eleState
-          extractPolyData
-          extractRectGrid
-          extractUGrid
-          extractVectors
-          extrudeCopyCD
-          fieldToPolyData
-          fieldToRGrid
-          fieldToSGrid
-          fieldToUGrid
-          financialField
-          genHead
-          geomFilter
-          glyph2D
-          headBone
-          hull
-          iceCream
-          #imageMCAll -- substitution in method call.
-          mcubes
-          mergeFilter
-          motor
-          multipleComponentContour
-          multipleIso
-          nacaBinary
-          officeStreamPoints
-          polyConn
-          probeComb
-          progGlyphs
-          progGlyphsBySource
-          #quadricCut -- switch case
-          rectGrid
-          recursiveDC
-          reverseNormals
-          scalarColors
-          scalarConn
-          schwarz
-          shepards
-          #skinOrder -- sources a script.
-          smoothCyl
-          smoothCyl2
-          smoothMeshOnMesh
-          socbal
-          #spatialRepAll -- complex string substitutions
-          spherical
-          splitVectors
-          stereoDresdenMace
-          streamTracer
-          stripF
-          subdividePointData
-          subDivideTetra
-          subPixelPositionMin
-          #sync3dAll -- substitution in method call.
-          teapotHulls
-          testDataSetTriangleFilter
-          testDataSetTriangleFilter2
-          testHexaPenta
-          testReflect
-          textureThreshold
-          triangularTCoords
-          triangularTexture
-          warplens
-          )
-
-      # Newer tests using vtk.test.Testing.
-      FOREACH ( tfile
-                TestTensorGlyph
-                TestTextureGlyph
-                )
-        ADD_TEST(${tfile}Python-image ${VTK_PYTHON_EXE}
-          ${VTK_SOURCE_DIR}/Graphics/Testing/Python/${tfile}.py
-          -D ${VTK_DATA_ROOT}
-          -B ${VTK_DATA_ROOT}/Baseline/Graphics)
-      ENDFOREACH( tfile )
-    ELSE (VTK_DATA_ROOT)
-      # All Graphics tests require VTKData - no tests should be in this block...
-    ENDIF (VTK_DATA_ROOT)
-
-    CONVERT_TCL_TEST_TO_PY(
-      tests
-      Graphics)
-  ENDIF (VTK_PYTHON_EXE)
-ENDIF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
diff --git a/Graphics/Testing/Tcl/CMakeLists.txt b/Graphics/Testing/Tcl/CMakeLists.txt
deleted file mode 100644
index 6c8deafaaeaf7e0e94792269cf382a68daae8352..0000000000000000000000000000000000000000
--- a/Graphics/Testing/Tcl/CMakeLists.txt
+++ /dev/null
@@ -1,216 +0,0 @@
-IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-  #
-  # Add tests
-  #
-  IF (VTK_DATA_ROOT)
-
-    FOREACH ( tfile
-      AutomaticPlaneGeneration
-      Canny
-      CellDataToPointData
-      Delaunay2D
-      Delaunay2DAlpha
-      Delaunay2DTransform
-      Delaunay3D
-      Disk
-      EnSight6Elements
-      EnSight6OfficeBin
-      EnSightBlow1ASCII
-      EnSightBlow1Bin
-      EnSightBlow2ASCII
-      EnSightBlow2Bin
-      EnSightBlow3Bin
-      EnSightBlow4Bin
-      EnSightBlow5ASCII
-      EnSightCompound
-      EnSightGoldElements
-      EnSightIronProtASCII
-      EnSightIronProtBin
-      EnSightMandelbrot
-      EnSightNfacedASCII
-      EnSightNfacedBin
-      EnSightOfficeASCII
-      EnSightOfficeBin
-      EnSightRectGridASCII
-      EnSightRectGridBin
-      EnSightSelectArrays
-      ExtractEdgesQuadraticCells
-      ExtractTensors
-      Hyper
-      HyperScalarBar
-      KlineBottle
-      LineIntersectQuadraticCells
-      MatrixToTransform
-      MultidimensionalSolution
-      NoLightGeneration
-      OBBCylinder
-      OSCone
-      PolyDataMapperAllPolygons
-      PolyDataMapperAllWireframe
-      QuadricDecimation
-      StreamPolyData
-      TenEllip
-      TestBandedContourFilter
-      TestBoxFunction
-      TestButtonSource
-      TestCameraInterpolator
-      TestCellDerivs
-      TestClipClosedSurface
-      TestClipOutline
-      TestCurvatures
-      TestDiscreteMarchingCubes
-      TestFillHolesFilter
-      TestGraphLayoutFilter
-      TestGridSynchronizedTemplates3D
-      TestImageMarchingCubes
-      TestMarchingSquares
-      TestMultiBlockStreamer
-      TestParametricFunctions
-      TestPlatonicSolids
-      TestQuadricClustering
-      TestRandomAttributeGenerator
-      TestRectilinearGridToTetrahedra
-      TestRectilinearSynchronizedTemplates
-      TestRegularPolygonSource
-      TestRibbonAndTube
-      TestRotate
-      TestRuledSurface
-      TestRuledSurface2
-      TestSpherePuzzle
-      TestSpherePuzzleArrows
-      TestSplineFilter
-      TestStructuredGrid
-      TestSynchronizedTemplates2D
-      TestSynchronizedTemplates3D
-      TestTransformCoordinateSystems
-      TestTransformInterpolator
-      TestTriangleFilter
-      TransformConcatenation
-      TransformCoverage
-      TransformImageData
-      TransformPolyData
-      WarpScalarImage
-      WarpToImage
-      WarpVectorImage
-      blankGrid
-      capCow
-      capSphere
-      clipArt
-      clipComb
-      clipImage
-      clipQuadraticCells
-      clipVolume
-      clipVolume2
-      clipVolume3
-      combStreamers
-      combStreamers2
-      coneResolution
-      constrainedDelaunay
-      contour2DAll
-      contour3DAll
-      contourCells
-      contourQuadraticCells
-      contoursToSurface
-      cowHair
-      cowHair2
-      createBFont
-      cursor2D
-      cursor3D
-      cutLoop
-      cylMap
-      cylindrical
-      dataSetSurfaceFilter
-      deciPlane
-      dicer
-      dispPlot
-      edgePoints
-      eleState
-      extractPolyData
-      extractRectGrid
-      extractUGrid
-      extractVectors
-      extrudeCopyCD
-      fieldToPolyData
-      fieldToRGrid
-      fieldToSGrid
-      fieldToUGrid
-      financialField
-      genHead
-      geomFilter
-      glyph2D
-      headBone
-      hull
-      iceCream
-      imageMCAll
-      mcubes
-      mergeFilter
-      motor
-      multipleComponentContour
-      multipleIso
-      nacaBinary
-      officeStreamPoints
-      polyConn
-      probe
-      probeComb
-      progGlyphs
-      progGlyphsBySource
-      quadricCut
-      rectGrid
-      recursiveDC
-      reverseNormals
-      scalarColors
-      scalarConn
-      schwarz
-      shepards
-      skinOrder
-      smoothCyl
-      smoothCyl2
-      smoothMeshOnMesh
-      socbal
-      spatialRepAll
-      spherical
-      splitVectors
-      stereoDresdenMace
-      streamTracer
-      stripF
-      subDivideTetra
-      subPixelPositionMin
-      subdividePointData
-      sync3dAll
-      teapotHulls
-      testDataSetTriangleFilter
-      testDataSetTriangleFilter2
-      testHexaPenta
-      testReflect
-      textureThreshold
-      triangularTCoords
-      triangularTexture
-      warplens
-      )
-      ADD_TEST(${tfile}-image ${VTK_EXECUTABLE}
-        ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-        ${VTK_SOURCE_DIR}/Graphics/Testing/Tcl/${tfile}.tcl
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
-        -V Baseline/Graphics/${tfile}.png
-        -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-    ENDFOREACH ( tfile )
-
-  #
-  # If we do not have the data, still run the tests that we can
-  #
-  ELSE (VTK_DATA_ROOT)
-    # All rtImageTest tests require VTKData to pass...
-    # Do not add any rtImageTest based tests in this block.
-  ENDIF (VTK_DATA_ROOT)
-ENDIF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-
-ADD_TEST(PrintSelf-Graphics ${TCL_TCLSH}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/PrintSelfCheck.tcl  
-         ${VTK_SOURCE_DIR}/Graphics)
-
-ADD_TEST(TestSetObjectMacro-Graphics ${TCL_TCLSH}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/FindString.tcl
-         "${VTK_SOURCE_DIR}/Graphics/vtk\\\\*.h"
-         "vtkSetObjectMacro"
-         )
diff --git a/Hybrid/CMakeLists.txt b/Hybrid/CMakeLists.txt
deleted file mode 100644
index 30929721774c5109e4ae42af909b852ea4847214..0000000000000000000000000000000000000000
--- a/Hybrid/CMakeLists.txt
+++ /dev/null
@@ -1,180 +0,0 @@
-SET(KIT Hybrid)
-SET(UKIT HYBRID)
-
-SET(KIT_TCL_LIBS vtkRenderingTCL vtkIOTCL)
-SET(KIT_PYTHON_LIBS vtkRenderingPythonD vtkIOPythonD)
-SET(KIT_JAVA_LIBS vtkRenderingJava vtkIOJava)
-SET(KIT_INTERFACE_LIBRARIES vtkRendering vtkIO)
-
-IF(VTK_HAS_EXODUS)
-  SET(KIT_LIBS ${KIT_LIBS} vtkexoIIc)
-  IF(VTK_USE_PARALLEL)
-    SET(KIT_INTERFACE_LIBRARIES ${KIT_INTERFACE_LIBRARIES} vtkParallel)
-  ENDIF(VTK_USE_PARALLEL)
-ENDIF(VTK_HAS_EXODUS)
-
-IF (WIN32)
-  IF (VTK_VFW_SUPPORTS_CAPTURE)
-    IF(BORLAND)
-      INCLUDE ("${CMAKE_ROOT}/Modules/CheckLibraryExists.cmake")
-      CHECK_LIBRARY_EXISTS("vfw32" "printf" "" HAVE_VFW32)
-      IF(NOT HAVE_VFW32)
-        MESSAGE(SEND_ERROR "Bad installation of Borland compiler. PSDK is not in ilink32.cfg and in bcc32.cfg.")
-      ENDIF(NOT HAVE_VFW32)
-    ENDIF(BORLAND)
-    SET(KIT_LIBS ${KIT_LIBS} vfw32)
-  ENDIF (VTK_VFW_SUPPORTS_CAPTURE)
-  IF (VTK_USE_MATROX_IMAGING)
-    SET(KIT_LIBS ${KIT_LIBS} ${MIL_LIBRARY})
-  ENDIF (VTK_USE_MATROX_IMAGING)
-ENDIF (WIN32)
-
-# for vtkImageDataLIC2D and vtkStructuredGridLIC2D
-SET( KIT_LIBS ${KIT_LIBS} vtkftgl )
-
-SET ( Kit_SRCS
-vtk3DSImporter.cxx
-vtkArcPlotter.cxx
-vtkAnnotatedCubeActor.cxx
-vtkAxisActor.cxx
-vtkAxesActor.cxx
-vtkAxisFollower.cxx
-vtkBarChartActor.cxx
-vtkBSplineTransform.cxx
-vtkCaptionActor2D.cxx
-vtkCornerAnnotation.cxx
-vtkCubeAxesActor.cxx
-vtkCubeAxesActor2D.cxx
-vtkDepthSortPolyData.cxx
-vtkEarthSource.cxx
-vtkFacetReader.cxx
-vtkGreedyTerrainDecimation.cxx
-vtkGridTransform.cxx
-vtkImageDataLIC2D.cxx
-vtkImageDataLIC2DExtentTranslator.cxx
-vtkImageToPolyDataFilter.cxx
-vtkImplicitModeller.cxx
-vtkIterativeClosestPointTransform.cxx
-vtkLandmarkTransform.cxx
-vtkLegendBoxActor.cxx
-vtkLegendScaleActor.cxx
-vtkMNIObjectReader.cxx
-vtkMNIObjectWriter.cxx
-vtkMNITagPointReader.cxx
-vtkMNITagPointWriter.cxx
-vtkMNITransformReader.cxx
-vtkMNITransformWriter.cxx
-vtkPCAAnalysisFilter.cxx
-vtkPieChartActor.cxx
-vtkPolarAxesActor.cxx
-vtkPolyDataSilhouette.cxx
-vtkPolyDataToImageStencil.cxx
-vtkProcrustesAlignmentFilter.cxx
-vtkProjectedTerrainPath.cxx
-vtkRIBExporter.cxx
-vtkRIBLight.cxx
-vtkRIBProperty.cxx
-vtkRenderLargeImage.cxx
-vtkSpiderPlotActor.cxx
-vtkStructuredGridLIC2D.cxx
-vtkTemporalDataSetCache.cxx
-vtkTemporalInterpolator.cxx
-vtkTemporalShiftScale.cxx
-vtkTemporalSnapToTimeStep.cxx
-vtkThinPlateSplineTransform.cxx
-vtkTransformToGrid.cxx
-vtkVRMLImporter.cxx
-vtkVectorText.cxx
-vtkVideoSource.cxx
-vtkWeightedTransformFilter.cxx
-vtkXYPlotActor.cxx
-vtkX3D.cxx
-vtkX3DExporter.cxx
-vtkX3DExporterWriter.cxx
-vtkX3DExporterXMLWriter.cxx
-vtkX3DExporterFIWriter.cxx
-)
-
-IF(VTK_HAS_EXODUS)
-  SET(Kit_SRCS ${Kit_SRCS}
-    vtkExodusIICache.cxx
-    vtkExodusIIReader.cxx
-    vtkExodusIIReaderParser.cxx
-    vtkExodusIIReaderVariableCheck.cxx
-    vtkDSPFilterDefinition.cxx
-    vtkExodusModel.cxx
-    vtkDSPFilterGroup.cxx
-    )
-  IF(VTK_USE_PARALLEL)
-    SET(Kit_SRCS ${Kit_SRCS}
-      vtkPExodusIIReader.cxx
-      )
-  ENDIF(VTK_USE_PARALLEL)
-ENDIF(VTK_HAS_EXODUS)
-
-IF (WIN32)
-  IF (VTK_VFW_SUPPORTS_CAPTURE)
-    SET (Kit_SRCS ${Kit_SRCS} vtkWin32VideoSource.cxx)
-  ENDIF (VTK_VFW_SUPPORTS_CAPTURE)
-
-  IF (VTK_USE_MATROX_IMAGING)
-    SET (Kit_SRCS ${Kit_SRCS} vtkMILVideoSource.cxx)
-    # Include directory needed for vtkMILVideoSource.cxx.
-  ENDIF (VTK_USE_MATROX_IMAGING)
-ENDIF (WIN32)
-
-SET_SOURCE_FILES_PROPERTIES(
-vtkStructuredGridLIC2D
-vtkVRML
-vtkX3D
-vtkX3DExporterWriter
-vtkX3DExporterFIWriter
-vtkX3DExporterXMLWriter
-vtkExodusIIReaderParser
-vtkExodusIIReaderVariableCheck
-WRAP_EXCLUDE)
-
-# for vtkStructuredGridLIC2D
-SET( shader_files
-     vtkStructuredGridLIC2D_fs.glsl
-   )
-
-SET(Kit_EXTRA_SRCS)
-SET(Kit_EXTRA_CMDS)
-SET(Kit_TCL_EXTRA_SRCS)
-SET(Kit_PYTHON_EXTRA_SRCS)
-SET(Kit_JAVA_EXTRA_SRCS)
-SET(KIT_TCL_DEPS)
-SET(KIT_PYTHON_DEPS)
-SET(KIT_JAVA_DEPS)
-
-# for vtkStructuredGridLIC2D
-SET( shader_h_files )
-FOREACH( file ${shader_files} )
-  GET_FILENAME_COMPONENT(file_we ${file} NAME_WE)
-  SET( src ${VTK_SOURCE_DIR}/Hybrid/${file} )
-  SET( res ${VTK_BINARY_DIR}/Hybrid/${file_we}.cxx )
-  SET( resh ${VTK_BINARY_DIR}/Hybrid/${file_we}.h )
-  SET( shader_h_files ${shader_h_files} "${resh}" )
-  ADD_CUSTOM_COMMAND(
-    OUTPUT ${res} ${resh}
-    DEPENDS ${src} vtkEncodeString
-    COMMAND ${VTK_ENCODESTRING_EXE}
-    ARGS ${res} ${src} ${file_we} --build-header VTK_HYBRID_EXPORT vtkSystemIncludes.h
-    )
-  SET( Kit_EXTRA_SRCS ${Kit_EXTRA_SRCS} ${res} )
-ENDFOREACH( file )
-
-#-----------------------------------------------------------------------------
-# Include CMake code common to all kits.
-INCLUDE(${VTK_CMAKE_DIR}/KitCommonBlock.cmake)
-#-----------------------------------------------------------------------------
-
-IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-  INSTALL(FILES
-    ${shader_h_files}
-    ${CMAKE_CURRENT_SOURCE_DIR}/vtk3DS.h
-    DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}
-    COMPONENT Development
-    )
-ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
diff --git a/Hybrid/Testing/CMakeLists.txt b/Hybrid/Testing/CMakeLists.txt
deleted file mode 100644
index 062cddc58dc6f057ee6b507193bb4ca073e0fcce..0000000000000000000000000000000000000000
--- a/Hybrid/Testing/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-# Commented out to avoid problems with Borland dashboards
-# until new tests are added to Cxx/CMakeLists.txt.
-ADD_SUBDIRECTORY(Cxx)
-
-IF (VTK_WRAP_TCL)
-  ADD_SUBDIRECTORY(Tcl)
-ENDIF (VTK_WRAP_TCL)
-
-IF (VTK_WRAP_PYTHON)
-  ADD_SUBDIRECTORY(Python)
-ENDIF (VTK_WRAP_PYTHON)
-
-IF(PYTHON_EXECUTABLE)
-  ADD_TEST(HeaderTesting-Hybrid ${PYTHON_EXECUTABLE}
-    ${VTK_SOURCE_DIR}/Common/Testing/HeaderTesting.py
-    "${VTK_SOURCE_DIR}/Hybrid"
-    VTK_HYBRID_EXPORT
-    vtk3DS.h
-    vtkExodusIIReaderParser.h
-    vtkExodusIIReaderPrivate.h
-    vtkExodusIIReaderVariableCheck.h
-    vtkVRML.h
-    vtkX3D.h
-    vtkX3DExporterFIWriterHelper.h
-    )
-ENDIF(PYTHON_EXECUTABLE)
diff --git a/Hybrid/Testing/Cxx/CMakeLists.txt b/Hybrid/Testing/Cxx/CMakeLists.txt
deleted file mode 100644
index 748e548bc98c529ef339baa30279c04219be5efa..0000000000000000000000000000000000000000
--- a/Hybrid/Testing/Cxx/CMakeLists.txt
+++ /dev/null
@@ -1,99 +0,0 @@
-SET(KIT Hybrid)
-# add tests that do not require data
-SET(MyTests
-  TestBSplineWarp.cxx
-  TestImageStencilData.cxx
-  X3DTest.cxx
-  )
-IF (VTK_DATA_ROOT)
-  # add tests that require data
-  SET(MyTests ${MyTests}
-#    TestAxisActor3D.cxx
-    TestCubeAxes2DMode.cxx
-    TestCubeAxes3.cxx
-    TestCubeAxesWithGridLines.cxx
-    TestCubeAxesWithXLines.cxx
-    TestCubeAxesWithYLines.cxx
-    TestCubeAxesWithZLines.cxx
-    TestCubeAxesWithXInnerGrids.cxx
-    TestCubeAxesWithYInnerGrids.cxx
-    TestCubeAxesWithZInnerGrids.cxx
-    TestCubeAxesWithXInnerPolys.cxx
-    TestCubeAxesWithYInnerPolys.cxx
-    TestCubeAxesWithZInnerPolys.cxx
-    TestBarChartActor.cxx
-    TestExodusImplicitArrays.cxx
-    TestLegendScaleActor.cxx
-    TestPolarAxes.cxx
-    TestPolyDataSilhouette.cxx
-    TestPieChartActor.cxx
-    TestSpiderPlotActor.cxx
-    TestVRMLNormals.cxx
-    TestTDxGeo.cxx
-    TestLegendBoxActor.cxx
-    )
-  # Temporarily disable LIC tests on Mac platforms
-  IF (VTK_USE_GLSL_SHADERS AND NOT APPLE)
-    SET(MyTests ${MyTests}
-      TestImageDataLIC2D.cxx
-      TestStructuredGridLIC2DXSlice.cxx
-      TestStructuredGridLIC2DYSlice.cxx
-      TestStructuredGridLIC2DZSlice.cxx
-      )
-  ENDIF ()
-ENDIF (VTK_DATA_ROOT)
-
-# remove some tests if there is no display of if they need args
-IF(NOT VTK_USE_DISPLAY)
-  REMOVE(MyTests
-    TestAxisActor3D.cxx
-    TestBarChartActor.cxx
-    TestLegendScaleActor.cxx
-    TestPieChartActor.cxx
-    TestPolyDataSilhouette.cxx
-    TestSpiderPlotActor.cxx
-    X3DTest.cxx
-    TestLegendBoxActor.cxx
-    )
-ENDIF(NOT VTK_USE_DISPLAY)
-
-IF (VTK_DATA_ROOT)
-  ADD_TEST(TestPolyDataSilhouette ${CXX_TEST_PATH}/${KIT}CxxTests
-           TestPolyDataSilhouette ${VTK_DATA_ROOT}/Data/cow.vtp)
-ENDIF (VTK_DATA_ROOT)
-
-INCLUDE(${VTK_SOURCE_DIR}/Rendering/vtkTestingObjectFactory.cmake)
-
-ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
-TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkHybrid vtkRendering vtkImaging vtkIO )
-SET (TestsToRun ${Tests})
-REMOVE (TestsToRun ${KIT}CxxTests.cxx TestPolyDataSilhouette.cxx TestImageStencilData.cxx)
-
-#
-# Add all the executables
-FOREACH (test ${TestsToRun})
-  GET_FILENAME_COMPONENT(TName ${test} NAME_WE)
-  IF (VTK_DATA_ROOT)
-    ADD_TEST(${TName} ${CXX_TEST_PATH}/${KIT}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -V Baseline/${KIT}/${TName}.png)
-  ELSE (VTK_DATA_ROOT)
-    ADD_TEST(${TName} ${CXX_TEST_PATH}/${KIT}CxxTests ${TName})
-  ENDIF (VTK_DATA_ROOT)
-ENDFOREACH (test)
-
-IF(VTK_DATA_ROOT AND VTK_USE_DISPLAY)
-  ADD_TEST(TestAddStencilData ${CXX_TEST_PATH}/${KIT}CxxTests
-         TestImageStencilData 1
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
-        -D ${VTK_DATA_ROOT}
-        -V Baseline/${KIT}/TestAddStencilData.png)
-  ADD_TEST(TestSubtractStencilData ${CXX_TEST_PATH}/${KIT}CxxTests
-         TestImageStencilData 2
-        -D ${VTK_DATA_ROOT}
-        -V Baseline/${KIT}/TestSubtractStencilData.png)
-  ADD_TEST(TestClipStencilData ${CXX_TEST_PATH}/${KIT}CxxTests
-         TestImageStencilData 3
-        -D ${VTK_DATA_ROOT}
-        -V Baseline/${KIT}/TestClipStencilData.png)
-ENDIF(VTK_DATA_ROOT AND VTK_USE_DISPLAY)
diff --git a/Hybrid/Testing/Python/CMakeLists.txt b/Hybrid/Testing/Python/CMakeLists.txt
deleted file mode 100644
index 322d5b8d3bcd6b167b88c2819906203b0499f0d9..0000000000000000000000000000000000000000
--- a/Hybrid/Testing/Python/CMakeLists.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-INCLUDE(${VTK_SOURCE_DIR}/Utilities/vtkTclTest2Py/vtkConvertTclTestToPy.cmake)
-IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-  #
-  # Add tests, with the data
-  #
-  IF (VTK_DATA_ROOT)
-    IF (VTK_PYTHON_EXE)
-      # Add test converted from Tcl
-      SET( tests
-        3DMorph
-        appendImplicitModel
-        appendImplicitModelNoBounds
-        banana
-        bore
-        camera
-        clipHex
-        clipPyramid
-        clipTet
-        clipWedge
-        cubeAxes
-        depthSort
-        earth
-        imageToPolyData
-        #financialField2 -- arrays
-        #financialField3 -- arrays
-        largeImageOffset
-        largeImageParallel
-        #MassProperties -- complicated global/local mess up 
-        OverlayTextOnImage
-        TestCaptionActor
-        TestFacetReader
-        TestGreedyTerrainDecimation
-        TestGridWarp3D
-        TestGridWarpCubic
-        TestGridWarpLinear
-        TestGridWarpNearest
-        #TestICPTransform  --complex arrays
-        TestImageStencilWithPolydata
-        TestMNIObjects
-        TestMNITagPoints
-        TestMNITransforms
-        TestPCA
-        TestProcrustes
-        TestProjectedTerrainPath
-        TestThinPlateWarp
-        TestThinPlateWarp3D
-        text
-        VRMLImporter
-        WarpPolyData
-        xyPlot
-        xyPlot2
-        xyPlot3
-        xyPlot4
-        )
-      CONVERT_TCL_TEST_TO_PY (
-        tests
-        Hybrid)       
-
-    ENDIF (VTK_PYTHON_EXE)
-  ENDIF (VTK_DATA_ROOT)
-ENDIF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
diff --git a/Hybrid/Testing/Tcl/CMakeLists.txt b/Hybrid/Testing/Tcl/CMakeLists.txt
deleted file mode 100644
index b5bb7756ca1c83d8c725300668e4ed24daf200fd..0000000000000000000000000000000000000000
--- a/Hybrid/Testing/Tcl/CMakeLists.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-  #
-  # Add tests
-  #
-  IF (VTK_DATA_ROOT)
-    FOREACH ( tfile 
-      3DMorph
-      appendImplicitModel
-      appendImplicitModelNoBounds
-      banana
-      bore
-      camera
-      clipHex
-      clipPyramid
-      clipTet
-      clipWedge
-      cubeAxes
-      cubeAxes2
-      cubeAxes3
-      depthSort
-      earth
-      imageToPolyData
-      financialField2
-      financialField3
-      largeImageOffset
-      largeImageParallel
-      MassProperties
-      OverlayTextOnImage
-      TestCaptionActor
-      TestFacetReader
-      TestGreedyTerrainDecimation
-      TestGridWarp3D
-      TestGridWarpCubic
-      TestGridWarpLinear
-      TestGridWarpNearest
-      TestICPTransform
-      TestImageStencilWithPolydata
-      TestMNIObjects
-      TestMNITagPoints
-      TestMNITransforms
-      TestPCA
-      TestProcrustes
-      TestProcrustesRigidCentroid
-      TestProjectedTerrainPath
-      TestThinPlateWarp
-      TestThinPlateWarp3D
-      text
-      VRMLImporter
-      WarpPolyData
-      xyPlot
-      xyPlot2
-      xyPlot3
-      xyPlot4
-      )
-      ADD_TEST(${tfile}-image ${VTK_EXECUTABLE}
-        ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-        ${VTK_SOURCE_DIR}/Hybrid/Testing/Tcl/${tfile}.tcl
-        -D ${VTK_DATA_ROOT}
-        -V Baseline/Hybrid/${tfile}.png
-        -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-    ENDFOREACH( tfile )
-  #
-  # If we do not have the data, still run the tests that we can
-  #
-  ELSE (VTK_DATA_ROOT)
-    # All rtImageTest tests require VTKData to pass...
-    # Do not add any rtImageTest based tests in this block.
-  ENDIF (VTK_DATA_ROOT)
-ENDIF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-
-ADD_TEST(PrintSelf-Hybrid ${TCL_TCLSH}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/PrintSelfCheck.tcl  
-         ${VTK_SOURCE_DIR}/Hybrid)
-
-ADD_TEST(TestSetObjectMacro-Hybrid ${TCL_TCLSH}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/FindString.tcl
-         "${VTK_SOURCE_DIR}/Hybrid/vtk\\\\*.h"
-         "vtkSetObjectMacro")
diff --git a/Hybrid/Testing/Temporary/CTestCostData.txt b/Hybrid/Testing/Temporary/CTestCostData.txt
deleted file mode 100644
index ed97d539c095cf1413af30cc23dea272095b97dd..0000000000000000000000000000000000000000
--- a/Hybrid/Testing/Temporary/CTestCostData.txt
+++ /dev/null
@@ -1 +0,0 @@
----
diff --git a/Hybrid/Testing/Temporary/LastTest.log b/Hybrid/Testing/Temporary/LastTest.log
deleted file mode 100644
index 807e8f478585c50bd01fbb43d6499805bdd7842f..0000000000000000000000000000000000000000
--- a/Hybrid/Testing/Temporary/LastTest.log
+++ /dev/null
@@ -1,3 +0,0 @@
-Start testing: Oct 21 16:43 EDT
-----------------------------------------------------------
-End testing: Oct 21 16:43 EDT
diff --git a/IO/CMakeLists.txt b/IO/CMakeLists.txt
deleted file mode 100644
index c922469d413bc32e2fe510c732bbb03dbe3bccc3..0000000000000000000000000000000000000000
--- a/IO/CMakeLists.txt
+++ /dev/null
@@ -1,461 +0,0 @@
-IF(VTK_USE_METAIO)
-  SET(_VTK_METAIO_LIB vtkmetaio)
-  SET(_VTK_METAIO_SOURCES vtkMetaImageReader.cxx vtkMetaImageWriter.cxx )
-ELSE(VTK_USE_METAIO)
-  SET(_VTK_METAIO_LIB)
-  SET(_VTK_METAIO_SOURCES)
-ENDIF(VTK_USE_METAIO)
-
-IF(VTK_USE_OGGTHEORA_ENCODER)
-  set(_VTK_OGGTHEORA_SOURCES vtkOggTheoraWriter.cxx)
-ELSE(VTK_USE_OGGTHEORA_ENCODER)
-  set(_VTK_OGGTHEORA_SOURCES)
-ENDIF(VTK_USE_OGGTHEORA_ENCODER)
-
-SET(KIT IO)
-SET(UKIT IO)
-SET(KIT_TCL_LIBS vtkFilteringTCL)
-SET(KIT_PYTHON_LIBS vtkFilteringPythonD)
-SET(KIT_JAVA_LIBS vtkFilteringJava)
-SET(KIT_INTERFACE_LIBRARIES vtkFiltering)
-SET(KIT_LIBS vtkDICOMParser vtkNetCDF vtkNetCDF_cxx LSDyna
-  ${_VTK_METAIO_LIB} vtksqlite
-  ${VTK_PNG_LIBRARIES} ${VTK_ZLIB_LIBRARIES} ${VTK_JPEG_LIBRARIES}
-  ${VTK_TIFF_LIBRARIES} ${VTK_EXPAT_LIBRARIES} ${VTK_OGGTHEORA_LIBRARIES}
-  ${KWSYS_NAMESPACE})
-
-SET( Kit_SRCS
-vtkAbstractParticleWriter.cxx
-vtkASCIITextCodec.cxx
-vtkAVSucdReader.cxx
-vtkBMPReader.cxx
-vtkBMPWriter.cxx
-vtkBYUReader.cxx
-vtkBYUWriter.cxx
-vtkBase64InputStream.cxx
-vtkBase64OutputStream.cxx
-vtkBase64Utilities.cxx
-vtkCGMWriter.cxx
-vtkChacoReader.cxx
-vtkCompositeDataReader.cxx
-vtkCompositeDataWriter.cxx
-vtkDatabaseToTableReader.cxx
-vtkDEMReader.cxx
-vtkDICOMImageReader.cxx
-vtkDataCompressor.cxx
-vtkDataObjectReader.cxx
-vtkDataObjectWriter.cxx
-vtkDataReader.cxx
-vtkDataSetReader.cxx
-vtkDataSetWriter.cxx
-vtkDataWriter.cxx
-vtkDelimitedTextWriter.cxx
-vtkEnSight6BinaryReader.cxx
-vtkEnSight6Reader.cxx
-vtkEnSightGoldBinaryReader.cxx
-vtkEnSightGoldReader.cxx
-vtkEnSightMasterServerReader.cxx
-vtkEnSightReader.cxx
-vtkFLUENTReader.cxx
-vtkFacetWriter.cxx
-vtkGESignaReader.cxx
-vtkGAMBITReader.cxx
-vtkGaussianCubeReader.cxx
-vtkGenericDataObjectReader.cxx
-vtkGenericDataObjectWriter.cxx
-vtkGenericEnSightReader.cxx
-vtkGenericMovieWriter.cxx
-vtkGlobFileNames.cxx
-vtkGraphReader.cxx
-vtkGraphWriter.cxx
-vtkIVWriter.cxx
-vtkImageReader.cxx
-vtkImageReader2.cxx
-vtkImageReader2Collection.cxx
-vtkImageReader2Factory.cxx
-vtkImageWriter.cxx
-vtkInputStream.cxx
-vtkJavaScriptDataWriter.cxx
-vtkJPEGReader.cxx
-vtkJPEGWriter.cxx
-vtkLSDynaPart.cxx
-vtkLSDynaPartCollection.cxx
-vtkLSDynaReader.cxx
-vtkLSDynaSummaryParser.cxx
-vtkMFIXReader.cxx
-vtkMaterialLibrary.cxx
-vtkMCubesReader.cxx
-vtkMCubesWriter.cxx
-vtkMedicalImageProperties.cxx
-vtkMedicalImageReader2.cxx
-${_VTK_METAIO_SOURCES}
-vtkMINCImageAttributes.cxx
-vtkMINCImageReader.cxx
-vtkMINCImageWriter.cxx
-vtkMPASReader.cxx
-vtkMultiBlockPLOT3DReader.cxx
-vtkMoleculeReaderBase.cxx
-vtkNetCDFCAMReader.cxx
-vtkNetCDFCFReader.cxx
-vtkNetCDFPOPReader.cxx
-vtkNetCDFReader.cxx
-vtkOBJReader.cxx
-${_VTK_OGGTHEORA_SOURCES}
-vtkOpenFOAMReader.cxx
-vtkOutputStream.cxx
-vtkPDBReader.cxx
-vtkPLY.cxx
-vtkPLYReader.cxx
-vtkPLYWriter.cxx
-vtkPNGReader.cxx
-vtkPNGWriter.cxx
-vtkPNMReader.cxx
-vtkPNMWriter.cxx
-vtkParticleReader.cxx
-vtkPolyDataReader.cxx
-vtkPolyDataWriter.cxx
-vtkPostScriptWriter.cxx
-vtkProStarReader.cxx
-vtkRectilinearGridReader.cxx
-vtkRectilinearGridWriter.cxx
-vtkRTXMLPolyDataReader.cxx
-vtkRowQuery.cxx
-vtkSESAMEReader.cxx
-vtkShaderCodeLibrary.cxx
-vtkSLACParticleReader.cxx
-vtkSLACReader.cxx
-vtkSQLDatabase.cxx
-vtkSQLDatabaseSchema.cxx
-vtkSQLiteDatabase.cxx
-vtkSQLiteToTableReader.cxx
-vtkSQLiteQuery.cxx
-vtkSQLQuery.cxx
-vtkSLCReader.cxx
-vtkSTLReader.cxx
-vtkSTLWriter.cxx
-vtkSimplePointsReader.cxx
-vtkSimplePointsWriter.cxx
-vtkSortFileNames.cxx
-vtkStructuredGridReader.cxx
-vtkStructuredGridWriter.cxx
-vtkStructuredPointsReader.cxx
-vtkStructuredPointsWriter.cxx
-vtkTableReader.cxx
-vtkTableWriter.cxx
-vtkTableToDatabaseWriter.cxx
-vtkTableToSQLiteWriter.cxx
-vtkTecplotReader.cxx
-vtkTextCodec.cxx
-vtkTextCodecFactory.cxx
-vtkTIFFReader.cxx
-vtkTIFFWriter.cxx
-vtkTreeReader.cxx
-vtkTreeWriter.cxx
-vtkUGFacetReader.cxx
-vtkUnstructuredGridReader.cxx
-vtkUnstructuredGridWriter.cxx
-vtkUTF8TextCodec.cxx
-vtkUTF16TextCodec.cxx
-vtkVolume16Reader.cxx
-vtkVolumeReader.cxx
-vtkWriter.cxx
-vtkXMLCompositeDataReader.cxx
-vtkXMLDataParser.cxx
-vtkXMLDataReader.cxx
-vtkXMLDataSetWriter.cxx
-vtkXMLFileReadTester.cxx
-vtkXMLGenericDataObjectReader.cxx
-vtkXMLHierarchicalBoxDataReader.cxx
-vtkXMLHierarchicalDataReader.cxx
-vtkXMLImageDataReader.cxx
-vtkXMLImageDataWriter.cxx
-vtkXMLHyperOctreeReader.cxx
-vtkXMLHyperOctreeWriter.cxx
-vtkXMLMaterial.cxx
-vtkXMLMaterialParser.cxx
-vtkXMLMaterialReader.cxx
-vtkXMLMultiBlockDataReader.cxx
-vtkXMLMultiGroupDataReader.cxx
-vtkXMLCompositeDataWriter.cxx
-vtkXMLMultiBlockDataWriter.cxx
-vtkXMLHierarchicalBoxDataWriter.cxx
-vtkXMLPDataReader.cxx
-vtkXMLPDataSetWriter.cxx
-vtkXMLPDataWriter.cxx
-vtkXMLPImageDataReader.cxx
-vtkXMLPImageDataWriter.cxx
-vtkXMLPPolyDataReader.cxx
-vtkXMLPPolyDataWriter.cxx
-vtkXMLPRectilinearGridReader.cxx
-vtkXMLPRectilinearGridWriter.cxx
-vtkXMLPStructuredDataReader.cxx
-vtkXMLPStructuredDataWriter.cxx
-vtkXMLPStructuredGridReader.cxx
-vtkXMLPStructuredGridWriter.cxx
-vtkXMLPUnstructuredDataReader.cxx
-vtkXMLPUnstructuredDataWriter.cxx
-vtkXMLPUnstructuredGridReader.cxx
-vtkXMLPUnstructuredGridWriter.cxx
-vtkXMLParser.cxx
-vtkXMLPolyDataReader.cxx
-vtkXMLPolyDataWriter.cxx
-vtkXMLReader.cxx
-vtkXMLRectilinearGridReader.cxx
-vtkXMLRectilinearGridWriter.cxx
-vtkXMLShader.cxx
-vtkXMLStructuredDataReader.cxx
-vtkXMLStructuredDataWriter.cxx
-vtkXMLStructuredGridReader.cxx
-vtkXMLStructuredGridWriter.cxx
-vtkXMLUnstructuredDataReader.cxx
-vtkXMLUnstructuredDataWriter.cxx
-vtkXMLUnstructuredGridReader.cxx
-vtkXMLUnstructuredGridWriter.cxx
-vtkXMLUtilities.cxx
-vtkXMLWriter.cxx
-vtkXMLWriterC.cxx
-vtkXYZMolReader.cxx
-vtkZLibDataCompressor.cxx
-)
-
-SET_SOURCE_FILES_PROPERTIES(
-vtkAbstractParticleWriter
-vtkDatabaseToTableReader
-vtkDataCompressor
-vtkEnSightReader
-vtkGenericMovieWriter
-vtkMoleculeReaderBase
-vtkRowQuery
-vtkSQLDatabase
-vtkSQLQuery
-vtkTableToDatabaseWriter
-vtkTextCodec
-vtkTextCodecFactory
-vtkVolumeReader
-vtkWriter
-vtkXMLCompositeDataReader.cxx
-vtkXMLCompositeDataWriter
-vtkXMLDataReader
-vtkXMLPDataReader
-vtkXMLPDataWriter
-vtkXMLPStructuredDataReader
-vtkXMLPStructuredDataWriter
-vtkXMLPUnstructuredDataReader
-vtkXMLPUnstructuredDataWriter
-vtkXMLReader
-vtkXMLStructuredDataReader
-vtkXMLStructuredDataWriter
-vtkXMLUnstructuredDataReader
-vtkXMLUnstructuredDataWriter
-vtkXMLWriter
-ABSTRACT
-)
-
-IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-  INSTALL(FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/vtkMINC.h
-    DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}
-    COMPONENT Development
-    )
-ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-
-# Set up dependencies on the header files generated by 
-# Utilities/MaterialLibrary
-SET_SOURCE_FILES_PROPERTIES(vtkXMLShader.cxx PROPERTIES OBJECT_DEPENDS
-  ${MATERIAL_LIBRARY_SHADER_MACRO_HEADER})
-SET_SOURCE_FILES_PROPERTIES(vtkXMLMaterial.cxx PROPERTIES OBJECT_DEPENDS
-  ${MATERIAL_LIBRARY_MATERIAL_MACRO_HEADER})
-
-IF(WIN32)
-  IF(VTK_USE_VIDEO_FOR_WINDOWS)
-    SET(Kit_SRCS ${Kit_SRCS} vtkAVIWriter.cxx)
-    SET(KIT_LIBS ${KIT_LIBS} vfw32)
-  ENDIF(VTK_USE_VIDEO_FOR_WINDOWS)
-ENDIF(WIN32)
-
-#-----------------------------------------------------------------------------
-# FFMPEG
-# If the ffmpeg library is available, compile vtkFFMPEGWriter.
-IF (VTK_USE_FFMPEG_ENCODER)
-  INCLUDE(${VTK_CMAKE_DIR}/vtkTestFFMPEG.cmake)
-
-  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/vtkFFMPEGConfig.h.in
-                 ${CMAKE_CURRENT_BINARY_DIR}/vtkFFMPEGConfig.h @ONLY)
-  INCLUDE_DIRECTORIES(${VTK_BINARY_DIR}/IO)
-
-  IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/vtkFFMPEGConfig.h
-      DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}
-      COMPONENT Development)
-  ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-
-  INCLUDE_DIRECTORIES(${FFMPEG_INCLUDE_DIR})
-  SET(Kit_SRCS ${Kit_SRCS} vtkFFMPEGWriter.cxx)
-
-  SET_SOURCE_FILES_PROPERTIES( vtkFFMPEGWriter.cxx
-    PROPERTIES COMPILE_DEFINITIONS __STDC_CONSTANT_MACROS )
-
-  SET(KIT_LIBS ${KIT_LIBS}
-    ${FFMPEG_avformat_LIBRARY}
-    ${FFMPEG_avcodec_LIBRARY}
-    ${FFMPEG_avutil_LIBRARY})
-  IF (NOT VTK_FFMPEG_HAS_IMG_CONVERT)
-    SET(KIT_LIBS ${KIT_LIBS}
-      ${FFMPEG_swscale_LIBRARY})
-  ENDIF (NOT VTK_FFMPEG_HAS_IMG_CONVERT)
-ENDIF (VTK_USE_FFMPEG_ENCODER)
-
-#-----------------------------------------------------------------------------
-# MPEG2
-#
-# Only include the vtkMPEG2Writer if the user has explicitly turned on
-# VTK_USE_MPEG2_ENCODER. If so, user should also have set
-# vtkMPEG2Encode_INCLUDE_PATH and vtkMPEG2Encode_LIBRARIES.
-#
-IF (VTK_USE_MPEG2_ENCODER)
-  INCLUDE_DIRECTORIES(${vtkMPEG2Encode_INCLUDE_PATH})
-  SET(Kit_SRCS ${Kit_SRCS} vtkMPEG2Writer.cxx)
-  SET(KIT_LIBS ${KIT_LIBS} ${vtkMPEG2Encode_LIBRARIES})
-ENDIF (VTK_USE_MPEG2_ENCODER)
-
-#-----------------------------------------------------------------------------
-# PostgreSQL
-# build the PostgreSQL database backend (if the PostgresSQL and pqxx libraries are available)
-#
-OPTION( VTK_USE_POSTGRES "Build the PostgreSQL driver for vtkSQLDatabase." OFF)
-MARK_AS_ADVANCED(VTK_USE_POSTGRES)
-IF ( VTK_USE_POSTGRES )
-  FIND_PACKAGE( POSTGRES REQUIRED )
-  IF ( BUILD_TESTING )
-    SET ( VTK_PSQL_TEST_URL "" CACHE STRING "A URL for a PostgreSQL server of the form psql://[[username[:password]@]hostname[:port]]/[dbname]" ) 
-  ENDIF ( BUILD_TESTING )
-ENDIF ( VTK_USE_POSTGRES )
-#
-# Only include the Postgres backend if the user has explicitly turned on
-# VTK_USE_POSTGRES. If so, user must also have set POSTGRES_LIBRARIES
-# and POSTGRES_INCLUDE_DIRECTORIES to valid values.
-IF ( VTK_USE_POSTGRES AND POSTGRES_FOUND )
-  INCLUDE_DIRECTORIES( ${POSTGRES_INCLUDE_DIRECTORIES} )
-  SET( Kit_SRCS
-    ${Kit_SRCS}
-    vtkPostgreSQLDatabase.cxx
-    vtkPostgreSQLQuery.cxx
-    vtkPostgreSQLToTableReader.cxx
-    vtkTableToPostgreSQLWriter.cxx
-  )
-  LINK_LIBRARIES( ${POSTGRES_LIBRARIES} )
-ENDIF ( VTK_USE_POSTGRES AND POSTGRES_FOUND )
-
-#-----------------------------------------------------------------------------
-# MySQL
-# build the MySQL database backend (if the MySQL libraries are available)
-#
-OPTION( VTK_USE_MYSQL "Build the MySQL driver for vtkSQLDatabase." OFF)
-MARK_AS_ADVANCED(VTK_USE_MYSQL)
-IF ( VTK_USE_MYSQL )
-  FIND_PACKAGE( MySQL REQUIRED )
-  IF ( BUILD_TESTING )
-    SET ( VTK_MYSQL_TEST_URL "" CACHE STRING "A URL for a MySQL server of the form mysql://[[username[:password]@]hostname[:port]]/[dbname]" ) 
-  ENDIF ( BUILD_TESTING )
-ENDIF ( VTK_USE_MYSQL )
-#
-# Only include the MySQL backend if the user has explicitly turned on
-# VTK_USE_MYSQL. If so, user must also have set MYSQL_LIBRARIES
-# and MYSQL_INCLUDE_DIRECTORIES to valid values.
-IF ( VTK_USE_MYSQL AND MYSQL_FOUND )
-  INCLUDE_DIRECTORIES( ${MYSQL_INCLUDE_DIRECTORIES} )
-  SET( Kit_SRCS
-    ${Kit_SRCS}
-    vtkMySQLDatabase.cxx
-    vtkMySQLQuery.cxx
-    vtkMySQLToTableReader.cxx
-    vtkTableToMySQLWriter.cxx
-  )
-  LINK_LIBRARIES( ${MYSQL_LIBRARY}  ${MYSQL_EXTRA_LIBRARIES} )
-ENDIF ( VTK_USE_MYSQL AND MYSQL_FOUND )
-
-#-----------------------------------------------------------------------------
-# ODBC
-# Build the ODBC database backend only if ODBC driver manager is available
-#
-OPTION (VTK_USE_ODBC "Build the ODBC database interface" OFF)
-MARK_AS_ADVANCED(VTK_USE_ODBC)
-IF ( VTK_USE_ODBC )
-  FIND_PACKAGE( ODBC REQUIRED )
-  IF ( BUILD_TESTING )
-    SET ( VTK_ODBC_TEST_DSN "" CACHE STRING "A data source name (DSN) for an ODBC database connection to use for testing." )
-  ENDIF ( BUILD_TESTING )
-ENDIF ( VTK_USE_ODBC )
-
-IF ( VTK_USE_ODBC AND ODBC_FOUND )
-  INCLUDE_DIRECTORIES( ${ODBC_INCLUDE_DIRECTORIES} )
-  SET( Kit_SRCS
-    ${Kit_SRCS}
-    vtkODBCDatabase.cxx
-    vtkODBCQuery.cxx
-    )
-  LINK_LIBRARIES( ${ODBC_LIBRARIES} )
-  # Note: Strange things happen on 64-bit machines.  We must compile
-  # ODBC code with -DBUILD_REAL_64_BIT_MODE in order to have the driver
-  # work properly.
-  INCLUDE(CheckTypeSize)
-  CHECK_TYPE_SIZE("unsigned long" VTK_SIZEOF_LONG)
-  IF("${VTK_SIZEOF_LONG}" STREQUAL "8")
-#    MESSAGE( STATUS "Building ODBC driver with 64-bit flag." )
-    ADD_DEFINITIONS( -DBUILD_REAL_64_BIT_MODE )
-  ENDIF()
-ENDIF ( VTK_USE_ODBC AND ODBC_FOUND )
-
-#-----------------------------------------------------------------------------
-# Add these classes only if vtkTypeUInt64Array exists
-IF(VTK_HAS_UINT64_ARRAY)
-  SET(Kit_SRCS
-    ${Kit_SRCS}
-    vtkRowQueryToTable.cxx
-  )
-ENDIF(VTK_HAS_UINT64_ARRAY)
-
-
-#-----------------------------------------------------------------------------
-SET_SOURCE_FILES_PROPERTIES(
-  vtkPLY
-  vtkXMLWriterC
-  vtkLSDynaPart
-  vtkLSDynaPartCollection
-  WRAP_EXCLUDE
-)
-
-#-----------------------------------------------------------------------------
-# N-WAY ARRAYS READER AND WRITER
-IF(VTK_USE_N_WAY_ARRAYS)
-
-  SET(Kit_SRCS
-    ${Kit_SRCS}
-    vtkArrayReader.cxx
-    vtkArrayWriter.cxx
-    vtkArrayDataReader.cxx
-    vtkArrayDataWriter.cxx
-    )
-
-ENDIF(VTK_USE_N_WAY_ARRAYS)
-#-----------------------------------------------------------------------------
-
-INCLUDE_DIRECTORIES(${VTKNETCDF_BINARY_DIR})
-
-SET(Kit_EXTRA_SRCS)
-SET(Kit_EXTRA_CMDS)
-SET(Kit_TCL_EXTRA_SRCS)
-SET(Kit_PYTHON_EXTRA_SRCS)
-SET(Kit_JAVA_EXTRA_SRCS)
-SET(KIT_TCL_DEPS)
-SET(KIT_PYTHON_DEPS)
-SET(KIT_JAVA_DEPS)
-
-#-----------------------------------------------------------------------------
-# Include CMake code common to all kits.
-INCLUDE(${VTK_CMAKE_DIR}/KitCommonBlock.cmake)
-#-----------------------------------------------------------------------------
-# Add target dependency.
-ADD_DEPENDENCIES(vtkIO
-  vtkMaterialLibraryConfiguredFiles)
-#-----------------------------------------------------------------------------
diff --git a/IO/Testing/CMakeLists.txt b/IO/Testing/CMakeLists.txt
deleted file mode 100644
index 3958c1c0e4423ce75451549f96b85fb5dc4ece52..0000000000000000000000000000000000000000
--- a/IO/Testing/CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-IF (VTK_WRAP_TCL)
-  ADD_SUBDIRECTORY(Tcl)
-ENDIF (VTK_WRAP_TCL)
-
-IF (VTK_WRAP_PYTHON)
-  ADD_SUBDIRECTORY(Python)
-ENDIF (VTK_WRAP_PYTHON)
-
-ADD_SUBDIRECTORY(Cxx)
-
-IF(PYTHON_EXECUTABLE)
-  ADD_TEST(HeaderTesting-IO ${PYTHON_EXECUTABLE}
-    ${VTK_SOURCE_DIR}/Common/Testing/HeaderTesting.py
-    "${VTK_SOURCE_DIR}/IO"
-    VTK_IO_EXPORT
-    vtkBase64Utilities.h
-    vtkMINC.h
-    vtkMySQLDatabasePrivate.h
-    vtkODBCInternals.h
-    vtkOffsetsManagerArray.h
-    vtkPLY.h
-    vtkPostgreSQLDatabasePrivate.h
-    vtkXMLUtilities.h
-    vtkXMLWriterC.h
-    vtkXMLWriterF.h
-    )
-ENDIF(PYTHON_EXECUTABLE)
diff --git a/IO/Testing/Cxx/CMakeLists.txt b/IO/Testing/Cxx/CMakeLists.txt
deleted file mode 100644
index da3f7d7997531f2911035cce46856e7d59cebb84..0000000000000000000000000000000000000000
--- a/IO/Testing/Cxx/CMakeLists.txt
+++ /dev/null
@@ -1,269 +0,0 @@
-SET(KIT IO)
-
-SET(ConditionalTests)
-
-IF(WIN32 AND VTK_USE_VIDEO_FOR_WINDOWS)
-  SET(ConditionalTests ${ConditionalTests} TestAVIWriter.cxx)
-ENDIF(WIN32 AND VTK_USE_VIDEO_FOR_WINDOWS)
-
-IF(VTK_USE_MPEG2_ENCODER)
-  SET(ConditionalTests ${ConditionalTests} TestMovieWriter.cxx)
-ENDIF(VTK_USE_MPEG2_ENCODER)
-
-IF(VTK_USE_FFMPEG_ENCODER)
-  SET(ConditionalTests ${ConditionalTests} TestFFMPEGWriter.cxx)
-ENDIF(VTK_USE_FFMPEG_ENCODER)
-
-IF(VTK_USE_DISPLAY AND VTK_USE_RENDERING)
-  SET(ConditionalTests
-    ${ConditionalTests}
-    TestHyperOctreeIO.cxx
-    TestLSDynaReader.cxx
-    TestLSDynaReaderSPH.cxx
-    TestMPASReader.cxx
-    TestPLYReader.cxx
-    TestProStarReader.cxx
-    TestTecplotReader.cxx
-    SLACReaderLinear.cxx
-    SLACReaderQuadratic.cxx
-    TestNetCDFCAMReader.cxx
-    TestNetCDFPOPReader.cxx
-    )
-
-  IF(NOT WIN32)
-    SET(ConditionalTests
-      ${ConditionalTests}
-      SLACParticleReader.cxx
-      )
-  ENDIF(NOT WIN32)
-
-ENDIF(VTK_USE_DISPLAY AND VTK_USE_RENDERING)
-
-IF(VTK_USE_INFOVIS)
-  SET(ConditionalTests ${ConditionalTests}
-       TestDataObjectIO.cxx
-       TestDataObjectXMLIO.cxx)
-ENDIF(VTK_USE_INFOVIS)
-
-IF(VTK_USE_METAIO)
-  SET(ConditionalTests ${ConditionalTests} TestMetaIO.cxx)
-ENDIF(VTK_USE_METAIO)
-
-IF(VTK_USE_POSTGRES AND VTK_PSQL_TEST_URL)
-  SET(ConditionalTests ${ConditionalTests} TestPostgreSQLDatabase.cxx)
-  IF (VTK_DATA_ROOT)
-    SET(ConditionalTests ${ConditionalTests} TestPostgreSQLTableReadWrite.cxx)
-  ENDIF (VTK_DATA_ROOT)
-ENDIF(VTK_USE_POSTGRES AND VTK_PSQL_TEST_URL)
-
-IF(VTK_USE_MYSQL AND VTK_MYSQL_TEST_URL)
-  SET(ConditionalTests ${ConditionalTests} TestMySQLDatabase.cxx)
-  IF (VTK_DATA_ROOT)
-    SET(ConditionalTests ${ConditionalTests} TestMySQLTableReadWrite.cxx)
-  ENDIF (VTK_DATA_ROOT)
-ENDIF(VTK_USE_MYSQL AND VTK_MYSQL_TEST_URL)
-
-IF(VTK_USE_ODBC AND VTK_ODBC_TEST_DSN)
-  SET(ConditionalTests ${ConditionalTest} TestODBCDatabase.cxx)
-ENDIF(VTK_USE_ODBC AND VTK_ODBC_TEST_DSN)
-SET(VTK_HAS_UINT64_ARRAY 0)
-
-IF(VTK_SIZEOF_LONG_LONG MATCHES "^8$")
-  SET(VTK_HAS_UINT64_ARRAY 1)
-ELSE(VTK_SIZEOF_LONG_LONG MATCHES "^8$")
-  IF(VTK_SIZEOF_LONG MATCHES "^8$")
-    SET(VTK_HAS_UINT64_ARRAY 1)
-  ELSE(VTK_SIZEOF_LONG MATCHES "^8$")
-    IF(VTK_SIZEOF___INT64 MATCHES "^8$")
-      IF(VTK_TYPE_CONVERT_UI64_TO_DOUBLE)
-        SET(VTK_HAS_UINT64_ARRAY 1)
-      ENDIF(VTK_TYPE_CONVERT_UI64_TO_DOUBLE)
-    ENDIF(VTK_SIZEOF___INT64 MATCHES "^8$")
-  ENDIF(VTK_SIZEOF_LONG MATCHES "^8$")
-ENDIF(VTK_SIZEOF_LONG_LONG MATCHES "^8$")
-
-IF(VTK_HAS_UINT64_ARRAY)
-  SET(ConditionalTests ${ConditionalTests} TestSQLiteDatabase.cxx)
-ENDIF(VTK_HAS_UINT64_ARRAY)
-
-IF(VTK_USE_OGGTHEORA_ENCODER)
-  SET(ConditionalTests ${ConditionalTests} TestOggTheoraWriter.cxx)
-ENDIF(VTK_USE_OGGTHEORA_ENCODER)
-
-CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx
-  TestXML.cxx
-  TestCompress.cxx
-  TestSQLDatabaseSchema.cxx
-  TestSQLiteTableReadWrite.cxx
-  TestImageReader2Factory.cxx
-  TestSimplePointsReaderWriter.cxx
-  ${ConditionalTests}
-  EXTRA_INCLUDE vtkTestDriver.h
-)
-
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} )
-
-ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
-TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkIO vtkImaging vtksys)
-
-IF(VTK_USE_INFOVIS)
-  TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkInfovis)
-ENDIF(VTK_USE_INFOVIS)
-
-IF (VTK_USE_DISPLAY AND VTK_USE_RENDERING)
-  TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkRendering)
-ENDIF (VTK_USE_DISPLAY AND VTK_USE_RENDERING)
-
-ADD_TEST(TestSimplePointsReaderWriter ${CXX_TEST_PATH}/${KIT}CxxTests TestSimplePointsReaderWriter)
-
-IF (VTK_DATA_ROOT)
-  ADD_TEST(TestXML ${CXX_TEST_PATH}/${KIT}CxxTests TestXML
-    ${VTK_DATA_ROOT}/Data/sample.xml)
-  ADD_TEST(TestImageReader2Factory ${CXX_TEST_PATH}/${KIT}CxxTests TestImageReader2Factory
-    ${VTK_DATA_ROOT}/Baseline/${KIT}/TestHyperOctreeIO.png)
-  IF (WIN32)
-    ADD_TEST(TestSQLiteTableReadWrite ${CXX_TEST_PATH}/${KIT}CxxTests
-      TestSQLiteTableReadWrite ${VTK_DATA_ROOT}/Baseline/IO/simple_table_win.vtk)
-  ELSE (WIN32)
-    ADD_TEST(TestSQLiteTableReadWrite ${CXX_TEST_PATH}/${KIT}CxxTests
-      TestSQLiteTableReadWrite ${VTK_DATA_ROOT}/Baseline/IO/simple_table.vtk)
-  ENDIF (WIN32)
-  set_tests_properties(TestSQLiteTableReadWrite PROPERTIES RUN_SERIAL ON)
-
-  IF(VTK_USE_METAIO)
-    ADD_TEST(TestMetaIO ${CXX_TEST_PATH}/${KIT}CxxTests TestMetaIO
-      ${VTK_DATA_ROOT}/Data/HeadMRVolume.mhd)
-  ENDIF(VTK_USE_METAIO)
-  ADD_TEST(TestCompress ${CXX_TEST_PATH}/${KIT}CxxTests TestCompress
-    ${VTK_DATA_ROOT}/Data/sample.xml)
-  IF (VTK_USE_DISPLAY AND VTK_USE_RENDERING)
-    ADD_TEST(TestHyperOctreeIO ${CXX_TEST_PATH}/${KIT}CxxTests
-         TestHyperOctreeIO -D ${VTK_DATA_ROOT}
-         -T ${VTK_BINARY_DIR}/Testing/Temporary
-         -V ${VTK_DATA_ROOT}/Baseline/${KIT}/TestHyperOctreeIO.png)
-    ADD_TEST(TestPLYReader ${CXX_TEST_PATH}/${KIT}CxxTests
-         TestPLYReader -D ${VTK_DATA_ROOT}
-         -T ${VTK_BINARY_DIR}/Testing/Temporary
-         -V ${VTK_DATA_ROOT}/Baseline/${KIT}/TestPLYReader.png)
-    ADD_TEST(TestProStarReader ${CXX_TEST_PATH}/${KIT}CxxTests
-         TestProStarReader -D ${VTK_DATA_ROOT}
-         -T ${VTK_BINARY_DIR}/Testing/Temporary
-         -V ${VTK_DATA_ROOT}/Baseline/${KIT}/TestProStarReader.png)
-    ADD_TEST(TestTecplotReader ${CXX_TEST_PATH}/${KIT}CxxTests
-         TestTecplotReader -D ${VTK_DATA_ROOT}
-         -T ${VTK_BINARY_DIR}/Testing/Temporary
-         -V ${VTK_DATA_ROOT}/Baseline/${KIT}/TestTecplotReader.png)
-  ENDIF (VTK_USE_DISPLAY AND VTK_USE_RENDERING)
-ENDIF (VTK_DATA_ROOT)
-
-IF (VTK_LARGE_DATA_ROOT)
-  IF (VTK_USE_DISPLAY AND VTK_USE_RENDERING)
-  ADD_TEST(TestLSDynaReader ${CXX_TEST_PATH}/${KIT}CxxTests
-         TestLSDynaReader -D ${VTK_LARGE_DATA_ROOT}
-         -T ${VTK_BINARY_DIR}/Testing/Temporary
-         -V ${VTK_LARGE_DATA_ROOT}/Baseline/${KIT}/TestLSDynaReader.png)
-  ADD_TEST(TestLSDynaReaderSPH ${CXX_TEST_PATH}/${KIT}CxxTests
-         TestLSDynaReaderSPH -D ${VTK_LARGE_DATA_ROOT}
-         -T ${VTK_BINARY_DIR}/Testing/Temporary
-         -V ${VTK_LARGE_DATA_ROOT}/Baseline/${KIT}/TestLSDynaReaderSPH.png)
-
-    ADD_TEST(SLACReaderLinear ${CXX_TEST_PATH}/${KIT}CxxTests
-         SLACReaderLinear -D ${VTK_LARGE_DATA_ROOT}
-         -T ${VTK_BINARY_DIR}/Testing/Temporary
-         -V ${VTK_LARGE_DATA_ROOT}/Baseline/${KIT}/SLACReaderLinear.png)
-    ADD_TEST(SLACReaderQuadratic ${CXX_TEST_PATH}/${KIT}CxxTests
-         SLACReaderQuadratic -D ${VTK_LARGE_DATA_ROOT}
-         -T ${VTK_BINARY_DIR}/Testing/Temporary
-         -V ${VTK_LARGE_DATA_ROOT}/Baseline/${KIT}/SLACReaderQuadratic.png)
-    ADD_TEST(TestNetCDFCAMReader ${CXX_TEST_PATH}/${KIT}CxxTests
-         TestNetCDFCAMReader -D ${VTK_LARGE_DATA_ROOT}
-         -T ${VTK_BINARY_DIR}/Testing/Temporary
-         -V ${VTK_LARGE_DATA_ROOT}/Baseline/${KIT}/TestNetCDFCAMReader.png)
-    ADD_TEST(TestNetCDFPOPReader ${CXX_TEST_PATH}/${KIT}CxxTests
-         TestNetCDFPOPReader -D ${VTK_LARGE_DATA_ROOT}
-         -T ${VTK_BINARY_DIR}/Testing/Temporary
-         -V ${VTK_LARGE_DATA_ROOT}/Baseline/${KIT}/TestNetCDFPOPReader.png)
-    ADD_TEST(TestMPASReader ${CXX_TEST_PATH}/${KIT}CxxTests
-         TestMPASReader -D ${VTK_LARGE_DATA_ROOT}
-         -T ${VTK_BINARY_DIR}/Testing/Temporary
-         -V ${VTK_LARGE_DATA_ROOT}/Baseline/${KIT}/TestMPASReader.png)
-    IF(NOT WIN32)
-      ADD_TEST(SLACParticleReader ${CXX_TEST_PATH}/${KIT}CxxTests
-           SLACParticleReader -D ${VTK_LARGE_DATA_ROOT}
-           -T ${VTK_BINARY_DIR}/Testing/Temporary
-           -V ${VTK_LARGE_DATA_ROOT}/Baseline/${KIT}/SLACParticleReader.png)
-    ENDIF(NOT WIN32)
-  ENDIF (VTK_USE_DISPLAY AND VTK_USE_RENDERING)
-ENDIF (VTK_LARGE_DATA_ROOT)
-
-ADD_TEST(TestSQLDatabaseSchema ${CXX_TEST_PATH}/${KIT}CxxTests TestSQLDatabaseSchema)
-
-IF(WIN32 AND VTK_USE_VIDEO_FOR_WINDOWS)
-  ADD_TEST(TestAVIWriter ${CXX_TEST_PATH}/${KIT}CxxTests TestAVIWriter)
-ENDIF(WIN32 AND VTK_USE_VIDEO_FOR_WINDOWS)
-IF(VTK_USE_MPEG2_ENCODER)
-  ADD_TEST(TestMovieWriter ${CXX_TEST_PATH}/${KIT}CxxTests TestMovieWriter)
-ENDIF(VTK_USE_MPEG2_ENCODER)
-IF(VTK_USE_FFMPEG_ENCODER)
-  ADD_TEST(TestFFMPEGWriter ${CXX_TEST_PATH}/${KIT}CxxTests TestFFMPEGWriter)
-ENDIF(VTK_USE_FFMPEG_ENCODER)
-IF(VTK_HAS_UINT64_ARRAY)
-  ADD_TEST(TestSQLiteDatabase ${CXX_TEST_PATH}/${KIT}CxxTests TestSQLiteDatabase)
-  set_tests_properties(TestSQLiteDatabase PROPERTIES RUN_SERIAL ON)
-ENDIF(VTK_HAS_UINT64_ARRAY)
-IF(VTK_USE_POSTGRES AND VTK_PSQL_TEST_URL)
-  ADD_TEST(TestPostgreSQLDatabase ${CXX_TEST_PATH}/${KIT}CxxTests TestPostgreSQLDatabase)
-  IF (VTK_DATA_ROOT)
-    IF (WIN32)
-      ADD_TEST(TestPostgreSQLTableReadWrite ${CXX_TEST_PATH}/${KIT}CxxTests
-        TestPostgreSQLTableReadWrite ${VTK_DATA_ROOT}/Baseline/IO/simple_table_win.vtk)
-    ELSE (WIN32)
-      ADD_TEST(TestPostgreSQLTableReadWrite ${CXX_TEST_PATH}/${KIT}CxxTests
-        TestPostgreSQLTableReadWrite ${VTK_DATA_ROOT}/Baseline/IO/simple_table.vtk)
-    ENDIF (WIN32)
-  ENDIF (VTK_DATA_ROOT)
-ENDIF(VTK_USE_POSTGRES AND VTK_PSQL_TEST_URL)
-IF(VTK_USE_MYSQL AND VTK_MYSQL_TEST_URL)
-  ADD_TEST(TestMySQLDatabase ${CXX_TEST_PATH}/${KIT}CxxTests TestMySQLDatabase)
-  IF (VTK_DATA_ROOT)
-    IF (WIN32)
-      ADD_TEST(TestMySQLTableReadWrite ${CXX_TEST_PATH}/${KIT}CxxTests
-        TestMySQLTableReadWrite ${VTK_DATA_ROOT}/Baseline/IO/simple_table_win.vtk)
-    ELSE (WIN32)
-      ADD_TEST(TestMySQLTableReadWrite ${CXX_TEST_PATH}/${KIT}CxxTests
-        TestMySQLTableReadWrite ${VTK_DATA_ROOT}/Baseline/IO/simple_table.vtk)
-    ENDIF (WIN32)
-  ENDIF (VTK_DATA_ROOT)
-ENDIF(VTK_USE_MYSQL AND VTK_MYSQL_TEST_URL)
-IF(VTK_USE_OGGTHEORA_ENCODER)
-  ADD_TEST(TestOggTheoraWriter ${CXX_TEST_PATH}/${KIT}CxxTests TestOggTheoraWriter)
-ENDIF(VTK_USE_OGGTHEORA_ENCODER)
-
-IF(VTK_USE_INFOVIS)
-  ADD_TEST(TestDataObjectIO ${CXX_TEST_PATH}/${KIT}CxxTests TestDataObjectIO)
-  ADD_TEST(TestDataObjectXMLIO ${CXX_TEST_PATH}/${KIT}CxxTests TestDataObjectXMLIO)
-  set_tests_properties(TestDataObjectXMLIO PROPERTIES RUN_SERIAL ON)
-ENDIF(VTK_USE_INFOVIS)
-
-IF(VTK_USE_N_WAY_ARRAYS)
-
-  CREATE_TEST_SOURCELIST(ArrayIOTests ArrayIOCxxTests.cxx
-    TestArraySerialization.cxx
-    TestArrayDataWriter.cxx
-    TestArrayDenormalized.cxx
-    EXTRA_INCLUDE vtkTestDriver.h
-    )
-
-  ADD_EXECUTABLE(ArrayIOCxxTests ${ArrayIOTests})
-  TARGET_LINK_LIBRARIES(ArrayIOCxxTests vtkIO vtkGraphics)
-
-  SET(ArrayTestsToRun ${ArrayIOTests})
-  REMOVE(ArrayTestsToRun ArrayIOCxxTests.cxx)
-
-  FOREACH(test ${ArrayTestsToRun})
-    GET_FILENAME_COMPONENT(TName ${test} NAME_WE)
-    ADD_TEST(Array-${TName} ${CXX_TEST_PATH}/ArrayIOCxxTests ${TName})
-  ENDFOREACH(test)
-
-
-ENDIF(VTK_USE_N_WAY_ARRAYS)
diff --git a/IO/Testing/Python/CMakeLists.txt b/IO/Testing/Python/CMakeLists.txt
deleted file mode 100644
index dce93e3cfdf8fabf768e11e6d9958f8e9ebf1376..0000000000000000000000000000000000000000
--- a/IO/Testing/Python/CMakeLists.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-INCLUDE(${VTK_SOURCE_DIR}/Utilities/vtkTclTest2Py/vtkConvertTclTestToPy.cmake)
-IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-  #
-  # Add tests, with the data
-  #
-  IF (VTK_DATA_ROOT)
-    IF (VTK_PYTHON_EXE)
-      SET(tests
-         dem
-         NetCDFCF2DBounds
-         NetCDFCFSetOutputType
-         NetCDFCFSphericalCoords
-         NetCDFCFUnstructured
-         NetCDFReader
-         TestAVSucdReader
-         TestGAMBITReader
-         TestImageWriters
-         TestPLYReadWrite
-         TestPolygonWriters
-         TestJPEGReader
-         TestTIFFReader
-         TestBMPReader
-         Plot3DScalars
-         Plot3DVectors
-         ParticleReader
-         caffeine
-         TestXYZMol
-         )
-       IF(VTK_USE_METAIO)
-         SET(tests ${tests} TestMHD)
-       ENDIF(VTK_USE_METAIO)
-       CONVERT_TCL_TEST_TO_PY (
-         tests
-         IO)
-
-    ENDIF (VTK_PYTHON_EXE)
-  ENDIF (VTK_DATA_ROOT)
-ENDIF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
diff --git a/IO/Testing/Tcl/CMakeLists.txt b/IO/Testing/Tcl/CMakeLists.txt
deleted file mode 100644
index d747ca4f5b70cce98d5691e05bb14e260251dfb5..0000000000000000000000000000000000000000
--- a/IO/Testing/Tcl/CMakeLists.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-
-  #
-  # Add tests, with the data
-  #
-  IF (VTK_DATA_ROOT)
-    FOREACH ( tfile 
-      dem
-      NetCDFCF2DBounds
-      NetCDFCFSetOutputType
-      NetCDFCFSphericalCoords
-      NetCDFCFUnstructured
-      NetCDFReader
-      TestAVSucdReader
-      TestGAMBITReader
-      TestImageWriters
-      TestMINCImageReader
-      TestMINCImageWriter
-      TestPLYReadWrite
-      TestPolygonWriters
-      TestJPEGReader
-      TestTIFFReader
-      TestBMPReader
-      TestChacoReader
-      TestMetaImage2D
-      Plot3DScalars
-      Plot3DVectors
-      ParticleReader
-      caffeine
-      TestXYZMol
-      TestMHD
-      TestSetFileNames
-      TestSimplePointsReader
-      TestXMLRectilinearGridIO
-      TestXMLStructuredGridIO
-      TestXMLImageDataIO
-      )
-      ADD_TEST(${tfile}-image ${VTK_EXECUTABLE}
-        ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-        ${VTK_SOURCE_DIR}/IO/Testing/Tcl/${tfile}.tcl
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
-        -V Baseline/IO/${tfile}.png
-        -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-    ENDFOREACH( tfile )
-    set_tests_properties(TestXMLImageDataIO-image PROPERTIES RUN_SERIAL ON)
-    IF (VTK_USE_PARALLEL)
-      FOREACH ( tfile 
-        TestXMLPolyDataIO
-        TestXMLUnstructuredGridIO
-        )
-        ADD_TEST(${tfile}-image ${VTK_EXECUTABLE}
-        ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-        ${VTK_SOURCE_DIR}/IO/Testing/Tcl/${tfile}.tcl
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
-        -V Baseline/IO/${tfile}.png
-        -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-      ENDFOREACH( tfile )
-      set_tests_properties(TestXMLPolyDataIO-image PROPERTIES RUN_SERIAL ON)
-    ENDIF (VTK_USE_PARALLEL)
-    # tests that don't produce images
-    FOREACH ( tfile
-      TestGlobFileNames
-      TestSortFileNames
-      )
-      ADD_TEST(${tfile} ${VTK_EXECUTABLE}
-               ${VTK_SOURCE_DIR}/IO/Testing/Tcl/${tfile}.tcl
-               -D ${VTK_DATA_ROOT})
-    ENDFOREACH( tfile )
-  #
-  # If we do not have the data, still run the tests that we can
-  #
-  ELSE (VTK_DATA_ROOT)
-  ENDIF (VTK_DATA_ROOT)
-
-ENDIF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-
-ADD_TEST(TestEmptyXML ${VTK_EXECUTABLE}
-         ${VTK_SOURCE_DIR}/IO/Testing/Tcl/TestEmptyXML.tcl)
-
-ADD_TEST(PrintSelf-IO ${TCL_TCLSH}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/PrintSelfCheck.tcl  
-         ${VTK_SOURCE_DIR}/IO)
-
-ADD_TEST(TestSetObjectMacro-IO ${TCL_TCLSH}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/FindString.tcl
-         "${VTK_SOURCE_DIR}/IO/vtk\\\\*.h"
-         "vtkSetObjectMacro"
-         )
diff --git a/Imaging/CMakeLists.txt b/Imaging/CMakeLists.txt
deleted file mode 100644
index 35c112d5a01f764af53ec7575d0d3698f1eb91f2..0000000000000000000000000000000000000000
--- a/Imaging/CMakeLists.txt
+++ /dev/null
@@ -1,182 +0,0 @@
-SET(KIT Imaging)
-SET(UKIT IMAGING)
-SET(KIT_TCL_LIBS vtkFilteringTCL)
-SET(KIT_PYTHON_LIBS vtkFilteringPythonD)
-SET(KIT_JAVA_LIBS vtkFilteringJava)
-SET(KIT_INTERFACE_LIBRARIES vtkFiltering)
-
-SET( Kit_SRCS
-vtkBooleanTexture.cxx
-vtkExtractVOI.cxx
-vtkFastSplatter.cxx
-vtkGaussianSplatter.cxx
-vtkImageAccumulate.cxx
-vtkImageAnisotropicDiffusion2D.cxx
-vtkImageAnisotropicDiffusion3D.cxx
-vtkImageAppend.cxx
-vtkImageAppendComponents.cxx
-vtkImageBlend.cxx
-vtkImageBSplineCoefficients.cxx
-vtkImageButterworthHighPass.cxx
-vtkImageButterworthLowPass.cxx
-vtkImageCacheFilter.cxx
-vtkImageCanvasSource2D.cxx
-vtkImageCast.cxx
-vtkImageChangeInformation.cxx
-vtkImageCheckerboard.cxx
-vtkImageCityBlockDistance.cxx
-vtkImageClip.cxx
-vtkImageConnector.cxx
-vtkImageConstantPad.cxx
-vtkImageContinuousDilate3D.cxx
-vtkImageContinuousErode3D.cxx
-vtkImageConvolve.cxx
-vtkImageCorrelation.cxx
-vtkImageCursor3D.cxx
-vtkImageDataStreamer.cxx
-vtkImageDecomposeFilter.cxx
-vtkImageDifference.cxx
-vtkImageDilateErode3D.cxx
-vtkImageDivergence.cxx
-vtkImageDotProduct.cxx
-vtkImageEllipsoidSource.cxx
-vtkImageEuclideanDistance.cxx
-vtkImageEuclideanToPolar.cxx
-vtkImageExport.cxx
-vtkImageExtractComponents.cxx
-vtkImageFFT.cxx
-vtkImageFlip.cxx
-vtkImageFourierCenter.cxx
-vtkImageFourierFilter.cxx
-vtkImageGaussianSmooth.cxx
-vtkImageGaussianSource.cxx
-vtkImageGradient.cxx
-vtkImageGradientMagnitude.cxx
-vtkImageGridSource.cxx
-vtkImageHistogram.cxx
-vtkImageHistogramStatistics.cxx
-vtkImageHSIToRGB.cxx
-vtkImageHSVToRGB.cxx
-vtkImageHybridMedian2D.cxx
-vtkImageIdealHighPass.cxx
-vtkImageIdealLowPass.cxx
-vtkImageImport.cxx
-vtkImageImportExecutive.cxx
-vtkImageIslandRemoval2D.cxx
-vtkImageIterateFilter.cxx
-vtkImageLaplacian.cxx
-vtkImageLogarithmicScale.cxx
-vtkImageLogic.cxx
-vtkImageLuminance.cxx
-vtkImageMagnify.cxx
-vtkImageMagnitude.cxx
-vtkImageMandelbrotSource.cxx
-vtkImageMapToColors.cxx
-vtkImageMapToRGBA.cxx
-vtkImageMapToWindowLevelColors.cxx
-vtkImageMask.cxx
-vtkImageMaskBits.cxx
-vtkImageMathematics.cxx
-vtkImageMedian3D.cxx
-vtkImageMirrorPad.cxx
-vtkImageNoiseSource.cxx
-vtkImageNonMaximumSuppression.cxx
-vtkImageNormalize.cxx
-vtkImageOpenClose3D.cxx
-vtkImagePadFilter.cxx
-vtkImagePermute.cxx
-vtkImageSlab.cxx
-vtkImageQuantizeRGBToIndex.cxx
-vtkImageRFFT.cxx
-vtkImageRGBToHSI.cxx
-vtkImageRGBToHSV.cxx
-vtkImageRange3D.cxx
-vtkImageRectilinearWipe.cxx
-vtkImageResample.cxx
-vtkImageResize.cxx
-vtkImageReslice.cxx
-vtkImageResliceToColors.cxx
-vtkImageSeedConnectivity.cxx
-vtkImageSeparableConvolution.cxx
-vtkImageShiftScale.cxx
-vtkImageShrink3D.cxx
-vtkImageSinusoidSource.cxx
-vtkImageSkeleton2D.cxx
-vtkImageSobel2D.cxx
-vtkImageSobel3D.cxx
-vtkImageSpatialAlgorithm.cxx
-vtkImageStencil.cxx
-vtkImageStencilIterator.cxx
-vtkImageStencilToImage.cxx
-vtkImageStencilAlgorithm.cxx
-vtkImageStencilData.cxx
-vtkImageStencilSource.cxx
-vtkImageSlabReslice.cxx
-vtkImageThreshold.cxx
-vtkImageThresholdConnectivity.cxx
-vtkImageToImageStencil.cxx
-vtkImageTranslateExtent.cxx
-vtkImageVariance3D.cxx
-vtkImageWrapPad.cxx
-vtkImageWeightedSum.cxx
-vtkImplicitFunctionToImageStencil.cxx
-vtkLassoStencilSource.cxx
-vtkPointLoad.cxx
-vtkROIStencilSource.cxx
-vtkRTAnalyticSource.cxx
-vtkSampleFunction.cxx
-vtkShepardMethod.cxx
-vtkSimpleImageFilterExample.cxx
-vtkSurfaceReconstructionFilter.cxx
-vtkTriangularTexture.cxx
-vtkVoxelModeller.cxx
-)
-
-SET_SOURCE_FILES_PROPERTIES(
-vtkImageDecomposeFilter
-vtkImageFourierFilter
-vtkImageIterateFilter
-vtkImagePadFilter
-vtkImageSpatialAlgorithm
-vtkImageStencilIterator
-  ABSTRACT
-)
-
-SET_SOURCE_FILES_PROPERTIES(
-vtkImageStencilIterator
-  WRAP_EXCLUDE
-)
-
-IF(CMAKE_COMPILER_IS_GNUCXX AND VTK_GNUCXX_VERSION)
-  STRING(REGEX MATCH "3\\.2\\.[0-9]" is_gcc32 ${VTK_GNUCXX_VERSION})
-  IF(is_gcc32)
-    SET_SOURCE_FILES_PROPERTIES(
-     vtkImageEuclideanDistance.cxx
-     vtkImageLogic.cxx
-     PROPERTIES
-     COMPILE_FLAGS -O0
-     )
-  ENDIF(is_gcc32)
-ENDIF(CMAKE_COMPILER_IS_GNUCXX AND VTK_GNUCXX_VERSION)
-
-SET(Kit_EXTRA_SRCS)
-SET(Kit_EXTRA_CMDS)
-SET(Kit_TCL_EXTRA_SRCS)
-SET(Kit_PYTHON_EXTRA_SRCS)
-SET(Kit_JAVA_EXTRA_SRCS)
-SET(KIT_TCL_DEPS)
-SET(KIT_PYTHON_DEPS)
-SET(KIT_JAVA_DEPS)
-
-#-----------------------------------------------------------------------------
-# Include CMake code common to all kits.
-INCLUDE(${VTK_CMAKE_DIR}/KitCommonBlock.cmake)
-#-----------------------------------------------------------------------------
-
-IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-  INSTALL(FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/vtkImageStencilIterator.txx
-    DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}
-    COMPONENT Development
-    )
-ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
diff --git a/Imaging/Testing/CMakeLists.txt b/Imaging/Testing/CMakeLists.txt
deleted file mode 100644
index a3eb702167b096abc89c8cbdcb078680472a87d1..0000000000000000000000000000000000000000
--- a/Imaging/Testing/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-ADD_SUBDIRECTORY(Cxx)
-
-IF (VTK_WRAP_TCL)
-  ADD_SUBDIRECTORY(Tcl)
-ENDIF (VTK_WRAP_TCL)
-
-IF (VTK_WRAP_PYTHON)
-  ADD_SUBDIRECTORY(Python)
-ENDIF (VTK_WRAP_PYTHON)
-
-IF(PYTHON_EXECUTABLE)
-  ADD_TEST(HeaderTesting-Imaging ${PYTHON_EXECUTABLE}
-    ${VTK_SOURCE_DIR}/Common/Testing/HeaderTesting.py
-    "${VTK_SOURCE_DIR}/Imaging"
-    VTK_IMAGING_EXPORT
-    vtkImageAppendComponents.h
-    vtkImageCityBlockDistance.h
-    vtkImageDivergence.h
-    vtkImageDotProduct.h
-    vtkImageFFT.h
-    vtkImageFourierCenter.h
-    vtkImageFourierFilter.h
-    vtkImageHybridMedian2D.h
-    vtkImageLuminance.h
-    vtkImageMagnitude.h
-    vtkImageMapToRGBA.h
-    vtkImageMirrorPad.h
-    vtkImageNormalize.h
-    vtkImageRFFT.h
-    vtkImageStencilIterator.h
-    vtkImageWrapPad.h
-    vtkSimpleImageFilterExample.h
-    )
-ENDIF(PYTHON_EXECUTABLE)
diff --git a/Imaging/Testing/Cxx/CMakeLists.txt b/Imaging/Testing/Cxx/CMakeLists.txt
deleted file mode 100644
index 61efa7d659841be0e20a0b26f680b91cacf42177..0000000000000000000000000000000000000000
--- a/Imaging/Testing/Cxx/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-  SET(KIT Imaging)
-  CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx
-    ImportExport.cxx
-    ImageBSplineCoefficients.cxx
-    ImageWeightedSum.cxx
-    ImageAutoRange.cxx
-    ImageAccumulate.cxx
-    ImageHistogram.cxx
-    ImageHistogramStatistics.cxx
-    ImageResize.cxx
-    ImageResize3D.cxx
-    ImageResizeCropping.cxx
-    FastSplatter.cxx
-    TestUpdateExtentReset.cxx
-    EXTRA_INCLUDE vtkTestDriver.h
-    )
-  ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
-  TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkRendering vtkIO)
-  SET (TestsToRun ${Tests})
-  REMOVE (TestsToRun ${KIT}CxxTests.cxx)
-
-  #
-  # Add all the executables
-  FOREACH (test ${TestsToRun})
-    GET_FILENAME_COMPONENT(TName ${test} NAME_WE)
-    IF (VTK_DATA_ROOT)
-      ADD_TEST(${TName} ${CXX_TEST_PATH}/${KIT}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
-        -V Baseline/${KIT}/${TName}.png)
-    ENDIF (VTK_DATA_ROOT)
-  ENDFOREACH (test)
-ENDIF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-
diff --git a/Imaging/Testing/Python/CMakeLists.txt b/Imaging/Testing/Python/CMakeLists.txt
deleted file mode 100644
index aaa93dd85790ab7d6a1f84adb99dc6c95c793d25..0000000000000000000000000000000000000000
--- a/Imaging/Testing/Python/CMakeLists.txt
+++ /dev/null
@@ -1,103 +0,0 @@
-INCLUDE(${VTK_SOURCE_DIR}/Utilities/vtkTclTest2Py/vtkConvertTclTestToPy.cmake)
-IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-  #
-  # Add tests, with the data
-  #
-  IF (VTK_DATA_ROOT)
-    IF (VTK_PYTHON_EXE)
-      SET(tests
-        ContinuousClose2D
-        IdealHighPass
-        LaplacianEdgeEnhance
-        MultipleUpdateExtents
-        #reconstructSurface -- scanf
-        resampledTexture
-        ResliceBSpline
-        ResliceColorWrap
-        ResliceInformationInput
-        ResliceInterpolationModes
-        ResliceInterpolationOblique
-        ResliceLanczosKaiser
-        ResliceMirrorOblique
-        ResliceMirrorPad
-        ResliceOptimizationOff
-        ReslicePermutations
-        ReslicePermuteResample
-        ReslicePermuteSlab
-        ResliceSlabModes
-        ResliceToColors
-        ResliceWrapOblique
-        ResliceWrapPad
-        Spectrum
-        TestAnisotropicDiffusion2D
-        TestAnisotropicDiffusion3D
-        TestAccumulate
-        #TestAllBlends -- complicated string substitutions
-        #TestAllBlendsFloat -- complicated string substitutions
-        TestAllFlips
-        #TestAllLogic --  method call has string substitution
-        #TestAllMaskBits --  method call has string substitution
-        #TestAllMathematics --  method call has string substitution
-        #TestAllShrinks  --  method call has string substitution
-        TestButterworthLowPass
-        TestButterworthHighPass
-        TestCache
-        TestChangeInformation
-        TestCheckerboard
-        TestCityBlockDistance
-        TestConvolve
-        TestCorrelation
-        TestDivergence
-        TestDotProduct
-        TestEuclideanDistance
-        TestEuclideanDistanceCached
-        TestEuclideanToPolar
-        TestFFTCorrelation
-        TestGradientMagnitude
-        TestGradientMagnitude2
-        TestHSIToRGB
-        TestHSVToRGB
-        TestHybridMedian2D
-        TestIdealLowPass
-        TestImageCanvas
-        TestImageProjection
-        #TestImageThresholdConnectivity -- uses lists in lists etc...
-        TestInPlaceFilter
-        TestIslandRemoval2D
-        TestLassoStencil
-        TestMapToRGBABlockStreaming
-        TestMapToWindowLevelColors
-        TestMapToWindowLevelColors2
-        TestMask2
-        TestMedian3D
-        TestNormalize
-        TestOpenClose3D
-        TestPermute
-        TestQuantizeTo16Colors 
-        TestRange3D
-        TestResample
-        TestROIStencil
-        TestSeparableFilter
-        TestShiftScale
-        TestShiftScale2
-        TestSimpleImageExample
-        TestSkeleton2D
-        TestSobel2D
-        TestSobel3D
-        TestStencilToImage
-        TestStencilWithFunction
-        TestStencilWithImage
-        #TestThreshold -- uses lists in lists etc...
-        TestVariance3D
-        #TestWipe  --  method call has string substitution
-        TestWrapPad
-        voxelModel
-        )
-
-      CONVERT_TCL_TEST_TO_PY (
-         tests
-         Imaging)
-
-      ENDIF (VTK_PYTHON_EXE)
-    ENDIF (VTK_DATA_ROOT)
-  ENDIF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
diff --git a/Imaging/Testing/Tcl/CMakeLists.txt b/Imaging/Testing/Tcl/CMakeLists.txt
deleted file mode 100644
index 10b66ae9d563d777267dd3164d3d024f88db1962..0000000000000000000000000000000000000000
--- a/Imaging/Testing/Tcl/CMakeLists.txt
+++ /dev/null
@@ -1,118 +0,0 @@
-IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-
-  #
-  # Add tests, with the data
-  #
-  IF (VTK_DATA_ROOT)
-    FOREACH ( tfile 
-        ContinuousClose2D
-        IdealHighPass
-        LaplacianEdgeEnhance
-        MultipleUpdateExtents
-        reconstructSurface
-        resampledTexture
-        ResliceBSpline
-        ResliceColorWrap
-        ResliceInformationInput
-        ResliceInterpolationModes
-        ResliceInterpolationOblique
-        ResliceLanczosKaiser
-        ResliceMirrorOblique
-        ResliceMirrorPad
-        ResliceOptimizationOff
-        ReslicePermutations
-        ReslicePermuteResample
-        ReslicePermuteSlab
-        ResliceSlabModes
-        ResliceToColors
-        ResliceWrapOblique
-        ResliceWrapPad
-        Spectrum
-        TestAnisotropicDiffusion2D
-        TestAnisotropicDiffusion3D
-        TestAccumulate
-        TestAllBlends
-        TestAllBlendsFloat
-        TestAllFlips
-        TestAllLogic
-        TestAllMaskBits
-        TestAllMathematics
-        TestAllShrinks
-        TestBlendStencil
-        TestButterworthLowPass
-        TestButterworthHighPass
-        TestCache
-        TestChangeInformation
-        TestCheckerboard
-        TestCityBlockDistance
-        TestConvolve
-        TestCorrelation
-        TestDivergence
-        TestDotProduct
-        TestEuclideanDistance
-        TestEuclideanDistanceCached
-        TestEuclideanToPolar
-        TestFFTCorrelation
-        TestGradientMagnitude
-        TestGradientMagnitude2
-        TestHSIToRGB
-        TestHSVToRGB
-        TestHybridMedian2D
-        TestIdealLowPass
-        TestImageCanvas
-        TestImageProjection
-        TestImageThresholdConnectivity
-        TestImageWeightedSum
-        TestInPlaceFilter
-        TestIslandRemoval2D
-        TestLassoStencil
-        TestMapToRGBABlockStreaming
-        TestMapToWindowLevelColors
-        TestMapToWindowLevelColors2
-        TestMask2
-        TestMedian3D
-        TestNormalize
-        TestOpenClose3D
-        TestPermute
-        TestQuantizeTo16Colors 
-        TestRange3D
-        TestResample
-        TestROIStencil
-        TestSeparableFilter
-        TestShiftScale
-        TestShiftScale2
-        TestSimpleImageExample
-        TestSkeleton2D
-        TestSobel2D
-        TestSobel3D
-        TestStencilToImage
-        TestStencilWithFunction
-        TestStencilWithImage
-        TestThreshold
-        TestVariance3D
-        TestWipe
-        TestWrapPad
-        voxelModel
-        )
-      ADD_TEST(${tfile}-image ${VTK_EXECUTABLE}
-        ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-        ${VTK_SOURCE_DIR}/Imaging/Testing/Tcl/${tfile}.tcl
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
-        -V Baseline/Imaging/${tfile}.png
-        -A ${VTK_SOURCE_DIR}/Wrapping/Tcl
-        )
-    ENDFOREACH ( tfile )
-  ENDIF (VTK_DATA_ROOT)
-
-ENDIF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-
-ADD_TEST(PrintSelf-Imaging ${TCL_TCLSH}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/PrintSelfCheck.tcl  
-         ${VTK_SOURCE_DIR}/Imaging)
-
-ADD_TEST(TestSetObjectMacro-Imaging ${TCL_TCLSH}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/FindString.tcl
-         "${VTK_SOURCE_DIR}/Imaging/vtk\\\\*.h"
-         "vtkSetObjectMacro"
-         )
diff --git a/Infovis/CMakeLists.txt b/Infovis/CMakeLists.txt
deleted file mode 100644
index c245db3965ea968fb3498c1561d22444e2f94e5a..0000000000000000000000000000000000000000
--- a/Infovis/CMakeLists.txt
+++ /dev/null
@@ -1,285 +0,0 @@
-# Note: If you are looking at this file in response to a warning
-# message about an outdated Boost version, please search for the
-# string BOOST_OLD_VERSION.
-
-SET(KIT Infovis)
-SET(UKIT INFOVIS)
-IF(VTK_USE_RENDERING)
-  SET(KIT_TCL_LIBS vtkWidgetsTCL)
-  SET(KIT_PYTHON_LIBS vtkWidgetsPythonD)
-  SET(KIT_JAVA_LIBS vtkWidgetsJava)
-  SET(KIT_INTERFACE_LIBRARIES vtkWidgets)
-  SET(KIT_LIBS ${VTK_LIBXML2_LIBRARIES} vtkalglib)
-ELSE(VTK_USE_RENDERING)
-  SET(KIT_TCL_LIBS vtkGraphicsTCL)
-  SET(KIT_PYTHON_LIBS vtkGraphicsPythonD)
-  SET(KIT_JAVA_LIBS vtkGraphicsJava)
-  SET(KIT_INTERFACE_LIBRARIES vtkGraphics)
-  SET(KIT_LIBS ${VTK_LIBXML2_LIBRARIES} vtkalglib vtkIO vtkImaging)
-ENDIF(VTK_USE_RENDERING)
-
-SET( Kit_SRCS
-vtkAddMembershipArray.cxx
-vtkAppendPoints.cxx
-vtkApplyColors.cxx
-vtkApplyIcons.cxx
-vtkArcParallelEdgeStrategy.cxx
-vtkAreaLayout.cxx
-vtkAreaLayoutStrategy.cxx
-vtkAssignCoordinates.cxx
-vtkAssignCoordinatesLayoutStrategy.cxx
-vtkBivariateLinearTableThreshold.cxx
-vtkBoxLayoutStrategy.cxx
-vtkChacoGraphReader.cxx
-vtkCirclePackFrontChainLayoutStrategy.cxx
-vtkCirclePackLayout.cxx
-vtkCirclePackLayoutStrategy.cxx
-vtkCirclePackToPolyData.cxx
-vtkCircularLayoutStrategy.cxx
-vtkClustering2DLayoutStrategy.cxx
-vtkCollapseGraph.cxx
-vtkCollapseVerticesByArray.cxx
-vtkCommunity2DLayoutStrategy.cxx
-vtkConeLayoutStrategy.cxx
-vtkConstrained2DLayoutStrategy.cxx
-vtkContingencyStatistics.cxx
-vtkCorrelativeStatistics.cxx
-vtkCosmicTreeLayoutStrategy.cxx
-vtkDataObjectToTable.cxx
-vtkDelimitedTextReader.cxx
-vtkDescriptiveStatistics.cxx
-vtkDIMACSGraphReader.cxx
-vtkDIMACSGraphWriter.cxx
-vtkEdgeCenters.cxx
-vtkEdgeLayout.cxx
-vtkEdgeLayoutStrategy.cxx
-vtkExpandSelectedGraph.cxx
-vtkExtractSelectedGraph.cxx
-vtkFast2DLayoutStrategy.cxx
-vtkFixedWidthTextReader.cxx
-vtkForceDirectedLayoutStrategy.cxx
-vtkGenerateIndexArray.cxx
-vtkGeoEdgeStrategy.cxx
-vtkGeoMath.cxx
-vtkGraphHierarchicalBundle.cxx
-vtkGraphHierarchicalBundleEdges.cxx
-vtkGraphLayout.cxx
-vtkGraphLayoutStrategy.cxx
-vtkGroupLeafVertices.cxx
-vtkISIReader.cxx
-vtkKCoreLayout.cxx
-vtkKCoreDecomposition.cxx
-vtkKMeansDistanceFunctor.cxx
-vtkKMeansDistanceFunctorCalculator.cxx
-vtkKMeansStatistics.cxx
-vtkMergeColumns.cxx
-vtkMergeGraphs.cxx
-vtkMergeTables.cxx
-vtkMultiCorrelativeStatistics.cxx
-vtkMutableGraphHelper.cxx
-vtkNetworkHierarchy.cxx
-vtkOrderStatistics.cxx
-vtkPassArrays.cxx
-vtkPassThrough.cxx
-vtkPassThroughEdgeStrategy.cxx
-vtkPassThroughLayoutStrategy.cxx
-vtkPerturbCoincidentVertices.cxx
-vtkPCAStatistics.cxx
-vtkPruneTreeFilter.cxx
-vtkRISReader.cxx
-vtkRandomGraphSource.cxx
-vtkRandomLayoutStrategy.cxx
-vtkRemoveIsolatedVertices.cxx
-vtkRemoveHiddenData.cxx
-vtkSCurveSpline.cxx
-vtkSimple2DLayoutStrategy.cxx
-vtkSimple3DCirclesStrategy.cxx
-vtkSliceAndDiceLayoutStrategy.cxx
-vtkSplineGraphEdges.cxx
-vtkSplitColumnComponents.cxx
-vtkSquarifyLayoutStrategy.cxx
-vtkSpanTreeLayoutStrategy.cxx
-vtkStackedTreeLayoutStrategy.cxx
-vtkStatisticsAlgorithm.cxx
-vtkStrahlerMetric.cxx
-vtkStreamGraph.cxx
-vtkStreamingStatistics.cxx
-vtkStringToCategory.cxx
-vtkStringToNumeric.cxx
-vtkTableToGraph.cxx
-vtkTableToTreeFilter.cxx
-vtkThresholdGraph.cxx
-vtkThresholdTable.cxx
-vtkTransferAttributes.cxx
-vtkTreeFieldAggregator.cxx
-vtkTreeLayoutStrategy.cxx
-vtkTreeOrbitLayoutStrategy.cxx
-vtkTreeLevelsFilter.cxx
-vtkTreeMapLayout.cxx
-vtkTreeMapLayoutStrategy.cxx
-vtkTreeMapToPolyData.cxx
-vtkTreeRingToPolyData.cxx
-vtkTulipReader.cxx
-vtkAttributeClustering2DLayoutStrategy.cxx
-vtkVertexDegree.cxx
-vtkXGMLReader.cxx
-vtkXMLTreeReader.cxx
-)
-
-IF(VTK_USE_RENDERING)
-  SET(Kit_SRCS
-    ${Kit_SRCS}
-    vtkConvexHull2D.cxx
-    vtkGraphAnnotationLayersFilter.cxx
-    )
-ENDIF(VTK_USE_RENDERING)
-
-# Add these classes only if using Boost
-
-# About the BOOST_OLD_VERSION warning:
-#
-# The Kruskal minimum spanning tree algorithm does not compile
-# correctly with Boost versions earlier than 1.36 on 64-bit platforms.
-# If you're using one of those old versions you have two options:
-#
-#
-# 1.  Download a new version of Boost from http://www.boost.org and
-#     install it wherever you like.  Make sure to change the CMAKE
-#     variable Boost_INCLUDE_DIR to point to the new version.
-#
-# 2.  Continue with your existing version of Boost.  We will still
-#     compile whatever Boost filters we can.
-#
-# Upgrading to a recent Boost version is the preferred solution.  A
-# future version of ParaView will probably require Boost 1.36 or later.
-
-
-IF(VTK_USE_BOOST)
-  INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
-  IF( "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}" LESS 1.36)
-    IF( HAVE_CMAKE_SIZEOF_VOID_P AND CMAKE_SIZEOF_VOID_P EQUAL 8 )
-      SET( BOOST_OLD_VERSION TRUE )
-      MESSAGE( "Your system is using an outdated version of Boost ("
-               "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}"
-               ", found in ${Boost_INCLUDE_DIR}).  Some of the graph "
-               "processing filters require version 1.36.0 or later to "
-               "build on 64-bit platforms.  \n\nThe system will still compile "
-               "but those filters will be disabled.  Please see "
-               "ParaView3/VTK/Infovis/CMakeLists.txt "
-               "for more information." )
-    ENDIF( HAVE_CMAKE_SIZEOF_VOID_P AND CMAKE_SIZEOF_VOID_P EQUAL 8 )
-  ENDIF( "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}" LESS 1.36 )
-
-  SET(Kit_SRCS
-    ${Kit_SRCS}
-    vtkBoostBetweennessClustering.cxx
-    vtkBoostBiconnectedComponents.cxx
-    vtkBoostBrandesCentrality.cxx
-    vtkBoostBreadthFirstSearch.cxx
-    vtkBoostBreadthFirstSearchTree.cxx
-    vtkBoostConnectedComponents.cxx
-    vtkBoostExtractLargestComponent.cxx
-    vtkBoostPrimMinimumSpanningTree.cxx
-    vtkBoostSplitTableField.cxx
-  )
-
-  IF( NOT BOOST_OLD_VERSION )
-    SET( Kit_SRCS
-        ${Kit_SRCS}
-        vtkBoostKruskalMinimumSpanningTree.cxx
-       )
-  ENDIF( NOT BOOST_OLD_VERSION )
-
-ENDIF(VTK_USE_BOOST)
-
-IF(VTK_USE_N_WAY_ARRAYS)
-
-  SET(Kit_SRCS
-    ${Kit_SRCS}
-    vtkAdjacencyMatrixToEdgeTable.cxx
-    vtkArrayNorm.cxx
-    vtkArrayToTable.cxx
-    vtkComputeHistogram2DOutliers.cxx
-    vtkDiagonalMatrixSource.cxx
-    vtkDotProductSimilarity.cxx
-    vtkExtractArray.cxx
-    vtkExtractHistogram2D.cxx
-    vtkMatricizeArray.cxx
-    vtkNormalizeMatrixVectors.cxx
-    vtkPairwiseExtractHistogram2D.cxx
-    vtkSparseArrayToTable.cxx
-    vtkTableToArray.cxx
-    vtkTableToSparseArray.cxx
-    vtkTransposeMatrix.cxx
-    )
-
-  IF(VTK_USE_BOOST)
-
-    SET(Kit_SRCS
-      ${Kit_SRCS}
-      vtkBoostLogWeighting.cxx
-      vtkBoostRandomSparseArraySource.cxx
-    )
-
-  ENDIF(VTK_USE_BOOST)
-ENDIF(VTK_USE_N_WAY_ARRAYS)
-
-# Add these classes only if PARALLEL is turned ON
-IF(VTK_USE_PARALLEL)
-  SET(Kit_SRCS ${Kit_SRCS}
-    vtkPBivariateLinearTableThreshold.cxx
-    vtkPCorrelativeStatistics.cxx
-    vtkPContingencyStatistics.cxx
-    vtkPDescriptiveStatistics.cxx
-    vtkPKMeansStatistics.cxx
-    vtkPMultiCorrelativeStatistics.cxx
-    vtkPOrderStatistics.cxx
-    vtkPPCAStatistics.cxx
-    )
-
-    IF(VTK_USE_N_WAY_ARRAYS)
-      SET(Kit_SRCS ${Kit_SRCS}
-        vtkPComputeHistogram2DOutliers.cxx
-        vtkPExtractHistogram2D.cxx
-        vtkPPairwiseExtractHistogram2D.cxx
-        )
-    ENDIF(VTK_USE_N_WAY_ARRAYS)
-
-  SET(KIT_INTERFACE_LIBRARIES ${KIT_INTERFACE_LIBRARIES} vtkParallel)
-ENDIF(VTK_USE_PARALLEL)
-
-# Add these classes only if vtkTypeUInt64Array exists
-IF(VTK_HAS_UINT64_ARRAY)
-  SET(Kit_SRCS
-    ${Kit_SRCS}
-    vtkSQLDatabaseGraphSource.cxx
-    vtkSQLDatabaseTableSource.cxx
-    vtkSQLGraphReader.cxx    # depends on vtkRowQueryToTable, which depends on uint64 array
-    vtkStringToTimePoint.cxx
-    vtkTimePointToString.cxx
-  )
-ENDIF(VTK_HAS_UINT64_ARRAY)
-
-SET_SOURCE_FILES_PROPERTIES(
-vtkAreaLayoutStrategy.cxx
-vtkCirclePackLayoutStrategy.cxx
-vtkEdgeLayoutStrategy.cxx
-vtkGraphLayoutStrategy.cxx
-vtkStatisticsAlgorithm.cxx
-vtkTreeMapLayoutStrategy.cxx
-ABSTRACT
-)
-
-SET(Kit_EXTRA_SRCS)
-SET(Kit_EXTRA_CMDS)
-SET(Kit_TCL_EXTRA_SRCS)
-SET(Kit_PYTHON_EXTRA_SRCS)
-SET(Kit_JAVA_EXTRA_SRCS)
-SET(KIT_TCL_DEPS)
-SET(KIT_PYTHON_DEPS)
-SET(KIT_JAVA_DEPS)
-
-#-----------------------------------------------------------------------------
-# Include CMake code common to all kits.
-INCLUDE(${VTK_CMAKE_DIR}/KitCommonBlock.cmake)
-#-----------------------------------------------------------------------------
diff --git a/Infovis/Testing/CMakeLists.txt b/Infovis/Testing/CMakeLists.txt
deleted file mode 100644
index 1d8eb79b4a4e557a77fd193bf27a8bf7c054ccb4..0000000000000000000000000000000000000000
--- a/Infovis/Testing/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-ADD_SUBDIRECTORY(Cxx)
-
-IF (VTK_WRAP_TCL)
-  ADD_SUBDIRECTORY(Tcl)
-ENDIF (VTK_WRAP_TCL)
-
-IF (VTK_WRAP_PYTHON)
-  ADD_SUBDIRECTORY(Python)
-ENDIF (VTK_WRAP_PYTHON)
-
-IF(PYTHON_EXECUTABLE)
-  ADD_TEST(HeaderTesting-Infovis ${PYTHON_EXECUTABLE}
-    ${VTK_SOURCE_DIR}/Common/Testing/HeaderTesting.py
-    "${VTK_SOURCE_DIR}/Infovis"
-    VTK_INFOVIS_EXPORT
-    vtkArrayNorm.h
-    vtkMultiCorrelativeStatisticsAssessFunctor.h 
-    vtkKMeansAssessFunctor.h 
-    vtkBoostGraphAdapter.h
-    vtkBoostRandomSparseArraySource.h
-    vtkSQLDatabaseGraphSource.h
-    vtkSQLDatabaseTableSource.h
-    vtkStatisticsAlgorithmPrivate.h 
-    )
-ENDIF(PYTHON_EXECUTABLE)
diff --git a/Infovis/Testing/Cxx/CMakeLists.txt b/Infovis/Testing/Cxx/CMakeLists.txt
deleted file mode 100644
index be5aadbe2805754d04e30aa2109f370121d10e23..0000000000000000000000000000000000000000
--- a/Infovis/Testing/Cxx/CMakeLists.txt
+++ /dev/null
@@ -1,277 +0,0 @@
-IF(VTK_USE_BOOST)
-  include_directories(${Boost_INCLUDE_DIRS})
-ENDIF(VTK_USE_BOOST)
-
-# if we have rendering add the following tests
-IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-  SET(KIT Infovis)
-  # add tests that do not require data
-  SET(MyTests
-    TestArcEdges
-    TestAssignCoordinates
-    TestCirclePackLayoutStrategy
-    TestCollapseVerticesByArray
-    TestContingencyStatistics
-    TestConvexHull2D
-    TestCorrelativeStatistics
-    TestCosmicTreeLayoutStrategy
-    TestDataObjectToTable
-    TestDescriptiveStatistics
-    TestExtractSelectedGraph
-    TestGraph
-    TestGraphAttributes
-    TestGraphAlgorithms
-    TestGraphHierarchicalBundle
-    TestGraphLayoutStrategy
-    TestGroupLeafVertices
-    TestKCoreDecomposition
-    TestKdTreeBoxSelection
-    TestKMeansStatistics
-    TestMergeGraphs
-    TestMultiCorrelativeStatistics
-    TestOrderStatistics
-    TestPassArrays
-    TestPassThrough
-    TestPCAStatistics
-    TestPruneTreeFilter
-    TestRandomGraphSource
-    TestRemoveIsolatedVertices
-    TestSimple3DCirclesStrategy
-    TestStreamGraph
-    TestStringToCategory
-    TestTable
-    TestTableSplitColumnComponents.cxx
-    TestTreeMapLayoutStrategy
-    TestThresholdTable
-    TestVariantArray
-    TestVariant
-    )
-  IF (VTK_DATA_ROOT)
-    # add tests that require data
-    SET(MyTests ${MyTests}
-      TestChacoGraphReader
-      TestDelimitedTextReader
-      TestDIMACSGraphReader
-      TestKCoreLayout
-      TestMergeTables
-      TestISIReader
-      TestFixedWidthTextReader
-      TestRISReader
-      TestStringToNumeric
-      TestTulipReader
-      TestTulipReaderClusters
-      TestTulipReaderProperties
-      )
-  ENDIF (VTK_DATA_ROOT)
-
-  IF (VTK_USE_BOOST)
-    # add boost tests
-    SET(MyTests ${MyTests}
-      TestBoostAdapter
-      TestBoostAlgorithms
-      TestBoostExtractLargestComponent.cxx
-      TestBoostBetweennessClustering.cxx
-      )
-
-     IF (VTK_USE_VIEWS)
-       SET(MyTests ${MyTests}
-         TestBoostBrandesCentrality
-         TestTableToGraph
-       )
-    ENDIF (VTK_USE_VIEWS)
-
-
-    IF (VTK_USE_PARALLEL_BGL)
-      # The variant-serialization test is kept separate, because it
-      # needs to link against the serialization library.
-      ADD_EXECUTABLE(TestVariantSerialization TestVariantSerialization.cxx)
-      TARGET_LINK_LIBRARIES(TestVariantSerialization vtkInfovis ${Boost_SERIALIZATION_LIBRARY})
-      ADD_TEST(TestVariantSerialization ${CXX_TEST_PATH}/TestVariantSerialization)
-    ENDIF (VTK_USE_PARALLEL_BGL)
-
-    IF(VTK_DATA_ROOT)
-      SET(MyTests ${MyTests}
-        TestBoostSplitTableField
-        )
-    ENDIF(VTK_DATA_ROOT)
-
-    IF (VTK_USE_PARALLEL_BGL)
-      # Add tests using the Parallel BGL
-      ADD_EXECUTABLE(TestPBGLAlgorithms TestPBGLAlgorithms.cxx)
-      TARGET_LINK_LIBRARIES(TestPBGLAlgorithms vtkInfovis ${Boost_LIBRARIES} ${MPI_LIBRARIES})
-
-      ADD_TEST(TestPBGLAlgorithms
-        ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} ${VTK_MPI_MAX_NUMPROCS}
-        ${VTK_MPI_PREFLAGS}
-        ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TestPBGLAlgorithms
-        ${VTK_MPI_POSTFLAGS})
-    ENDIF (VTK_USE_PARALLEL_BGL)
-  ENDIF (VTK_USE_BOOST)
-
-  IF(VTK_USE_PARALLEL AND VTK_USE_MPI)
-    INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
-    IF (MPI_LIBRARY)
-      SET(MPI_LIBRARIES ${MPI_LIBRARY})
-    ENDIF (MPI_LIBRARY)
-    IF (MPI_EXTRA_LIBRARY)
-      SET(MPI_LIBRARIES ${MPI_LIBRARIES} "${MPI_EXTRA_LIBRARY}")
-    ENDIF (MPI_EXTRA_LIBRARY)
-
-    # Add parallel tests only if PARALLEL and MPI are turned ON
-    # These tests are kept separate, because they must be run with mpirun or mpiexec
-
-    # TestRandomPMomentStatisticsMPI:
-    # MPI test of parallel descriptive, correlative, multicorrelative and PCA statistics
-    ADD_EXECUTABLE(TestRandomPMomentStatisticsMPI TestRandomPMomentStatisticsMPI.cxx)
-    TARGET_LINK_LIBRARIES(TestRandomPMomentStatisticsMPI vtkInfovis vtkParallel ${MPI_LIBRARIES})
-
-    # TestRandomPContingencyStatisticsMPI:
-    # MPI test of parallel contingency statistics
-    ADD_EXECUTABLE(TestRandomPContingencyStatisticsMPI TestRandomPContingencyStatisticsMPI.cxx)
-    TARGET_LINK_LIBRARIES(TestRandomPContingencyStatisticsMPI vtkInfovis vtkParallel ${MPI_LIBRARIES})
-
-    # TestRandomPOrderStatisticsMPI:
-    # MPI test of parallel order statistics
-    ADD_EXECUTABLE(TestRandomPOrderStatisticsMPI TestRandomPOrderStatisticsMPI.cxx)
-    TARGET_LINK_LIBRARIES(TestRandomPOrderStatisticsMPI vtkInfovis vtkParallel ${MPI_LIBRARIES})
-
-    # TestRandomPKMeansStatisticsMPI:
-    # MPI test of parallel KMeans statistics
-    ADD_EXECUTABLE(TestRandomPKMeansStatisticsMPI TestRandomPKMeansStatisticsMPI.cxx)
-    TARGET_LINK_LIBRARIES(TestRandomPKMeansStatisticsMPI vtkInfovis vtkParallel ${MPI_LIBRARIES})
-
-    # TestRealDataPDescriptiveStatisticsMPI:
-    # MPI test of parallel descriptive statistics with real data
-    ADD_EXECUTABLE(TestRealDataPDescriptiveStatisticsMPI TestRealDataPDescriptiveStatisticsMPI.cxx)
-    TARGET_LINK_LIBRARIES(TestRealDataPDescriptiveStatisticsMPI vtkInfovis vtkParallel ${MPI_LIBRARIES})
-
-    IF (VTK_MPIRUN_EXE)
-      ADD_TEST(TestRandomPMomentStatisticsMPI
-        ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} ${VTK_MPI_MAX_NUMPROCS}
-        ${VTK_MPI_PREFLAGS}
-        ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TestRandomPMomentStatisticsMPI
-        ${VTK_MPI_POSTFLAGS}
-        )
-
-      ADD_TEST(TestRandomPContingencyStatisticsMPI
-        ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} ${VTK_MPI_MAX_NUMPROCS}
-        ${VTK_MPI_PREFLAGS}
-        ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TestRandomPContingencyStatisticsMPI
-        ${VTK_MPI_POSTFLAGS}
-        )
-
-      ADD_TEST(TestRandomPOrderStatisticsMPI
-        ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} ${VTK_MPI_MAX_NUMPROCS}
-        ${VTK_MPI_PREFLAGS}
-        ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TestRandomPOrderStatisticsMPI
-        ${VTK_MPI_POSTFLAGS}
-        )
-
-      ADD_TEST(TestRandomPKMeansStatisticsMPI
-        ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} ${VTK_MPI_MAX_NUMPROCS}
-        ${VTK_MPI_PREFLAGS}
-        ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TestRandomPKMeansStatisticsMPI
-        ${VTK_MPI_POSTFLAGS}
-        )
-    ENDIF (VTK_MPIRUN_EXE)
-
-  ENDIF (VTK_USE_PARALLEL AND VTK_USE_MPI)
-
-  SET(VTK_HAS_UINT64_ARRAY 0)
-  IF(VTK_SIZEOF_LONG_LONG MATCHES "^8$")
-    SET(VTK_HAS_UINT64_ARRAY 1)
-  ELSE(VTK_SIZEOF_LONG_LONG MATCHES "^8$")
-    IF(VTK_SIZEOF_LONG MATCHES "^8$")
-      SET(VTK_HAS_UINT64_ARRAY 1)
-    ELSE(VTK_SIZEOF_LONG MATCHES "^8$")
-      IF(VTK_SIZEOF___INT64 MATCHES "^8$")
-        IF(VTK_TYPE_CONVERT_UI64_TO_DOUBLE)
-          SET(VTK_HAS_UINT64_ARRAY 1)
-        ENDIF(VTK_TYPE_CONVERT_UI64_TO_DOUBLE)
-      ENDIF(VTK_SIZEOF___INT64 MATCHES "^8$")
-    ENDIF(VTK_SIZEOF_LONG MATCHES "^8$")
-  ENDIF(VTK_SIZEOF_LONG_LONG MATCHES "^8$")
-  IF(VTK_HAS_UINT64_ARRAY)
-    # add these tests only if vtkTypeUInt64Array exists
-    SET(MyTests ${MyTests}
-      TestSQLGraphReader
-      TestTimePoint
-      )
-  ENDIF(VTK_HAS_UINT64_ARRAY)
-  CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx ${MyTests}
-                         EXTRA_INCLUDE vtkTestDriver.h)
-  ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
-
-  SET (LIBS vtkInfovis vtkRendering vtkIO vtkCommon)
-  IF(VTK_USE_VIEWS)
-    SET(LIBS ${LIBS} vtkViews)
- ENDIF(VTK_USE_VIEWS)
-
-  TARGET_LINK_LIBRARIES(${KIT}CxxTests ${LIBS})
-  SET (TestsToRun ${Tests})
-  REMOVE (TestsToRun ${KIT}CxxTests.cxx)
-
-  #
-  # Add all the executables
-  FOREACH (test ${TestsToRun})
-    GET_FILENAME_COMPONENT(TName ${test} NAME_WE)
-    IF (VTK_DATA_ROOT)
-      ADD_TEST(Infovis-${TName} ${CXX_TEST_PATH}/${KIT}CxxTests ${TName}
-          -D ${VTK_DATA_ROOT}
-          -T ${VTK_BINARY_DIR}/Testing/Temporary
-          -V Baseline/${KIT}/${TName}.png)
-    ELSE (VTK_DATA_ROOT)
-      ADD_TEST(Infovis-${TName} ${CXX_TEST_PATH}/${KIT}CxxTests ${TName})
-    ENDIF (VTK_DATA_ROOT)
-  ENDFOREACH (test)
-ENDIF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-IF(VTK_USE_N_WAY_ARRAYS)
-
-  CREATE_TEST_SOURCELIST(ArrayTests ArrayCxxTests.cxx
-    ArrayAPIDenseCoordinates.cxx
-    ArrayDiagonalMatrixSource.cxx
-    ArrayDotProductSimilarity.cxx
-    ArrayExtractFactoredArray.cxx
-    ArrayMatricizeArray.cxx
-    TestArrayNorm.cxx
-    ArrayNormalizeMatrixVectors.cxx
-    ArraySparseArrayToTable.cxx
-    ArrayTableToSparseArray.cxx
-    ArrayToTable.cxx
-    ArrayTransposeMatrix.cxx
-    TestTableToArray.cxx
-    EXTRA_INCLUDE vtkTestDriver.h
-    )
-
-  ADD_EXECUTABLE(InfovisArrayCxxTests ${ArrayTests})
-  TARGET_LINK_LIBRARIES(InfovisArrayCxxTests vtkInfovis)
-
-  SET(ArrayTestsToRun ${ArrayTests})
-  REMOVE(ArrayTestsToRun ArrayCxxTests.cxx)
-
-  FOREACH(test ${ArrayTestsToRun})
-    GET_FILENAME_COMPONENT(TName ${test} NAME_WE)
-    ADD_TEST(Array-${TName} ${CXX_TEST_PATH}/InfovisArrayCxxTests ${TName})
-  ENDFOREACH(test)
-
-  IF(VTK_USE_BOOST)
-
-    CREATE_TEST_SOURCELIST(BoostArrayTests BoostArrayCxxTests.cxx
-      BoostArrayLogWeighting.cxx
-      BoostArrayRandomSparseArraySource.cxx
-      )
-
-    ADD_EXECUTABLE(InfovisBoostArrayCxxTests ${BoostArrayTests})
-    TARGET_LINK_LIBRARIES(InfovisBoostArrayCxxTests vtkInfovis)
-
-    SET(BoostArrayTestsToRun ${BoostArrayTests})
-    REMOVE(BoostArrayTestsToRun BoostArrayCxxTests.cxx)
-
-    FOREACH(test ${BoostArrayTestsToRun})
-      GET_FILENAME_COMPONENT(TName ${test} NAME_WE)
-      ADD_TEST(Boost-Array-${TName} ${CXX_TEST_PATH}/InfovisBoostArrayCxxTests ${TName})
-    ENDFOREACH(test)
-
-  ENDIF(VTK_USE_BOOST)
-ENDIF(VTK_USE_N_WAY_ARRAYS)
-
diff --git a/Infovis/Testing/Python/CMakeLists.txt b/Infovis/Testing/Python/CMakeLists.txt
deleted file mode 100644
index dc500d75f985338154091da07ff6b63109846c03..0000000000000000000000000000000000000000
--- a/Infovis/Testing/Python/CMakeLists.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-
-  IF (VTK_PYTHON_EXE)
-    SET(tests)
-    
-    IF (VTK_DATA_ROOT)
-      # Tests written in Python that require VTKData
-      # These tests should use vtk.test.Testing.
-      #SET( tests
-      #  ${tests}
-      #)
-    ELSE (VTK_DATA_ROOT)
-      # Tests written in Python that do NOT require VTKData
-      # These tests should use vtk.test.Testing.
-      SET( tests
-        ${tests}
-        kMeansDistanceCalculator
-      )
-    ENDIF (VTK_DATA_ROOT)
-    IF ( tests )
-      FOREACH ( tfile
-                ${tests}
-                )
-        ADD_TEST(${tfile}Python ${VTK_PYTHON_EXE}
-          ${VTK_SOURCE_DIR}/Infovis/Testing/Python/${tfile}.py
-          -D ${VTK_DATA_ROOT}
-          -B ${VTK_DATA_ROOT}/Baseline/Infovis)
-      ENDFOREACH( tfile )
-    ENDIF ( tests )
-
-  ENDIF (VTK_PYTHON_EXE)
-ENDIF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
diff --git a/Infovis/Testing/Tcl/CMakeLists.txt b/Infovis/Testing/Tcl/CMakeLists.txt
deleted file mode 100644
index c28cf57961f055826835ddb065b198b5c84f8dbb..0000000000000000000000000000000000000000
--- a/Infovis/Testing/Tcl/CMakeLists.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-  
-  #
-  # Add tests, with the data
-  #
-  IF (VTK_DATA_ROOT)
-
-    FOREACH ( tfile
-      )
-      ADD_TEST(${tfile}-image ${VTK_EXECUTABLE}
-        ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-        ${VTK_SOURCE_DIR}/Infovis/Testing/Tcl/${tfile}.tcl
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
-        -V Baseline/Infovis/${tfile}.png
-        -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-    ENDFOREACH ( tfile )
-
-  #
-  # If we do not have the data, still run the tests that we can
-  #
-  ELSE (VTK_DATA_ROOT)
-    FOREACH ( tfile
-      )
-      ADD_TEST(${tfile} ${VTK_EXECUTABLE}
-        ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-        ${VTK_SOURCE_DIR}/Infovis/Testing/Tcl/${tfile}.tcl
-        -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-    ENDFOREACH ( tfile )
-  ENDIF (VTK_DATA_ROOT)
-
-ENDIF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-
-ADD_TEST(PrintSelf-Infovis ${TCL_TCLSH}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/PrintSelfCheck.tcl  
-         ${VTK_SOURCE_DIR}/Infovis)
-
-ADD_TEST(TestSetObjectMacro-Infovis ${TCL_TCLSH}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/FindString.tcl
-         "${VTK_SOURCE_DIR}/Infovis/vtk\\\\*.h"
-         "vtkSetObjectMacro"
-         )
diff --git a/Infovis/TitanReadme.txt b/Infovis/TitanReadme.txt
deleted file mode 100644
index 0a3cc3d3575785ceafa2de21aa790ddd0a9d1bc0..0000000000000000000000000000000000000000
--- a/Infovis/TitanReadme.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-The Infovis classes in VTK are brought to you by the Titan Informatics
-Toolkit Project. The Titan project is an collaborative effort between
-Sandia National Laboratories and Kitware Inc. to combine SciVis and 
-InfoVis capabilities into one scalable infrastructure.
-
-Sandia is a multi-program laboratory operated by Sandia Corporation, a
-Lockheed Martin Company, for the United States Department of Energy under
-Contract DE-AC04-94AL85000.
-
-Go Titan!!!!
-
-       _______ __
-      /_  __(_) /_____ _____
-       / / / / __/ __ `/ __ \
-      / / / / /_/ /_/ / / / /
-     /_/ /_/\__/\__,_/_/ /_/
-            VTK Informatics Toolkit
-
diff --git a/Parallel/CMakeLists.txt b/Parallel/CMakeLists.txt
deleted file mode 100644
index 78702fbb259eab94c301207a86f60effaba3c965..0000000000000000000000000000000000000000
--- a/Parallel/CMakeLists.txt
+++ /dev/null
@@ -1,272 +0,0 @@
-SET(KIT Parallel)
-SET(UKIT PARALLEL)
-SET(KIT_TCL_LIBS vtkIOTCL)
-SET(KIT_PYTHON_LIBS vtkIOPythonD)
-SET(KIT_JAVA_LIBS vtkIOJava)
-SET(KIT_INTERFACE_LIBRARIES vtkIO)
-SET(KIT_LIBS VPIC Cosmo LSDyna)
-IF(VTK_USE_RENDERING)
-  SET(KIT_TCL_LIBS vtkRenderingTCL ${KIT_TCL_LIBS})
-  SET(KIT_PYTHON_LIBS vtkRenderingPythonD ${KIT_PYTHON_LIBS})
-  SET(KIT_JAVA_LIBS vtkRenderingJava ${KIT_JAVA_LIBS})
-  SET(KIT_INTERFACE_LIBRARIES vtkRendering ${KIT_INTERFACE_LIBRARIES})
-  SET(KIT_LIBS ${KIT_LIBS} ${OPENGL_gl_LIBRARY})
-  IF (VTK_OPENGL_HAS_OSMESA AND OSMESA_LIBRARY)
-    SET (KIT_LIBS ${KIT_LIBS} ${OSMESA_LIBRARY} )
-  ENDIF (VTK_OPENGL_HAS_OSMESA AND OSMESA_LIBRARY)
-ELSE(VTK_USE_RENDERING)
-  SET(KIT_PYTHON_LIBS ${KIT_PYTHON_LIBS} vtkGraphicsPythonD)
-  SET(KIT_LIBS ${KIT_LIBS} vtkGraphics vtkImaging)
-ENDIF(VTK_USE_RENDERING)
-IF(VTK_HAS_EXODUS)
-  SET(KIT_LIBS ${KIT_LIBS} vtkexoIIc)
-ENDIF(VTK_HAS_EXODUS)
-
-SET ( Kit_SRCS
-vtkAMRUtilities.cxx
-vtkCachingInterpolatedVelocityField.cxx
-vtkClientServerSynchronizedRenderers.cxx
-vtkCollectGraph.cxx
-vtkCollectPolyData.cxx
-vtkCollectTable.cxx
-vtkCommunicator.cxx
-vtkCompositedSynchronizedRenderers.cxx
-vtkCompositer.cxx
-vtkCompressCompositer.cxx
-vtkCutMaterial.cxx
-vtkDistributedDataFilter.cxx
-vtkDistributedStreamTracer.cxx
-vtkDummyCommunicator.cxx
-vtkDummyController.cxx
-vtkDuplicatePolyData.cxx
-vtkEnSightWriter.cxx
-vtkExtractCTHPart.cxx
-vtkExtractPiece.cxx
-vtkExtractPolyDataPiece.cxx
-vtkExtractUnstructuredGridPiece.cxx
-vtkExtractUserDefinedPiece.cxx
-vtkFieldDataSerializer.cxx
-vtkMPIImageReader.cxx
-vtkMultiProcessController.cxx
-vtkMultiProcessStream.cxx
-vtkParallelFactory.cxx
-vtkPassThroughFilter.cxx
-vtkPCellDataToPointData.cxx
-vtkPChacoReader.cxx
-vtkPCosmoHaloFinder.cxx
-vtkPCosmoReader.cxx
-vtkPDataSetGhostGenerator.cxx
-vtkPDataSetReader.cxx
-vtkPDataSetWriter.cxx
-vtkPExtractArraysOverTime.cxx
-vtkPHardwareSelector.cxx
-vtkPieceRequestFilter.cxx
-vtkPieceScalars.cxx
-vtkPKdTree.cxx
-vtkPLinearExtrusionFilter.cxx
-vtkPMaskPoints.cxx
-vtkPNrrdReader.cxx
-vtkPOpenFOAMReader.cxx
-vtkPOutlineCornerFilter.cxx
-vtkPOutlineFilter.cxx
-vtkPPolyDataNormals.cxx
-vtkPProbeFilter.cxx
-vtkProcess.cxx
-vtkProcessGroup.cxx
-vtkProcessIdScalars.cxx
-vtkPLSDynaReader.cxx
-vtkPReflectionFilter.cxx
-vtkPSLACReader.cxx
-vtkPSphereSource.cxx
-vtkPStreamTracer.cxx
-vtkPTableToStructuredGrid.cxx
-vtkPYoungsMaterialInterface.cxx
-vtkRectilinearGridOutlineFilter.cxx
-vtkSocketCommunicator.cxx
-vtkSocketController.cxx
-vtkSubCommunicator.cxx
-vtkSubGroup.cxx
-vtkTemporalFractal.cxx
-vtkTemporalInterpolatedVelocityField.cxx
-vtkTemporalStreamTracer.cxx
-vtkTransmitImageDataPiece.cxx
-vtkTransmitPolyDataPiece.cxx
-vtkTransmitRectilinearGridPiece.cxx
-vtkTransmitStructuredGridPiece.cxx
-vtkTransmitUnstructuredGridPiece.cxx
-vtkVPICReader.cxx
-vtkWindBladeReader.cxx
-vtkXMLPHierarchicalBoxDataWriter.cxx
-vtkXMLPMultiBlockDataWriter.cxx
-)
-
-IF(VTK_USE_RENDERING)
-  SET ( Kit_SRCS
-    ${Kit_SRCS}
-    vtkClientServerCompositePass.cxx
-    vtkCompositeRenderManager.cxx
-    vtkCompositeRGBAPass.cxx
-    vtkCompositeZPass.cxx
-    vtkImageRenderManager.cxx
-    vtkMemoryLimitImageDataStreamer.cxx
-    vtkParallelRenderManager.cxx
-    vtkPImageWriter.cxx
-    vtkPipelineSize.cxx
-    vtkSynchronizedRenderers.cxx
-    vtkSynchronizedRenderWindows.cxx
-    vtkTreeCompositer.cxx
-    )
-
-# The set of source files to be encoded.
-SET(shader_files
-  vtkCompositeZPassShader_fs.glsl
-  )
-ENDIF(VTK_USE_RENDERING)
-
-IF(VTK_HAS_EXODUS)
-  SET(Kit_SRCS ${Kit_SRCS}
-    vtkExodusIIWriter.cxx
-  )
-ENDIF(VTK_HAS_EXODUS)
-
-SET_SOURCE_FILES_PROPERTIES(
-vtkAMRUtilities
-vtkCommunicator 
-vtkMultiProcessController
-vtkMultiProcessStream
-vtkPDataSetGhostGenerator
-vtkPStreamTracer
-vtkProcess
-ABSTRACT
-)
-
-SET_SOURCE_FILES_PROPERTIES(
-vtkMultiProcessStream
-vtkCompositeRGBAPass
-vtkCompositeZPass
-WRAP_EXCLUDE
-)
-
-IF(VTK_USE_RENDERING)
-  SET_SOURCE_FILES_PROPERTIES(
-  vtkParallelRenderManager
-  ABSTRACT
-  )
-ENDIF(VTK_USE_RENDERING)
-
-IF (VTK_USE_MPI)
-  INCLUDE (FindMPI)
-
-  INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
-
-  SET ( Kit_SRCS
-    ${Kit_SRCS}
-    vtkMPICommunicator.cxx
-    vtkMPIController.cxx 
-    vtkPNetCDFPOPReader.cxx
-    vtkPStructuredGridConnectivity.cxx
-    vtkPUniformGridGhostDataGenerator.cxx
-    vtkPStructuredGridGhostDataGenerator.cxx
-    )
-  # Needed for mpich 2
-  ADD_DEFINITIONS("-DMPICH_IGNORE_CXX_SEEK")
-ELSE (VTK_USE_MPI)
-  ADD_DEFINITIONS("-DUSE_SERIAL_COSMO")
-ENDIF (VTK_USE_MPI)
-
-IF (VTK_USE_PARALLEL_BGL)
-  SET(KIT_LIBS ${KIT_LIBS} ${Boost_LIBRARIES})
-  SET ( Kit_SRCS
-    ${Kit_SRCS}
-    vtkPBGLBreadthFirstSearch.cxx
-    vtkPBGLCollapseGraph.cxx
-    vtkPBGLCollapseParallelEdges.cxx
-    vtkPBGLCollectGraph.cxx
-    vtkPBGLConnectedComponents.cxx 
-    vtkPBGLDistributedGraphHelper.cxx
-    vtkPBGLGraphSQLReader.cxx
-    vtkPBGLMinimumSpanningTree.cxx
-    vtkPBGLRMATGraphSource.cxx
-    vtkPBGLRandomGraphSource.cxx
-    vtkPBGLShortestPaths.cxx
-    vtkPBGLVertexColoring.cxx
-    )
-ENDIF (VTK_USE_PARALLEL_BGL)
-
-IF (VTK_USE_MPI) 
-  IF (MPI_LIBRARY) 
-    SET(KIT_LIBS ${KIT_LIBS} "${MPI_LIBRARY}")   
-  ELSE (MPI_LIBRARY)   
-    MESSAGE("Could not find the required MPI libraries")
-  ENDIF (MPI_LIBRARY)   
-  IF (MPI_EXTRA_LIBRARY)   
-    SET(KIT_LIBS ${KIT_LIBS} "${MPI_EXTRA_LIBRARY}")   
-  ENDIF (MPI_EXTRA_LIBRARY) 
-ENDIF (VTK_USE_MPI)
-
-SET(Kit_EXTRA_SRCS
-  ${VTK_BINARY_DIR}/Parallel/vtkSocketCommunicatorHash.h
-  )
-SET(Kit_EXTRA_CMDS)
-SET(Kit_TCL_EXTRA_SRCS)
-SET(Kit_PYTHON_EXTRA_SRCS)
-SET(Kit_JAVA_EXTRA_SRCS)
-SET(KIT_TCL_DEPS)
-SET(KIT_PYTHON_DEPS)
-SET(KIT_JAVA_DEPS)
-
-IF(VTK_USE_RENDERING)
-# Create custom commands to encode each assembly file into a C string
-# literal in a header file.
-
-SET(shader_h_files)
-FOREACH(file ${shader_files})
-  GET_FILENAME_COMPONENT(file_we ${file} NAME_WE)
-  SET(src ${VTK_SOURCE_DIR}/Parallel/${file})
-  SET(res ${VTK_BINARY_DIR}/Parallel/${file_we}.cxx)
-  SET(resh ${VTK_BINARY_DIR}/Parallel/${file_we}.h)
-  SET(shader_h_files ${shader_h_files} "${resh}")
-  ADD_CUSTOM_COMMAND(
-    OUTPUT ${res} ${resh}
-    DEPENDS ${src} vtkEncodeString
-    COMMAND ${VTK_ENCODESTRING_EXE}
-    ARGS ${res} ${src} ${file_we} --build-header VTK_PARALLEL_EXPORT vtkSystemIncludes.h
-    )
-  SET(Kit_EXTRA_SRCS ${Kit_EXTRA_SRCS} ${res})
-ENDFOREACH(file)
-ENDIF(VTK_USE_RENDERING)
-
-#-----------------------------------------------------------------------------
-# Include CMake code common to all kits.
-INCLUDE(${VTK_CMAKE_DIR}/KitCommonBlock.cmake)
-#-----------------------------------------------------------------------------
-
-# Generate "vtkSocketCommunicatorHash.h".
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${VTK_BINARY_DIR}/Parallel/vtkSocketCommunicatorHash.h
-  DEPENDS ${VTK_SOURCE_DIR}/Parallel/vtkSocketCommunicator.cxx
-          vtkHashSource
-  COMMAND vtkHashSource
-    ${VTK_SOURCE_DIR}/Parallel/vtkSocketCommunicator.cxx
-    vtkSocketCommunicatorHash vtkSocketCommunicatorHash.h
-  )
-
-IF (VTK_USE_MPI)
-  IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-    INSTALL(FILES
-      ${CMAKE_CURRENT_SOURCE_DIR}/vtkMPI.h
-      DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}
-      COMPONENT Development
-      )
-  ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-ENDIF (VTK_USE_MPI)
-
-IF (VTK_USE_PARALLEL_BGL)
-  IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-    INSTALL(FILES
-      ${CMAKE_CURRENT_SOURCE_DIR}/vtkPBGLGraphAdapter.h
-      DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}
-      COMPONENT Development
-      )
-  ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-ENDIF (VTK_USE_PARALLEL_BGL)
diff --git a/Parallel/Testing/CMakeLists.txt b/Parallel/Testing/CMakeLists.txt
deleted file mode 100644
index 09288e47ff9753a287468c73dab1fa9b2af142f6..0000000000000000000000000000000000000000
--- a/Parallel/Testing/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-ADD_SUBDIRECTORY(Cxx)
-IF (VTK_WRAP_TCL)
-  ADD_SUBDIRECTORY(Tcl)
-ENDIF (VTK_WRAP_TCL)
-
-IF (VTK_WRAP_PYTHON)
-  ADD_SUBDIRECTORY(Python)
-ENDIF (VTK_WRAP_PYTHON)
-
-IF(PYTHON_EXECUTABLE)
-  ADD_TEST(HeaderTesting-Parallel ${PYTHON_EXECUTABLE}
-    ${VTK_SOURCE_DIR}/Common/Testing/HeaderTesting.py
-    "${VTK_SOURCE_DIR}/Parallel"
-    VTK_PARALLEL_EXPORT
-    vtkBlockDistribution.h
-    vtkMPI.h
-    vtkPBGLGraphAdapter.h
-    vtkMultiProcessStream.h 
-    )
-ENDIF(PYTHON_EXECUTABLE)
diff --git a/Parallel/Testing/Cxx/CMakeLists.txt b/Parallel/Testing/Cxx/CMakeLists.txt
deleted file mode 100644
index 6e0e1d1214a21f6474025774075ef2a3b76c4eb5..0000000000000000000000000000000000000000
--- a/Parallel/Testing/Cxx/CMakeLists.txt
+++ /dev/null
@@ -1,505 +0,0 @@
-IF(VTK_USE_DISPLAY AND VTK_USE_RENDERING)
-  SET(KIT Parallel)
-  # add tests that do not require data
-  SET(MyTests
-    DummyController.cxx
-    TestFieldDataSerialization.cxx
-    TestTemporalCacheTemporal.cxx
-    TestTemporalCacheSimple.cxx
-    )
-  IF (VTK_DATA_ROOT)
-    # add tests that require data
-    SET(MyTests ${MyTests}
-      PrmMagnify.cxx
-      TestTemporalFractal.cxx
-      )
-
-    # VS6 builds do not handle out-of-range double assignment to float
-    # properly. Do not run TestMultiBlockExodusWrite on VS6 builds.
-    #
-    IF(NOT CMAKE_GENERATOR MATCHES "Visual Studio 6")
-      SET(MyTests ${MyTests}
-        TestMultiBlockExodusWrite.cxx
-        )
-    ENDIF(NOT CMAKE_GENERATOR MATCHES "Visual Studio 6")
-  ENDIF (VTK_DATA_ROOT)
-  IF (VTK_LARGE_DATA_ROOT)
-    # add tests that require data
-    SET(MyTests ${MyTests}
-      TestWindBladeReader.cxx
-      )
-  ENDIF (VTK_LARGE_DATA_ROOT)
-  CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx ${MyTests}
-                         EXTRA_INCLUDE vtkTestDriver.h)
-  ADD_EXECUTABLE(${KIT}CxxTests ${Tests} ExerciseMultiProcessController.cxx)
-  TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkRendering vtkIO vtkParallel vtkHybrid)
-  SET (TestsToRun ${Tests})
-  REMOVE (TestsToRun ${KIT}CxxTests.cxx TestWindBladeReader.cxx)
-
-  # Add all the standard tests
-  FOREACH (test ${TestsToRun})
-    GET_FILENAME_COMPONENT(TName ${test} NAME_WE)
-    IF (VTK_DATA_ROOT)
-      ADD_TEST(${TName} ${CXX_TEST_PATH}/${KIT}CxxTests ${TName}
-          -D ${VTK_DATA_ROOT}
-          -T ${VTK_BINARY_DIR}/Testing/Temporary
-          -V Baseline/${KIT}/${TName}.png)
-    ELSE (VTK_DATA_ROOT)
-      ADD_TEST(${TName} ${CXX_TEST_PATH}/${KIT}CxxTests ${TName}) 
-    ENDIF (VTK_DATA_ROOT)
-  ENDFOREACH (test) 
-
-  # The following tests are launched special because they use MPI or
-  # have sockets.
-
-  IF(HAVE_SOCKETS)
-    ADD_EXECUTABLE(SocketServer
-      SocketServer.cxx ExerciseMultiProcessController.cxx)
-    ADD_EXECUTABLE(SocketClient
-      SocketClient.cxx ExerciseMultiProcessController.cxx)
-    TARGET_LINK_LIBRARIES(SocketClient vtkParallel)
-    TARGET_LINK_LIBRARIES(SocketServer vtkParallel)
-  ENDIF(HAVE_SOCKETS)
-
-  IF (VTK_USE_MPI)
-    INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
-    IF (MPI_LIBRARY) 
-      SET(MPI_LIBRARIES ${MPI_LIBRARY})   
-    ENDIF (MPI_LIBRARY)   
-    IF (MPI_EXTRA_LIBRARY)   
-      SET(MPI_LIBRARIES ${MPI_LIBRARIES} "${MPI_EXTRA_LIBRARY}")   
-    ENDIF (MPI_EXTRA_LIBRARY) 
-    ADD_EXECUTABLE(ParallelIsoTest ParallelIso.cxx)
-    TARGET_LINK_LIBRARIES(ParallelIsoTest vtkVolumeRendering vtkParallel vtkHybrid vtkWidgets ${MPI_LIBRARIES})
-
-    ADD_EXECUTABLE(TestAMRUtilities TestAMRUtilities.cxx)
-    TARGET_LINK_LIBRARIES(TestAMRUtilities vtkParallel ${MPI_LIBRARIES} )
-    ADD_EXECUTABLE(TestNonBlockingCommunication
-                   TestNonBlockingCommunication.cxx)
-    TARGET_LINK_LIBRARIES(TestNonBlockingCommunication
-                          vtkCommon
-                          vtkParallel
-                          ${MPI_LIBRARIES})
-                          
-    ADD_EXECUTABLE(TestPStructuredGridConnectivity 
-                   TestPStructuredGridConnectivity.cxx)
-    TARGET_LINK_LIBRARIES(TestPStructuredGridConnectivity
-                          vtkCommon 
-                          vtkParallel 
-                          ${MPI_LIBRARIES})
-                          
-    ADD_EXECUTABLE(TestPUniformGridGhostDataGenerator
-                   TestPUniformGridGhostDataGenerator.cxx)
-    TARGET_LINK_LIBRARIES(TestPUniformGridGhostDataGenerator
-                          vtkCommon
-                          vtkParallel
-                          ${MPI_LIBRARIES})
-                          
-    ADD_EXECUTABLE(TestPStructuredGridGhostDataGenerator
-                   TestPStructuredGridGhostDataGenerator.cxx)
-    TARGET_LINK_LIBRARIES(TestPStructuredGridGhostDataGenerator
-                          vtkCommon
-                          vtkParallel
-                          ${MPI_LIBRARIES})
-    
-    ADD_EXECUTABLE(TestMPIController MPIController.cxx
-      ExerciseMultiProcessController.cxx)
-    TARGET_LINK_LIBRARIES(TestMPIController vtkParallel ${MPI_LIBRARIES})
-
-    ADD_EXECUTABLE(GenericCommunicator GenericCommunicator.cxx)
-    TARGET_LINK_LIBRARIES(GenericCommunicator vtkParallel ${MPI_LIBRARIES})
-
-    ADD_EXECUTABLE(TestPStream TestPStream.cxx)
-    TARGET_LINK_LIBRARIES(TestPStream vtkParallel)
-
-    ADD_EXECUTABLE(DistributedData DistributedData.cxx)
-    TARGET_LINK_LIBRARIES(DistributedData vtkParallel)
-
-    ADD_EXECUTABLE(DistributedDataRenderPass DistributedDataRenderPass.cxx)
-    TARGET_LINK_LIBRARIES(DistributedDataRenderPass vtkParallel)
-
-    ADD_EXECUTABLE(TransmitImageData TransmitImageData.cxx)
-    TARGET_LINK_LIBRARIES(TransmitImageData vtkParallel ${MPI_LIBRARIES})
-
-    ADD_EXECUTABLE(TestProcess TestProcess.cxx)
-    TARGET_LINK_LIBRARIES(TestProcess vtkParallel ${MPI_LIBRARIES})
-
-    ADD_EXECUTABLE(TransmitImageDataRenderPass TransmitImageDataRenderPass.cxx)
-    TARGET_LINK_LIBRARIES(TransmitImageDataRenderPass vtkParallel ${MPI_LIBRARIES})
-
-    ADD_EXECUTABLE(TestPShadowMapPass TestPShadowMapPass.cxx)
-    TARGET_LINK_LIBRARIES(TestPShadowMapPass vtkParallel ${MPI_LIBRARIES})
-
-    ADD_EXECUTABLE(TestDistributedDataShadowMapPass TestDistributedDataShadowMapPass.cxx)
-    TARGET_LINK_LIBRARIES(TestDistributedDataShadowMapPass vtkParallel ${MPI_LIBRARIES})
-
-    ADD_EXECUTABLE(TestPCompositeZPass TestPCompositeZPass.cxx)
-    TARGET_LINK_LIBRARIES(TestPCompositeZPass vtkParallel ${MPI_LIBRARIES})
-
-    ADD_EXECUTABLE(TestDistributedDataCompositeZPass TestDistributedDataCompositeZPass.cxx)
-    TARGET_LINK_LIBRARIES(TestDistributedDataCompositeZPass vtkParallel ${MPI_LIBRARIES})
-
-    ADD_EXECUTABLE(TransmitRectilinearGrid TransmitRectilinearGrid.cxx)
-    TARGET_LINK_LIBRARIES(TransmitRectilinearGrid vtkParallel ${MPI_LIBRARIES})
-
-    ADD_EXECUTABLE(TransmitStructuredGrid TransmitStructuredGrid.cxx)
-    TARGET_LINK_LIBRARIES(TransmitStructuredGrid vtkParallel ${MPI_LIBRARIES})
-
-    ADD_EXECUTABLE(PLSDynaReader PLSDynaReader.cxx)
-    TARGET_LINK_LIBRARIES(PLSDynaReader vtkParallel)
-
-    ADD_EXECUTABLE(PSLACReaderLinear PSLACReaderLinear.cxx)
-    TARGET_LINK_LIBRARIES(PSLACReaderLinear vtkParallel)
-
-    ADD_EXECUTABLE(PSLACReaderQuadratic PSLACReaderQuadratic.cxx)
-    TARGET_LINK_LIBRARIES(PSLACReaderQuadratic vtkParallel)
-
-    ADD_EXECUTABLE(TestParallelRendering TestParallelRendering.cxx)
-    TARGET_LINK_LIBRARIES(TestParallelRendering vtkParallel ${MPI_LIBRARIES})
-
-    ADD_EXECUTABLE(TestClientServerRendering TestClientServerRendering.cxx)
-    TARGET_LINK_LIBRARIES(TestClientServerRendering vtkParallel ${MPI_LIBRARIES})
-
-    IF (VTK_MPIRUN_EXE)
-      ADD_TEST(MPIController
-        ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} 
-        ${VTK_MPI_NUMPROC_FLAG} ${VTK_MPI_MAX_NUMPROCS}
-        ${VTK_MPI_PREFLAGS}
-        ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TestMPIController
-        ${VTK_MPI_POSTFLAGS}
-        )
-        
-      ADD_TEST(TestProcess
-            ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
-            ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TestProcess
-            ${VTK_MPI_POSTFLAGS})
-            
-      ADD_TEST(TestAMRUtilities
-            ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
-            ${CXX_TEST_PATH}/TestAMRUtilities
-            ${VTK_MPI_POSTFLAGS} )
-      
-      ADD_TEST(PStructuredGridConnectivity 
-        ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} 
-        ${VTK_MPI_NUMPROC_FLAG} ${VTK_MPI_MAX_NUMPROCS}
-        ${VTK_MPI_PREFLAGS}
-        ${CXX_TEST_PATH}/${CXX_TEST_CONFIG}/TestPStructuredGridConnectivity
-        ${VTK_MPI_POSTFLAGS}
-        )
-
-     ADD_TEST(PUniformGridGhostDataGenerator
-        ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} 
-        ${VTK_MPI_NUMPROC_FLAG} ${VTK_MPI_MAX_NUMPROCS}
-        ${VTK_MPI_PREFLAGS}
-        ${CXX_TEST_PATH}/${CXX_TEST_CONFIG}/TestPUniformGridGhostDataGenerator
-        ${VTK_MPI_POSTFLAGS}
-        )
-        
-    ADD_TEST(PStructuredGridGhostDataGenerator
-        ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} 
-        ${VTK_MPI_NUMPROC_FLAG} ${VTK_MPI_MAX_NUMPROCS}
-        ${VTK_MPI_PREFLAGS}
-        ${CXX_TEST_PATH}/${CXX_TEST_CONFIG}/TestPStructuredGridGhostDataGenerator
-        ${VTK_MPI_POSTFLAGS}
-        )
-    ENDIF (VTK_MPIRUN_EXE)
-
-    # This definition looks wrong in multiple respects:
-    # 1. It's called an image test, but it does not actually compare an image.
-    # 2. It uses VTK_MPIRUN_EXE, but is not wrapped in a IF (VTK_MPIRUN_EXE)
-    #    block.
-    # 3. It is duplicated by the TestCommunicator test (when VTK_DATA_ROOT is
-    #    not defined).
-    # Since the functionality and more is tested by the MPIController test,
-    # I vote we just get rid of it altogether.
-    ADD_TEST(GenericCommunicator-image 
-      ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS} 
-      ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/GenericCommunicator
-      ${VTK_MPI_POSTFLAGS})
-
-    IF (VTK_USE_PARALLEL_BGL)
-      # Add tests using the Parallel BGL
-      ADD_EXECUTABLE(PBGLRandomGraph PBGLRandomGraph.cxx)
-      TARGET_LINK_LIBRARIES(PBGLRandomGraph vtkParallel ${Boost_LIBRARIES} ${MPI_LIBRARIES})
-
-      ADD_EXECUTABLE(PBGLNamedVertexGraph PBGLNamedVertexGraph.cxx)
-      TARGET_LINK_LIBRARIES(PBGLNamedVertexGraph vtkParallel ${Boost_LIBRARIES} ${MPI_LIBRARIES})
-
-      ADD_EXECUTABLE(TestPBGLGraphSQLReader TestPBGLGraphSQLReader.cxx)
-      TARGET_LINK_LIBRARIES(TestPBGLGraphSQLReader vtkParallel ${Boost_LIBRARIES} ${MPI_LIBRARIES})
-
-      ADD_EXECUTABLE(TestPBGLGraphSQLReaderFile TestPBGLGraphSQLReaderFile.cxx)
-      TARGET_LINK_LIBRARIES(TestPBGLGraphSQLReaderFile vtkParallel ${Boost_LIBRARIES} ${MPI_LIBRARIES})
-      
-      ADD_TEST(PBGLRandomGraph
-        ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} ${VTK_MPI_MAX_NUMPROCS} 
-        ${VTK_MPI_PREFLAGS} 
-        ${CXX_TEST_PATH}/PBGLRandomGraph
-        ${VTK_MPI_POSTFLAGS})
-
-      ADD_TEST(PBGLNamedVertexGraph
-        ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} ${VTK_MPI_MAX_NUMPROCS} 
-        ${VTK_MPI_PREFLAGS} 
-        ${CXX_TEST_PATH}/PBGLNamedVertexGraph
-        ${VTK_MPI_POSTFLAGS})
-
-      ADD_TEST(TestPBGLGraphSQLReader
-        ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} ${VTK_MPI_MAX_NUMPROCS}
-        ${VTK_MPI_PREFLAGS} 
-        ${CXX_TEST_PATH}/TestPBGLGraphSQLReader
-        ${VTK_MPI_POSTFLAGS})
-
-      ADD_TEST(TestPBGLGraphSQLReaderFile
-        ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} ${VTK_MPI_MAX_NUMPROCS}
-        ${VTK_MPI_PREFLAGS} 
-        ${CXX_TEST_PATH}/TestPBGLGraphSQLReaderFile
-        -D ${VTK_DATA_ROOT}
-        ${VTK_MPI_POSTFLAGS})
-
-      ADD_EXECUTABLE(TestPRandomGraphSource TestPRandomGraphSource.cxx)
-      TARGET_LINK_LIBRARIES(TestPRandomGraphSource
-        vtkParallel ${Boost_LIBRARIES} ${MPI_LIBRARIES})
-
-      ADD_TEST(TestPRandomGraphSource
-        ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} ${VTK_MPI_MAX_NUMPROCS}
-        ${VTK_MPI_PREFLAGS} 
-        ${CXX_TEST_PATH}/TestPRandomGraphSource
-        ${VTK_MPI_POSTFLAGS})
-
-      ADD_EXECUTABLE(TestPRMATGraphSource TestPRMATGraphSource.cxx)
-      TARGET_LINK_LIBRARIES(TestPRMATGraphSource
-        vtkParallel ${Boost_LIBRARIES} ${MPI_LIBRARIES})
-     
-      ADD_TEST(TestPRMATGraphSource
-        ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} ${VTK_MPI_MAX_NUMPROCS}
-        ${VTK_MPI_PREFLAGS} 
-        ${CXX_TEST_PATH}/TestPRMATGraphSource
-        ${VTK_MPI_POSTFLAGS})
-
-      ADD_EXECUTABLE(TestPBGLCollapseGraph TestPBGLCollapseGraph.cxx)
-      TARGET_LINK_LIBRARIES(TestPBGLCollapseGraph
-        vtkParallel ${Boost_LIBRARIES} ${MPI_LIBRARIES})
-      
-      ADD_TEST(TestPBGLCollapseGraph
-        ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} ${VTK_MPI_MAX_NUMPROCS}
-        ${VTK_MPI_PREFLAGS} 
-        ${CXX_TEST_PATH}/TestPBGLCollapseGraph
-        ${VTK_MPI_POSTFLAGS})
-
-      ADD_EXECUTABLE(TestPBGLCollectGraph TestPBGLCollectGraph.cxx)
-      TARGET_LINK_LIBRARIES(TestPBGLCollectGraph
-        vtkParallel ${Boost_LIBRARIES} ${MPI_LIBRARIES})
-      
-      ADD_TEST(TestPBGLCollectGraph
-        ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} ${VTK_MPI_MAX_NUMPROCS}
-        ${VTK_MPI_PREFLAGS} 
-        ${CXX_TEST_PATH}/TestPBGLCollectGraph
-        ${VTK_MPI_POSTFLAGS})
-
-      ADD_EXECUTABLE(TestPBGLPipeline TestPBGLPipeline.cxx)
-      TARGET_LINK_LIBRARIES(TestPBGLPipeline
-        vtkParallel vtkViews ${Boost_LIBRARIES} ${MPI_LIBRARIES})
-      
-      ADD_TEST(TestPBGLPipeline
-        ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} ${VTK_MPI_MAX_NUMPROCS}
-        ${VTK_MPI_PREFLAGS} 
-        ${CXX_TEST_PATH}/TestPBGLPipeline
-        ${VTK_MPI_POSTFLAGS})
-        
-      ADD_EXECUTABLE(TestPBGLPedigrees TestPBGLPedigrees.cxx)
-      TARGET_LINK_LIBRARIES(TestPBGLPedigrees
-        vtkParallel vtkViews ${Boost_LIBRARIES} ${MPI_LIBRARIES})
-        
-      ADD_TEST(TestPBGLPedigrees
-        ${VTK_MPIRUN_EXE} ${VTK_MPI_NUMPROC_FLAG} ${VTK_MPI_MAX_NUMPROCS}
-        ${VTK_MPI_PREFLAGS} 
-        ${CXX_TEST_PATH}/TestPBGLPedigrees
-        ${VTK_MPI_POSTFLAGS})
-        
-      ADD_EXECUTABLE(TestPBGLEdgesPedigrees TestPBGLEdgesPedigrees.cxx)
-      TARGET_LINK_LIBRARIES(TestPBGLEdgesPedigrees
-        vtkParallel vtkViews ${Boost_LIBRARIES} ${MPI_LIBRARIES})
-        
-      ADD_TEST(TestPBGLEdgesPedigrees
-        ${VTK_MPIRUN_EXE} ${VTK_MPI_NUMPROC_FLAG} ${VTK_MPI_MAX_NUMPROCS}
-        ${VTK_MPI_PREFLAGS} 
-        ${CXX_TEST_PATH}/TestPBGLEdgesPedigrees
-        ${VTK_MPI_POSTFLAGS})
-        
-    ENDIF (VTK_USE_PARALLEL_BGL)
-
-    #
-    # Add tests, with the data
-    #
-
-    IF (VTK_DATA_ROOT)
-      IF (VTK_MPIRUN_EXE)
-        IF(VTK_MPI_MAX_NUMPROCS GREATER 1)
-          ADD_TEST(ParallelIso-image 
-            ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS} 
-            ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/ParallelIsoTest
-            -D ${VTK_DATA_ROOT}
-            -T ${VTK_BINARY_DIR}/Testing/Temporary
-            -V Baseline/Parallel/ParallelIso.cxx.png
-            ${VTK_MPI_POSTFLAGS})
-          ADD_TEST(TestPStream-image 
-            ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS} 
-            ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TestPStream
-            -D ${VTK_DATA_ROOT}
-            -T ${VTK_BINARY_DIR}/Testing/Temporary
-            -V Baseline/Parallel/TestPStream.cxx.png
-            ${VTK_MPI_POSTFLAGS})
-          ADD_TEST(DistributedData-image
-            ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
-            ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/DistributedData
-            -D ${VTK_DATA_ROOT}
-            -T ${VTK_BINARY_DIR}/Testing/Temporary
-            -V Baseline/Parallel/DistributedData.cxx.png
-            ${VTK_MPI_POSTFLAGS})
-          ADD_TEST(DistributedDataRenderPass-image
-            ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
-            ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/DistributedDataRenderPass
-            -D ${VTK_DATA_ROOT}
-            -T ${VTK_BINARY_DIR}/Testing/Temporary
-            -V Baseline/Parallel/DistributedDataRenderPass.cxx.png
-            ${VTK_MPI_POSTFLAGS})
-          ADD_TEST(TransmitImageData-image
-            ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
-            ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TransmitImageData
-            -D ${VTK_DATA_ROOT}
-            -T ${VTK_BINARY_DIR}/Testing/Temporary
-            -V Baseline/Parallel/TransmitImageData.cxx.png
-            ${VTK_MPI_POSTFLAGS})
-          ADD_TEST(TransmitImageDataRenderPass-image
-            ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
-            ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TransmitImageDataRenderPass
-            -D ${VTK_DATA_ROOT}
-            -T ${VTK_BINARY_DIR}/Testing/Temporary
-            -V Baseline/Parallel/TransmitImageDataRenderPass.cxx.png
-            ${VTK_MPI_POSTFLAGS})
-          ADD_TEST(TestPShadowMapPass-image
-            ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
-            ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TestPShadowMapPass
-            -D ${VTK_DATA_ROOT}
-            -T ${VTK_BINARY_DIR}/Testing/Temporary
-            -V Baseline/Parallel/TestPShadowMapPass.cxx.png
-            ${VTK_MPI_POSTFLAGS})
-          ADD_TEST(TestDistributedDataShadowMapPass-image
-            ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
-            ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TestDistributedDataShadowMapPass
-            -D ${VTK_DATA_ROOT}
-            -T ${VTK_BINARY_DIR}/Testing/Temporary
-            -V Baseline/Parallel/TestDistributedDataShadowMapPass.cxx.png
-            ${VTK_MPI_POSTFLAGS})
-
-          ADD_TEST(TestPCompositeZPass-image
-            ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
-            ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TestPCompositeZPass
-            -D ${VTK_DATA_ROOT}
-            -T ${VTK_BINARY_DIR}/Testing/Temporary
-            -V Baseline/Parallel/TestPCompositeZPass.cxx.png
-            ${VTK_MPI_POSTFLAGS})
-
-          ADD_TEST(TestDistributedDataCompositeZPass-image
-            ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
-            ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TestDistributedDataCompositeZPass
-            -D ${VTK_DATA_ROOT}
-            -T ${VTK_BINARY_DIR}/Testing/Temporary
-            -V Baseline/Parallel/TestDistributedDataCompositeZPass.cxx.png
-            ${VTK_MPI_POSTFLAGS})
-
-          ADD_TEST(TransmitRectilinearGrid-image
-            ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
-            ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TransmitRectilinearGrid
-            -D ${VTK_DATA_ROOT}
-            -T ${VTK_BINARY_DIR}/Testing/Temporary
-            -V Baseline/Parallel/TransmitRectilinearGrid.cxx.png
-            ${VTK_MPI_POSTFLAGS})
-          ADD_TEST(TransmitStructuredGrid-image
-            ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
-            ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TransmitStructuredGrid
-            -D ${VTK_DATA_ROOT}
-            -T ${VTK_BINARY_DIR}/Testing/Tempor2ary
-            -V Baseline/Parallel/TransmitStructuredGrid.cxx.png
-            ${VTK_MPI_POSTFLAGS})
-        ENDIF(VTK_MPI_MAX_NUMPROCS GREATER 1)
-
-        IF(VTK_MPI_MAX_NUMPROCS GREATER 6)
-          ADD_TEST(ParallelIso-7proc-image 
-            ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 7 ${VTK_MPI_PREFLAGS} 
-            ${CXX_TEST_PATH}/ParallelIsoTest
-            -D ${VTK_DATA_ROOT}
-            -T ${VTK_BINARY_DIR}/Testing/Temporary
-            -V Baseline/Parallel/ParallelIso.7proc.png
-            ${VTK_MPI_POSTFLAGS})
-        ENDIF(VTK_MPI_MAX_NUMPROCS GREATER 6)
-
-      ENDIF (VTK_MPIRUN_EXE)
-      #
-      # If we do not have the data, still run the tests that we can
-      #
-    ELSE (VTK_DATA_ROOT)
-        IF (VTK_MPIRUN_EXE)
-          ADD_TEST(TestCommunicator 
-            ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS} 
-            ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/GenericCommunicator ${VTK_MPI_POSTFLAGS})
-        ENDIF(VTK_MPIRUN_EXE)
-    ENDIF (VTK_DATA_ROOT)
-    IF (VTK_LARGE_DATA_ROOT)
-      IF (VTK_MPIRUN_EXE)
-        ADD_TEST(PLSDynaReader
-          ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
-          ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/PLSDynaReader
-          -D ${VTK_LARGE_DATA_ROOT}
-          -T ${VTK_BINARY_DIR}/Testing/Temporary
-          -V ${VTK_LARGE_DATA_ROOT}/Baseline/Parallel/PLSDynaReader.png
-          ${VTK_MPI_POSTFLAGS})
-        ADD_TEST(PSLACReaderLinear
-          ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
-          ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/PSLACReaderLinear
-          -D ${VTK_LARGE_DATA_ROOT}
-          -T ${VTK_BINARY_DIR}/Testing/Temporary
-          -V ${VTK_LARGE_DATA_ROOT}/Baseline/Parallel/PSLACReaderLinear.png
-          ${VTK_MPI_POSTFLAGS})
-        ADD_TEST(PSLACReaderQuadratic
-          ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
-          ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/PSLACReaderQuadratic
-          -D ${VTK_LARGE_DATA_ROOT}
-          -T ${VTK_BINARY_DIR}/Testing/Temporary
-          -V ${VTK_LARGE_DATA_ROOT}/Baseline/Parallel/PSLACReaderQuadratic.png
-          ${VTK_MPI_POSTFLAGS})
-      ENDIF (VTK_MPIRUN_EXE)
-    ENDIF (VTK_LARGE_DATA_ROOT)
-  ENDIF (VTK_USE_MPI)
-
-  IF (VTK_LARGE_DATA_ROOT)
-    ADD_TEST(TestWindBladeReader ${CXX_TEST_PATH}/${KIT}CxxTests
-      TestWindBladeReader -D ${VTK_LARGE_DATA_ROOT}
-      -T ${VTK_BINARY_DIR}/Testing/Temporary
-      -V ${VTK_LARGE_DATA_ROOT}/Baseline/${KIT}/TestWindBladeReader.png)
-  ENDIF (VTK_LARGE_DATA_ROOT)
-
-  # For now this test is only available on Unix because
-  # on Windows, python does not support forking/killing processes
-  IF (UNIX  AND  PYTHON_EXECUTABLE  AND  VTK_DATA_ROOT  AND  HAVE_SOCKETS)
-    SET(dir "${EXECUTABLE_OUTPUT_PATH}")
-
-    # Allow this test to work from Xcode dashboards driven with ctest -C:
-    #
-    IF(CMAKE_CONFIGURATION_TYPES)
-      IF(NOT "$ENV{CMAKE_CONFIG_TYPE}" STREQUAL "")
-        SET(dir "${dir}/$ENV{CMAKE_CONFIG_TYPE}")
-      ELSE(NOT "$ENV{CMAKE_CONFIG_TYPE}" STREQUAL "")
-        SET(dir "${dir}/Release")
-      ENDIF(NOT "$ENV{CMAKE_CONFIG_TYPE}" STREQUAL "")
-    ENDIF(CMAKE_CONFIGURATION_TYPES)
-
-    ADD_TEST(Sockets-image ${PYTHON_EXECUTABLE}
-      ${VTK_SOURCE_DIR}/Parallel/Testing/Cxx/TestSockets.py 
-      ${dir}/SocketServer
-      ${dir}/SocketClient
-      ${VTK_DATA_ROOT}
-      Baseline/Parallel/SocketClient.cxx.png
-      ${VTK_BINARY_DIR}/Testing/Temporary)
-  ENDIF (UNIX  AND  PYTHON_EXECUTABLE  AND  VTK_DATA_ROOT  AND  HAVE_SOCKETS)
-ENDIF(VTK_USE_DISPLAY AND VTK_USE_RENDERING)
diff --git a/Parallel/Testing/Python/CMakeLists.txt b/Parallel/Testing/Python/CMakeLists.txt
deleted file mode 100644
index 6ae54574c6614ee45e10d1d3c0c59a1bbd288bfb..0000000000000000000000000000000000000000
--- a/Parallel/Testing/Python/CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Add tests
-#
-INCLUDE(${VTK_SOURCE_DIR}/Utilities/vtkTclTest2Py/vtkConvertTclTestToPy.cmake)
-
-IF (VTK_PYTHON_EXE AND VTK_USE_DISPLAY)
-  # Add tests converted from Tcl
-  SET (tests)
-  IF (VTK_DATA_ROOT)
-    SET( tests ${tests}
-      RectOutline
-      TestExtractVOI
-      TestExtractCTHPart
-      TestExtrudePiece
-      TestPolyDataPieces
-      TestUnstructuredPieces
-      TestImageStreamer
-      TestPImageWriter
-      TestCutMaterial
-      TestPDataSetReaderGrid
-      )
-  ELSE (VTK_DATA_ROOT)
-      # All Parallel tests require VTKData - no tests should be in this block...
-  ENDIF (VTK_DATA_ROOT)
-
-  CONVERT_TCL_TEST_TO_PY (
-    tests
-    Parallel)
-ENDIF (VTK_PYTHON_EXE AND VTK_USE_DISPLAY)
diff --git a/Parallel/Testing/Tcl/CMakeLists.txt b/Parallel/Testing/Tcl/CMakeLists.txt
deleted file mode 100644
index 2de9a57af115b1a5e5343d2fe3d77ba2eb160b5e..0000000000000000000000000000000000000000
--- a/Parallel/Testing/Tcl/CMakeLists.txt
+++ /dev/null
@@ -1,98 +0,0 @@
-IF (VTK_USE_DISPLAY)
-IF (VTK_DATA_ROOT)
-  ADD_TEST(RectOutline-image ${VTK_EXECUTABLE}
-           ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl
-           ${VTK_SOURCE_DIR}/Parallel/Testing/Tcl/RectOutline.tcl
-           -D ${VTK_DATA_ROOT}
-           -T ${VTK_BINARY_DIR}/Testing/Temporary
-           -V Baseline/Parallel/RectOutline.png
-           -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-  ADD_TEST(ExtractVOI-image ${VTK_EXECUTABLE}
-           ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-           ${VTK_SOURCE_DIR}/Parallel/Testing/Tcl/TestExtractVOI.tcl
-           -D ${VTK_DATA_ROOT}
-           -T ${VTK_BINARY_DIR}/Testing/Temporary
-           -V Baseline/Parallel/TestExtractVOI.png
-           -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-  ADD_TEST(TestExtractCTHPart ${VTK_EXECUTABLE}
-           ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl
-           ${VTK_SOURCE_DIR}/Parallel/Testing/Tcl/TestExtractCTHPart.tcl
-           -D ${VTK_DATA_ROOT}
-           -T ${VTK_BINARY_DIR}/Testing/Temporary
-           -V Baseline/Parallel/TestExtractCTHPart.png
-           -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-  ADD_TEST(ExtrudePiece-image ${VTK_EXECUTABLE}
-           ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-           ${VTK_SOURCE_DIR}/Parallel/Testing/Tcl/TestExtrudePiece.tcl
-           -D ${VTK_DATA_ROOT}
-           -T ${VTK_BINARY_DIR}/Testing/Temporary
-           -V Baseline/Parallel/TestExtrudePiece.png
-           -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-  ADD_TEST(PolyDataPieces-image ${VTK_EXECUTABLE}
-           ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-           ${VTK_SOURCE_DIR}/Parallel/Testing/Tcl/TestPolyDataPieces.tcl
-           -D ${VTK_DATA_ROOT}
-           -T ${VTK_BINARY_DIR}/Testing/Temporary
-           -V Baseline/Parallel/TestPolyDataPieces.png
-           -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-  ADD_TEST(UnstructuredPieces-image ${VTK_EXECUTABLE}
-           ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-           ${VTK_SOURCE_DIR}/Parallel/Testing/Tcl/TestUnstructuredPieces.tcl
-           -D ${VTK_DATA_ROOT}
-           -T ${VTK_BINARY_DIR}/Testing/Temporary
-           -V Baseline/Parallel/TestUnstructuredPieces.png
-           -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-  ADD_TEST(ImageStreamer-image ${VTK_EXECUTABLE}
-           ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-           ${VTK_SOURCE_DIR}/Parallel/Testing/Tcl/TestImageStreamer.tcl
-           -D ${VTK_DATA_ROOT}
-           -T ${VTK_BINARY_DIR}/Testing/Temporary
-           -V Baseline/Parallel/TestImageStreamer.png
-           -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-  ADD_TEST(PImageWriter-image ${VTK_EXECUTABLE}
-           ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-           ${VTK_SOURCE_DIR}/Parallel/Testing/Tcl/TestPImageWriter.tcl
-           -D ${VTK_DATA_ROOT}
-           -T ${VTK_BINARY_DIR}/Testing/Temporary
-           -V Baseline/Parallel/TestPImageWriter.png
-           -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-  ADD_TEST(CutMaterial-image ${VTK_EXECUTABLE}
-           ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-           ${VTK_SOURCE_DIR}/Parallel/Testing/Tcl/TestCutMaterial.tcl
-           -D ${VTK_DATA_ROOT}
-           -T ${VTK_BINARY_DIR}/Testing/Temporary
-           -V Baseline/Parallel/TestCutMaterial.png
-           -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-  ADD_TEST(PDataSetReaderGrid-image ${VTK_EXECUTABLE}
-           ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl
-           ${VTK_SOURCE_DIR}/Parallel/Testing/Tcl/TestPDataSetReaderGrid.tcl
-           -D ${VTK_DATA_ROOT}
-           -T ${VTK_BINARY_DIR}/Testing/Temporary
-           -V Baseline/Parallel/TestPDataSetReaderGrid.png
-           -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-  IF(PVTK_EXECUTABLE AND VTK_MPIRUN_EXE)
-    ADD_TEST(TestPProbe-image 
-      ${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
-             ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/pvtk${CMAKE_EXECUTABLE_SUFFIX}
-             ${VTK_SOURCE_DIR}/Common/Testing/Tcl/prtImageTest.tcl
-             ${VTK_SOURCE_DIR}/Parallel/Testing/Tcl/TestPProbe.tcl
-             -D ${VTK_DATA_ROOT}
-             -T ${VTK_BINARY_DIR}/Testing/Temporary
-             -V Baseline/Parallel/TestPProbe.png
-             -A ${VTK_SOURCE_DIR}/Wrapping/Tcl
-             ${VTK_MPI_POSTFLAGS})
-  ENDIF(PVTK_EXECUTABLE AND VTK_MPIRUN_EXE)
-ELSE (VTK_DATA_ROOT)
-  # All rtImageTest tests require VTKData to pass...
-  # Do not add any rtImageTest based tests in this block.
-ENDIF (VTK_DATA_ROOT)
-ENDIF (VTK_USE_DISPLAY)
-
-ADD_TEST(PrintSelf-Parallel ${TCL_TCLSH}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/PrintSelfCheck.tcl  
-         ${VTK_SOURCE_DIR}/Parallel)
-
-ADD_TEST(TestSetObjectMacro-Parallel ${TCL_TCLSH}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/FindString.tcl
-         "${VTK_SOURCE_DIR}/Parallel/vtk\\\\*.h"
-         "vtkSetObjectMacro")
diff --git a/Parallel/vtkParallelFactory.cxx b/Parallel/vtkParallelFactory.cxx
deleted file mode 100644
index 2d0935daefc84acd49778e5872243989569de628..0000000000000000000000000000000000000000
--- a/Parallel/vtkParallelFactory.cxx
+++ /dev/null
@@ -1,108 +0,0 @@
-/*=========================================================================
-
-  Program:   Visualization Toolkit
-  Module:    vtkParallelFactory.cxx
-
-  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
-  All rights reserved.
-  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
-
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notice for more information.
-
-=========================================================================*/
-
-#include "vtkParallelFactory.h"
-#include "vtkPPolyDataNormals.h"
-#include "vtkPSphereSource.h"
-#include "vtkPOutlineCornerFilter.h"
-#include "vtkPOutlineFilter.h"
-#include "vtkPStreamTracer.h"
-#include "vtkPProbeFilter.h"
-#include "vtkPLinearExtrusionFilter.h"
-#include "vtkVersion.h"
-#ifdef VTK_USE_RENDERING
-#  include "vtkPImageWriter.h"
-#endif // VTK_USE_RENDERING
-
-vtkStandardNewMacro(vtkParallelFactory);
-
-void vtkParallelFactory::PrintSelf(ostream& os, vtkIndent indent)
-{
-  os << indent << "VTK Parallel object factory" << endl;
-}
-
-
-#ifdef VTK_USE_RENDERING
-VTK_CREATE_CREATE_FUNCTION(vtkPImageWriter);
-#endif // VTK_USE_RENDERING
-VTK_CREATE_CREATE_FUNCTION(vtkPPolyDataNormals);
-VTK_CREATE_CREATE_FUNCTION(vtkPSphereSource);
-VTK_CREATE_CREATE_FUNCTION(vtkPStreamTracer);
-VTK_CREATE_CREATE_FUNCTION(vtkPLinearExtrusionFilter);
-VTK_CREATE_CREATE_FUNCTION(vtkPOutlineCornerFilter);
-VTK_CREATE_CREATE_FUNCTION(vtkPOutlineFilter);
-VTK_CREATE_CREATE_FUNCTION(vtkPProbeFilter);
-
-vtkParallelFactory::vtkParallelFactory()
-{
-#ifdef VTK_USE_RENDERING
-  this->RegisterOverride("vtkImageWriter",
-                         "vtkPImageWriter",
-                         "Parallel",
-                         1,
-                         vtkObjectFactoryCreatevtkPImageWriter);
-#endif // VTK_USE_RENDERING
-  this->RegisterOverride("vtkPolyDataNormals",
-                         "vtkPPolyDataNormals",
-                         "Parallel",
-                         1,
-                         vtkObjectFactoryCreatevtkPPolyDataNormals);
-  this->RegisterOverride("vtkSphereSource",
-                         "vtkPSphereSource",
-                         "Parallel",
-                         1,
-                         vtkObjectFactoryCreatevtkPSphereSource);
-  this->RegisterOverride("vtkStreamTracer",
-                         "vtkPStreamTracer",
-                         "Parallel",
-                         1,
-                         vtkObjectFactoryCreatevtkPStreamTracer);
-  this->RegisterOverride("vtkLinearExtrusionFilter",
-                         "vtkPLinearExtrusionFilter",
-                         "Parallel",
-                         1,
-                         vtkObjectFactoryCreatevtkPLinearExtrusionFilter);
-  this->RegisterOverride("vtkOutlineCornerFilter",
-                         "vtkPOutlineCornerFilter",
-                         "Parallel",
-                         1,
-                         vtkObjectFactoryCreatevtkPOutlineCornerFilter);
-  this->RegisterOverride("vtkOutlineFilter",
-                         "vtkPOutlineFilter",
-                         "Parallel",
-                         1,
-                         vtkObjectFactoryCreatevtkPOutlineFilter);
-  this->RegisterOverride("vtkProbeFilter",
-                         "vtkPProbeFilter",
-                         "Parallel",
-                         1,
-                         vtkObjectFactoryCreatevtkPProbeFilter);
-}
-
-const char* vtkParallelFactory::GetVTKSourceVersion()
-{
-  return VTK_SOURCE_VERSION;
-}
-
-const char* vtkParallelFactory::GetDescription()
-{
-  return "VTK Parallel Support Factory";
-}
-
-
-extern "C" vtkObjectFactory* vtkLoad()
-{
-  return vtkParallelFactory::New();
-}
diff --git a/Parallel/vtkParallelFactory.h b/Parallel/vtkParallelFactory.h
deleted file mode 100644
index fc652e389c73d60d83154decc7f7b02519db4a1b..0000000000000000000000000000000000000000
--- a/Parallel/vtkParallelFactory.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*=========================================================================
-
-  Program:   Visualization Toolkit
-  Module:    vtkParallelFactory.h
-
-  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
-  All rights reserved.
-  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
-
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notice for more information.
-
-=========================================================================*/
-// .NAME vtkParallelFactory - 
-// .SECTION Description
-
-#ifndef __vtkParallelFactory_h
-#define __vtkParallelFactory_h
-
-#include "vtkObjectFactory.h"
-
-class VTK_PARALLEL_EXPORT vtkParallelFactory : public vtkObjectFactory
-{
-public: 
-// Methods from vtkObject
-  vtkTypeMacro(vtkParallelFactory,vtkObjectFactory);
-  static vtkParallelFactory *New();
-  void PrintSelf(ostream& os, vtkIndent indent);
-  virtual const char* GetVTKSourceVersion();
-  virtual const char* GetDescription();
-protected:
-  vtkParallelFactory();
-  ~vtkParallelFactory() { }
-private:
-  vtkParallelFactory(const vtkParallelFactory&);  // Not implemented.
-  void operator=(const vtkParallelFactory&);  // Not implemented.
-};
-
-extern "C" VTK_PARALLEL_EXPORT vtkObjectFactory* vtkLoad();
-#endif
diff --git a/Rendering/CMakeLists.txt b/Rendering/CMakeLists.txt
deleted file mode 100644
index ce25dedde5ce1867c9547c2843343de37b587cb2..0000000000000000000000000000000000000000
--- a/Rendering/CMakeLists.txt
+++ /dev/null
@@ -1,890 +0,0 @@
-SET(KIT Rendering)
-SET(UKIT RENDERING)
-SET(KIT_TCL_LIBS vtkGraphicsTCL vtkImagingTCL ${VTK_TK_LIBRARIES})
-SET(KIT_PYTHON_LIBS vtkGraphicsPythonD vtkImagingPythonD)
-SET(KIT_JAVA_LIBS vtkGraphicsJava vtkImagingJava)
-
-IF (JAVA_AWT_LIBRARY)
-  SET(KIT_JAVA_LIBS ${KIT_JAVA_LIBS} ${JAVA_AWT_LIBRARY})
-ENDIF (JAVA_AWT_LIBRARY)
-
-SET(KIT_INTERFACE_LIBRARIES vtkGraphics vtkImaging)
-SET(KIT_LIBS vtkIO vtkftgl
-  ${VTK_FREETYPE_LIBRARIES}
-)
-#INCLUDE(${VTK_CMAKE_DIR}/vtkTestGL.cmake)
-#INCLUDE(${VTK_CMAKE_DIR}/vtkTestGLX.cmake)
-
-
-
-
-# Fix for bug#1026 moved out of the common section.  This should be
-# changed to add the flag only in the right places (CMAKE_CXX_FLAGS?).
-IF(APPLE AND VTK_WRAP_JAVA)
-  ADD_DEFINITIONS("-ObjC++")
-ENDIF(APPLE AND VTK_WRAP_JAVA)
-
-SET( Kit_SRCS
-  vtkAbstractMapper3D.cxx
-  vtkAbstractPicker.cxx
-  vtkAbstractPropPicker.cxx
-  vtkAbstractVolumeMapper.cxx
-  vtkActorCollection.cxx
-  vtkActor.cxx
-  vtkAreaPicker.cxx
-  vtkMapArrayValues.cxx
-  vtkAssembly.cxx
-  vtkAxisActor2D.cxx
-  vtkCamera.cxx
-  vtkCameraActor.cxx
-  vtkCameraInterpolator.cxx
-  vtkCellCenterDepthSort.cxx
-  vtkCellPicker.cxx
-  vtkChooserPainter.cxx
-  vtkClipPlanesPainter.cxx
-  vtkCoincidentTopologyResolutionPainter.cxx
-  vtkColorMaterialHelper.cxx
-  vtkCompositePainter.cxx
-  vtkCompositePolyDataMapper2.cxx
-  vtkCompositePolyDataMapper.cxx
-  vtkCullerCollection.cxx
-  vtkCuller.cxx
-  vtkDataSetMapper.cxx
-  vtkDataTransferHelper.cxx
-  vtkDefaultPainter.cxx
-  vtkDisplayListPainter.cxx
-  vtkDistanceToCamera.cxx
-  vtkDynamic2DLabelMapper.cxx
-  vtkDummyGPUInfoList.cxx
-  vtkExporter.cxx
-  vtkFollower.cxx
-  vtkFrameBufferObject.cxx
-  vtkFreeTypeStringToImage.cxx
-  vtkFrustumCoverageCuller.cxx
-  vtkGenericRenderWindowInteractor.cxx
-  vtkGenericVertexAttributeMapping.cxx
-  vtkGlyph3DMapper.cxx
-  vtkGPUInfo.cxx
-  vtkGPUInfoList.cxx
-  vtkGraphicsFactory.cxx
-  vtkGraphMapper.cxx
-  vtkGraphToGlyphs.cxx
-  vtkHardwareSelector.cxx
-  vtkHardwareSelectionPolyDataPainter.cxx
-  vtkHierarchicalPolyDataMapper.cxx
-  vtkImageActor.cxx
-  vtkImageMapper.cxx
-  vtkImageMapper3D.cxx
-  vtkImageProperty.cxx
-  vtkImageResliceMapper.cxx
-  vtkImageSlice.cxx
-  vtkImageSliceCollection.cxx
-  vtkImageSliceMapper.cxx
-  vtkImageStack.cxx
-  vtkImageViewer2.cxx
-  vtkImageViewer.cxx
-  vtkImagingFactory.cxx
-  vtkImporter.cxx
-  vtkInteractorEventRecorder.cxx
-  vtkInteractorObserver.cxx
-  vtkInteractorStyle.cxx
-  vtkInteractorStyleFlight.cxx
-  vtkInteractorStyleImage.cxx
-  vtkInteractorStyleJoystickActor.cxx
-  vtkInteractorStyleJoystickCamera.cxx
-  vtkInteractorStyleRubberBand2D.cxx
-  vtkInteractorStyleRubberBand3D.cxx
-  vtkInteractorStyleRubberBandPick.cxx
-  vtkInteractorStyleRubberBandZoom.cxx
-  vtkInteractorStyleSwitchBase.cxx
-  vtkInteractorStyleSwitch.cxx
-  vtkInteractorStyleTerrain.cxx
-  vtkInteractorStyleTrackballActor.cxx
-  vtkInteractorStyleTrackballCamera.cxx
-  vtkInteractorStyleTrackball.cxx
-  vtkInteractorStyleUnicam.cxx
-  vtkInteractorStyleUser.cxx
-  vtkIVExporter.cxx
-  vtkLabeledDataMapper.cxx
-  vtkLabeledTreeMapDataMapper.cxx
-  vtkLabelHierarchy.cxx
-  vtkLabelHierarchyAlgorithm.cxx
-  vtkLabelHierarchyIterator.cxx
-  vtkLabelHierarchyCompositeIterator.cxx
-  vtkLabelPlacer.cxx
-  vtkLabelPlacementMapper.cxx
-  vtkLabelRenderStrategy.cxx
-  vtkLabelSizeCalculator.cxx
-  vtkLeaderActor2D.cxx
-  vtkLightActor.cxx
-  vtkLightCollection.cxx
-  vtkLight.cxx
-  vtkLightingHelper.cxx
-  vtkLightingPainter.cxx
-  vtkLightKit.cxx
-  vtkLineIntegralConvolution2D.cxx
-  vtkLinesPainter.cxx
-  vtkLODActor.cxx
-  vtkLODProp3D.cxx
-  vtkMapperCollection.cxx
-  vtkMapper.cxx
-  vtkOBJExporter.cxx
-  vtkObserverMediator.cxx
-  vtkOOGLExporter.cxx
-  vtkPainter.cxx
-  vtkPainterDeviceAdapter.cxx
-  vtkPainterPolyDataMapper.cxx
-  vtkParallelCoordinatesActor.cxx
-  vtkParallelCoordinatesInteractorStyle.cxx
-  vtkPicker.cxx
-  vtkPixelBufferObject.cxx
-  vtkPointPicker.cxx
-  vtkPointSetToLabelHierarchy.cxx
-  vtkPointsPainter.cxx
-  vtkPOVExporter.cxx
-  vtkPolyDataMapper2D.cxx
-  vtkPolyDataMapper.cxx
-  vtkPolyDataPainter.cxx
-  vtkPolygonsPainter.cxx
-  vtkPrimitivePainter.cxx
-  vtkProp3DCollection.cxx
-  vtkProp3D.cxx
-  vtkProp3DFollower.cxx
-  vtkProperty.cxx
-  vtkPropPicker.cxx
-  vtkQuadricLODActor.cxx
-  vtkQuaternionInterpolator.cxx
-  vtkRenderedAreaPicker.cxx
-  vtkRendererCollection.cxx
-  vtkRenderer.cxx
-  vtkRendererDelegate.cxx
-  vtkRendererSource.cxx
-  vtkRenderPass.cxx
-  vtkRenderState.cxx
-  vtkRenderWindowCollection.cxx
-  vtkRenderWindow.cxx
-  vtkRenderWindowInteractor.cxx
-  vtkRepresentationPainter.cxx
-  vtkResliceCursorActor.cxx
-  vtkResliceCursorPicker.cxx
-  vtkScalarBarActor.cxx
-  vtkScalarsToColorsPainter.cxx
-  vtkScaledTextActor.cxx
-  vtkScenePicker.cxx
-  vtkSelectVisiblePoints.cxx
-  vtkShader.cxx
-  vtkShaderDeviceAdapter.cxx
-  vtkShaderDeviceAdapter2.cxx
-  vtkShaderProgram.cxx
-  vtkStandardPolyDataPainter.cxx
-  vtkStringToImage.cxx
-  vtkSurfaceLICDefaultPainter.cxx
-  vtkSurfaceLICPainter.cxx
-  vtkTDxInteractorStyle.cxx
-  vtkTDxInteractorStyleCamera.cxx
-  vtkTDxInteractorStyleGeo.cxx
-  vtkTDxInteractorStyleSettings.cxx
-  vtkTesting.cxx
-  vtkTestingInteractor.cxx
-  vtkTestingObjectFactory.cxx
-  # vtkTextActor2D.cxx
-  vtkTextActor3D.cxx
-  vtkTextActor.cxx
-  vtkTextMapper.cxx
-  vtkTextProperty.cxx
-  vtkTexture.cxx
-  vtkTexturedActor2D.cxx
-  vtkTextureObject.cxx
-  vtkTransformInterpolator.cxx
-  vtkTStripsPainter.cxx
-  vtkTupleInterpolator.cxx
-  vtkViewTheme.cxx
-  vtkVisibilitySort.cxx
-  vtkVolumeCollection.cxx
-  vtkVolume.cxx
-  vtkVolumeProperty.cxx
-  vtkVRMLExporter.cxx
-  vtkWindowToImageFilter.cxx
-  vtkWorldPointPicker.cxx
-  )
-
-IF(VTK_USE_GL2PS)
-  SET(Kit_SRCS ${Kit_SRCS} vtkGL2PSExporter.cxx)
-
-  IF(VTK_USE_SYSTEM_GL2PS)
-  ELSE(VTK_USE_SYSTEM_GL2PS)
-    SET(Kit_GL2PS_SRCS ${VTK_SOURCE_DIR}/Utilities/vtkgl2ps/gl2ps.c)
-    ADD_DEFINITIONS(-DGL2PS_HAVE_ZLIB)
-    ADD_DEFINITIONS(-DGL2PS_HAVE_LIBPNG)
-  ENDIF(VTK_USE_SYSTEM_GL2PS)
-ENDIF(VTK_USE_GL2PS)
-
-IF(VTK_USE_CG_SHADERS)
-  SET(Kit_SRCS ${Kit_SRCS}
-    vtkCgShader.cxx
-    vtkCgShaderDeviceAdapter.cxx
-    vtkCgShaderProgram.cxx
-    )
-  INCLUDE_DIRECTORIES(${CG_INCLUDE_PATH})
-  SET (KIT_LIBS ${KIT_LIBS} ${CG_LIBRARY} ${CG_GL_LIBRARY})
-ENDIF(VTK_USE_CG_SHADERS)
-
-
-SET( KitOpenGL_SRCS
-  vtkCameraPass.cxx
-  vtkClearZPass.cxx
-  vtkDefaultPass.cxx
-  vtkDepthPeelingPass.cxx
-  vtkGaussianBlurPass.cxx
-  vtkImageProcessingPass.cxx
-  vtkLightsPass.cxx
-  vtkGLSLShaderDeviceAdapter2.cxx
-  vtkOpaquePass.cxx
-  vtkOpenGLActor.cxx
-  vtkOpenGLCamera.cxx
-  vtkOpenGLClipPlanesPainter.cxx
-  vtkOpenGLCoincidentTopologyResolutionPainter.cxx
-  vtkOpenGLDisplayListPainter.cxx
-  vtkOpenGLExtensionManager.cxx
-  vtkOpenGLGlyph3DMapper.cxx
-  vtkOpenGLHardwareSupport.cxx
-  vtkOpenGLImageMapper.cxx
-  vtkOpenGLImageSliceMapper.cxx
-  vtkOpenGLLight.cxx
-  vtkOpenGLLightingPainter.cxx
-  vtkOpenGLPainterDeviceAdapter.cxx
-  vtkOpenGLPolyDataMapper.cxx
-  vtkOpenGLPolyDataMapper2D.cxx
-  vtkOpenGLProperty.cxx
-  vtkOpenGLRenderWindow.cxx
-  vtkOpenGLRenderer.cxx
-  vtkOpenGLRepresentationPainter.cxx
-  vtkOpenGLScalarsToColorsPainter.cxx
-  vtkOpenGLState.cxx
-  vtkOpenGLTexture.cxx
-  vtkOverlayPass.cxx
-  vtkRenderPassCollection.cxx
-  vtkSequencePass.cxx
-  vtkShader2.cxx
-  vtkShader2Collection.cxx
-  vtkShaderProgram2.cxx
-  vtkShadowMapBakerPass.cxx
-  vtkShadowMapPass.cxx
-  vtkSobelGradientMagnitudePass.cxx
-  vtkTextureUnitManager.cxx
-  vtkTranslucentPass.cxx
-  vtkUniformVariables.cxx
-  vtkVolumetricPass.cxx
-  )
-
-IF(VTK_USE_GLSL_SHADERS)
-  SET(KitOpenGL_SRCS ${KitOpenGL_SRCS}
-    vtkGLSLShader.cxx
-    vtkGLSLShaderDeviceAdapter.cxx
-    vtkGLSLShaderProgram.cxx
-    )
-ENDIF(VTK_USE_GLSL_SHADERS)
-
-SET_SOURCE_FILES_PROPERTIES(
-  vtkAbstractMapper3D
-  vtkAbstractVolumeMapper
-  vtkAbstractPicker
-  vtkAbstractPropPicker
-  vtkCuller
-  vtkExporter
-  vtkGPUInfoList
-  vtkImageMapper3D
-  vtkImageProcessingPass
-  vtkImporter
-  vtkInteractorObserver
-  vtkLabelRenderStrategy
-  vtkMapper
-  vtkOpenGLRenderWindow
-  vtkPainter
-  vtkPolyDataPainter
-  vtkPrimitivePainter
-  vtkProp3D
-  vtkRendererDelegate
-  vtkRenderPass
-  vtkRenderState # not abstract just not using instantiator
-  vtkShader
-  vtkShaderDeviceAdapter
-  vtkShaderDeviceAdapter2
-  vtkShaderProgram
-  vtkStringToImage
-  vtkTDxInteractorStyle
-  vtkVisibilitySort.cxx
-  ABSTRACT
-  )
-
-SET_SOURCE_FILES_PROPERTIES(
-  vtkLightingHelper
-  vtkRenderState
-  vtkOpenGLState
-  vtkTextureUnitManager
-  vtkTestingInteractor
-  vtkTestingObjectFactory
-  WRAP_EXCLUDE
-  )
-
-# Freetype stuff
-
-SET(KitOpenGL_SRCS ${KitOpenGL_SRCS}
-  vtkFreeTypeLabelRenderStrategy.cxx
-  vtkOpenGLFreeTypeTextMapper.cxx
-  )
-
-# Get GPU VRAM info
-# on Windows
-#message("DirectX_FOUND=${DirectX_FOUND}")
-if(DirectX_FOUND)
- set(Kit_SRCS ${Kit_SRCS} vtkDirectXGPUInfoList.cxx)
-endif(DirectX_FOUND)
-
-# on Mac
-if(ApplicationServices_FOUND)
- set(Kit_SRCS ${Kit_SRCS} vtkCoreGraphicsGPUInfoList.cxx)
-endif()
-
-# on Linux, for Nvidia
-if(VTK_USE_X)
- set(Kit_SRCS ${Kit_SRCS} vtkXGPUInfoList.cxx)
-endif()
-
-SET(Kit_SRCS ${Kit_SRCS} vtkFreeTypeUtilities.cxx vtkFreeTypeTools.cxx )
-SET_SOURCE_FILES_PROPERTIES(
-  vtkFreeTypeTools
-  vtkFreeTypeUtilities
-  WRAP_EXCLUDE)
-
-SET(Kit_FT_SRCS
-  fonts/face_arial.cxx
-  fonts/face_arial_bold.cxx
-  fonts/face_arial_bold_italic.cxx
-  fonts/face_arial_italic.cxx
-  fonts/face_courier.cxx
-  fonts/face_courier_bold.cxx
-  fonts/face_courier_bold_italic.cxx
-  fonts/face_courier_italic.cxx
-  fonts/face_times.cxx
-  fonts/face_times_bold.cxx
-  fonts/face_times_bold_italic.cxx
-  fonts/face_times_italic.cxx
-)
-
-IF(VTK_USE_X)
-  SET( Kit_SRCS ${Kit_SRCS} vtkXRenderWindowInteractor.cxx)
-ENDIF(VTK_USE_X)
-
-# -----------------------------------------------------------------------------
-# 3DConnexion device (SpaceNavigator, etc... ) on Unix.
-IF(VTK_USE_X)
-  OPTION(VTK_USE_TDX "Use 3Dconnexion device" OFF)
-  MARK_AS_ADVANCED(VTK_USE_TDX)
-  IF(VTK_USE_TDX)
-
-   SET(VTK_TDX_INCLUDE_PATH CACHE PATH "Directory path to xdrvlib.h for 3DConnexion device")
-   SET(VTK_TDX_OBJECT_PATH CACHE FILEPATH "File path to xdrvlib.a for 3DConnexion device")
-   SET(Kit_SRCS ${Kit_SRCS} vtkTDxDevice.cxx vtkTDxUnixDevice.cxx)
-   INCLUDE_DIRECTORIES(${VTK_TDX_INCLUDE_PATH})
-   SET_SOURCE_FILES_PROPERTIES(vtkTDxDevice ABSTRACT)
-   SET_SOURCE_FILES_PROPERTIES(vtkTDxUnixDevice WRAP_EXCLUDE)
-   LIST(APPEND KIT_INTERFACE_LIBRARIES ${VTK_TDX_OBJECT_PATH})
-  ENDIF()
-ENDIF()
-# -----------------------------------------------------------------------------
-# 3DConnexion device (SpaceNavigator, etc... ) on Mac (not X11).
-IF(VTK_USE_CARBON OR VTK_USE_COCOA)
-  OPTION(VTK_USE_TDX "Use 3Dconnexion device" OFF)
-  MARK_AS_ADVANCED(VTK_USE_TDX)
-  IF(VTK_USE_TDX)
-# framework is in /Library/Frameworks/3DconnexionClient.framework
-   find_package(3DconnexionClient)
-   if(3DconnexionClient_FOUND)
-     set(KIT_LIBS ${KIT_LIBS} ${3DconnexionClient_LIBRARY})
-     include_directories(${3DconnexionClient_INCLUDE_DIR})
-   endif()
-   SET(Kit_SRCS ${Kit_SRCS} vtkTDxDevice.cxx vtkTDxMacDevice.cxx)
-   SET_SOURCE_FILES_PROPERTIES(vtkTDxDevice.cxx ABSTRACT)
-   LIST(APPEND KIT_INTERFACE_LIBRARIES ${VTK_TDX_OBJECT_PATH})
-  ENDIF()
-ENDIF()
-# -----------------------------------------------------------------------------
-# 3DConnexion device (SpaceNavigator, etc... ) on Windows.
-IF(WIN32)
-  OPTION(VTK_USE_TDX "Use 3Dconnextion device" OFF)
-  MARK_AS_ADVANCED(VTK_USE_TDX)
-  IF(VTK_USE_TDX)
-   SET(Kit_SRCS ${Kit_SRCS} vtkTDxDevice.cxx vtkTDxWinDevice.cxx)
-   SET_SOURCE_FILES_PROPERTIES(vtkTDxDevice.cxx ABSTRACT)
-  ENDIF()
-ENDIF()
-# -----------------------------------------------------------------------------
-CONFIGURE_FILE(${VTK_SOURCE_DIR}/Rendering/vtkTDxConfigure.h.in
-               ${VTK_BINARY_DIR}/Rendering/vtkTDxConfigure.h @ONLY IMMEDIATE)
-
-IF(VTK_USE_QT)
-  SET(QT_DONT_USE_QTGUI)
-  INCLUDE(${QT_USE_FILE})
-
-  SET( Kit_SRCS ${Kit_SRCS}
-    vtkQImageToImageSource.cxx
-    vtkQtInitialization.cxx
-    vtkQtLabelRenderStrategy.cxx
-    vtkQtStringToImage.cxx
-    vtkQtTreeRingLabelMapper.cxx
-    )
-  # On the Mac, make the QT_LIBRARIES KIT_INTERFACE_LIBRARIES. This is a
-  # workaround a problem with the Qt binaries from Trolltech. These libraries
-  # use install names that are relative. Then when the linker tries to pull them
-  # indirectly (through vtkRendering's list of libraries), it fails to find them.
-  # This does not happen when Qt is build from source because it uses absolute
-  # path in install names. This workaround fixes the problem by forcing all libraries
-  # and executables that depend on vtkRendering to also directly link to Qt libraries.
-  IF (APPLE)
-    LIST (APPEND KIT_INTERFACE_LIBRARIES ${QT_LIBRARIES})
-  ELSE (APPLE)
-    LIST (APPEND KIT_LIBS ${QT_LIBRARIES})
-  ENDIF (APPLE)
-
-ENDIF(VTK_USE_QT)
-
-# The set of source files to be encoded.
-SET(shader_files
-  vtkColorMaterialHelper_vs.glsl
-  vtkDepthPeeling_fs.glsl
-  vtkGaussianBlurPassShader_fs.glsl
-  vtkLighting_s.glsl # s not vs or fs because it can be used in both.
-  vtkLightingHelper_s.glsl # s not vs or fs because it can be used in both.
-  vtkLineIntegralConvolution2D_fs.glsl
-  vtkLineIntegralConvolution2D_fs1.glsl
-  vtkLineIntegralConvolution2D_fs2.glsl
-  vtkOpenGLRenderer_PeelingFS.glsl
-  vtkOpenGLPropertyDefaultPropFunc_fs.glsl
-  vtkOpenGLPropertyDefaultPropFunc_vs.glsl
-  vtkOpenGLPropertyDefaultMain_fs.glsl
-  vtkOpenGLPropertyDefaultMain_vs.glsl
-  vtkSobelGradientMagnitudePassShader1_fs.glsl
-  vtkSobelGradientMagnitudePassShader2_fs.glsl
-  vtkShadowMapPassShader_fs.glsl
-  vtkShadowMapPassShader_vs.glsl
-  vtkSurfaceLICPainter_fs1.glsl
-  vtkSurfaceLICPainter_fs2.glsl
-  vtkSurfaceLICPainter_vs1.glsl
-  )
-
-# Create custom commands to encode each assembly file into a C string
-# literal in a header file.
-
-SET(shader_h_files)
-FOREACH(file ${shader_files})
-  GET_FILENAME_COMPONENT(file_we ${file} NAME_WE)
-  SET(src ${VTK_SOURCE_DIR}/Rendering/${file})
-  SET(res ${VTK_BINARY_DIR}/Rendering/${file_we}.cxx)
-  SET(resh ${VTK_BINARY_DIR}/Rendering/${file_we}.h)
-  SET(shader_h_files ${shader_h_files} "${resh}")
-  ADD_CUSTOM_COMMAND(
-    OUTPUT ${res} ${resh}
-    DEPENDS ${src} vtkEncodeString
-    COMMAND ${VTK_ENCODESTRING_EXE}
-    ARGS ${res} ${src} ${file_we} --build-header VTK_RENDERING_EXPORT vtkSystemIncludes.h
-    )
-  SET(Kit_EXTRA_SRCS ${Kit_EXTRA_SRCS} ${res})
-ENDFOREACH(file)
-
-# OpenGL extensions stuff.
-
-IF(VTK_USE_X)
- INCLUDE(${VTK_CMAKE_DIR}/vtkTestGLX.cmake)
-ENDIF(VTK_USE_X)
-
-# Parse the extensions into vtkgl.h/vtkgl.cxx.
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${VTK_BINARY_DIR}/Rendering/vtkgl.cxx
-  COMMAND vtkParseOGLExt
-  ARGS ${VTK_BINARY_DIR}/Rendering ${VTK_GLEXT_FILE} ${VTK_GLXEXT_FILE} ${VTK_WGLEXT_FILE}
-  DEPENDS ${VTK_GLEXT_FILE} ${VTK_GLXEXT_FILE} ${VTK_WGLEXT_FILE} vtkParseOGLExt
-  )
-
-SET_SOURCE_FILES_PROPERTIES(vtkOpenGLExtensionManager.cxx
-  PROPERTIES OBJECT_DEPENDS ${VTK_BINARY_DIR}/Rendering/vtkgl.cxx)
-
-SET(KitOpenGL_SRCS ${KitOpenGL_SRCS}
-  ${VTK_BINARY_DIR}/Rendering/vtkgl.cxx
-  )
-
-SET_SOURCE_FILES_PROPERTIES(
-  # OK, so it's not abstract, but this stops the instantiator
-  # from trying to call vtkRenderingInstantiatorvtkglNew():
-  ${VTK_BINARY_DIR}/Rendering/vtkgl.cxx
-  vtkLabelHierarchyIterator.cxx
-  ABSTRACT
-  )
-
-SET_SOURCE_FILES_PROPERTIES(
-  ${VTK_BINARY_DIR}/Rendering/vtkgl.cxx
-  GENERATED
-  )
-
-SET_SOURCE_FILES_PROPERTIES(
-  ${VTK_BINARY_DIR}/Rendering/vtkgl.cxx
-  WRAP_EXCLUDE
-  )
-
-# Configuration for vtkOpenGLExtensionManager
-IF (WIN32)
-  SET(VTK_USE_WGL_GET_PROC_ADDRESS 1)
-ELSE (WIN32)
-  IF (APPLE)
-    SET(VTK_USE_APPLE_LOADER 1)
-  ELSE (APPLE)
-    INCLUDE(CheckFunctionExists)
-    SET(VTK_SAVE_CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
-    SET(CMAKE_REQUIRED_LIBRARIES
-      ${OPENGL_LIBRARIES}
-      ${CMAKE_THREAD_LIBS}
-      ${CMAKE_REQUIRED_LIBRARIES}
-      -lm
-      )
-    IF(VTK_USE_X)
-      CHECK_FUNCTION_EXISTS(glXGetProcAddressARB VTK_USE_GLX_GET_PROC_ADDRESS_ARB)
-      IF (VTK_USE_GLX_GET_PROC_ADDRESS_ARB)
-        IF (NOT "${VTK_GLX_GET_PROC_ADDRESS_ARB_PROTOTYPE_EXISTS_INCLUDES}" STREQUAL "${OPENGL_INCLUDE_DIR}")
-          # The OpenGL includes changed.  Retest glXGetProcAddressARB prototype.
-          SET(VTK_GLX_GET_PROC_ADDRESS_ARB_PROTOTYPE_EXISTS_TESTED 0)
-        ENDIF (NOT "${VTK_GLX_GET_PROC_ADDRESS_ARB_PROTOTYPE_EXISTS_INCLUDES}" STREQUAL "${OPENGL_INCLUDE_DIR}")
-        IF (NOT VTK_GLX_GET_PROC_ADDRESS_ARB_PROTOTYPE_EXISTS_TESTED)
-          MESSAGE(STATUS "Looking for glXGetProcAddressARB in GL/glx.h")
-          TRY_COMPILE(VTK_GLX_GET_PROC_ADDRESS_ARB_PROTOTYPE_EXISTS
-            ${CMAKE_BINARY_DIR}
-            ${CMAKE_CURRENT_SOURCE_DIR}/CheckglXGetProcAddressARB.cxx
-            CMAKE_FLAGS "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
-            "-DINCLUDE_DIRECTORIES:STRING=${OPENGL_INCLUDE_DIR}"
-            OUTPUT_VARIABLE OUTPUT)
-          MESSAGE(STATUS "Looking for glXGetProcAddressARB in GL/glx.h - ${VTK_GLX_GET_PROC_ADDRESS_ARB_PROTOTYPE_EXISTS}")
-          FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeOutput.log
-            "Determining if glXGetProcAddressARB exists in GL/glx.h ${VTK_GLX_GET_PROC_ADDRESS_ARB_PROTOTYPE_EXISTS} with the following output:\n"
-            "${OUTPUT}\n\n")
-          SET(VTK_GLX_GET_PROC_ADDRESS_ARB_PROTOTYPE_EXISTS_TESTED 1
-            CACHE INTERNAL "Already set VTK_GLX_GET_PROC_ADDRESS_ARB_PROTOTYPE_EXISTS")
-          SET(VTK_GLX_GET_PROC_ADDRESS_ARB_PROTOTYPE_EXISTS_INCLUDES
-            "${OPENGL_INCLUDE_DIR}"
-            CACHE INTERNAL "OpenGL includes used to test glXGetProcAddressARB prototype.")
-        ENDIF (NOT VTK_GLX_GET_PROC_ADDRESS_ARB_PROTOTYPE_EXISTS_TESTED)
-        IF (NOT VTK_GLX_GET_PROC_ADDRESS_ARB_PROTOTYPE_EXISTS)
-          SET(VTK_DEFINE_GLX_GET_PROC_ADDRESS_PROTOTYPE 1)
-        ENDIF (NOT VTK_GLX_GET_PROC_ADDRESS_ARB_PROTOTYPE_EXISTS)
-      ELSE (VTK_USE_GLX_GET_PROC_ADDRESS_ARB)
-        CHECK_FUNCTION_EXISTS(glXGetProcAddress VTK_USE_GLX_GET_PROC_ADDRESS)
-        IF (NOT VTK_USE_GLX_GET_PROC_ADDRESS)
-          #         SET(VTK_USE_VTK_DYNAMIC_LOADER 1)
-          MESSAGE(STATUS "Could not find extension loader.  Extensions disabled.")
-          SET(VTK_NO_EXTENSION_LOADING 1)
-        ENDIF (NOT VTK_USE_GLX_GET_PROC_ADDRESS)
-      ENDIF (VTK_USE_GLX_GET_PROC_ADDRESS_ARB)
-    ELSE(VTK_USE_X)
-      SET(VTK_NO_EXTENSION_LOADING 1)
-    ENDIF(VTK_USE_X)
-    SET(CMAKE_REQUIRED_LIBRARIES "${VTK_SAVE_CMAKE_REQUIRED_LIBRARIES}")
-  ENDIF (APPLE)
-ENDIF (WIN32)
-CONFIGURE_FILE(
-  ${VTK_SOURCE_DIR}/Rendering/vtkOpenGLExtensionManagerConfigure.h.in
-  ${VTK_BINARY_DIR}/Rendering/vtkOpenGLExtensionManagerConfigure.h)
-# Build a list of libraries to link to vtkRendering.
-
-IF(VTK_USE_GL2PS)
-  IF(VTK_USE_SYSTEM_GL2PS)
-    SET(KIT_LIBS ${KIT_LIBS} ${GL2PS_LIBRARIES} ${VTK_ZLIB_LIBRARIES} ${VTK_PNG_LIBRARIES})
-  ELSE(VTK_USE_SYSTEM_GL2PS)
-    SET(KIT_LIBS ${KIT_LIBS} ${VTK_ZLIB_LIBRARIES} ${VTK_PNG_LIBRARIES})
-  ENDIF(VTK_USE_SYSTEM_GL2PS)
-ENDIF(VTK_USE_GL2PS)
-
-IF(OPENGL_gl_LIBRARY)
-  SET(KitOpenGL_SRCS ${KitOpenGL_SRCS} vtkGenericOpenGLRenderWindow.cxx)
-ENDIF(OPENGL_gl_LIBRARY)
-
-IF (WIN32)
-  IF(VTK_USE_X)
-    IF (OPENGL_gl_LIBRARY)
-      SET(KitOpenGL_SRCS ${KitOpenGL_SRCS} vtkXOpenGLRenderWindow.cxx)
-      SET(KIT_LIBS ${KIT_LIBS} ${OPENGL_gl_LIBRARY} )
-    ENDIF (OPENGL_gl_LIBRARY)
-  ELSE(VTK_USE_X)
-    SET(KitOpenGL_SRCS ${KitOpenGL_SRCS}
-                 vtkWin32OpenGLRenderWindow.cxx
-                 vtkWin32RenderWindowInteractor.cxx)
-    SET (KIT_LIBS ${KIT_LIBS} ${OPENGL_gl_LIBRARY} )
-  ENDIF(VTK_USE_X)
-ELSE (WIN32)
-  IF (APPLE)
-    IF(VTK_USE_COCOA)
-      SET(KitOpenGL_SRCS ${KitOpenGL_SRCS}
-                   vtkCocoaRenderWindowInteractor.mm
-                   vtkCocoaRenderWindow.mm
-                   vtkCocoaGLView.mm)
-
-      # The objective-c++ classes might need their own flags.
-      # Set them if specified.
-      IF(VTK_REQUIRED_OBJCXX_FLAGS)
-
-        SET_SOURCE_FILES_PROPERTIES(vtkCocoaRenderWindowInteractor.mm
-                                    vtkCocoaRenderWindow.mm
-                                    vtkCocoaGLView.mm
-                                    PROPERTIES COMPILE_FLAGS "${VTK_REQUIRED_OBJCXX_FLAGS}")
-
-      ENDIF(VTK_REQUIRED_OBJCXX_FLAGS)
-
-      SET_SOURCE_FILES_PROPERTIES(vtkCocoaGLView WRAP_EXCLUDE)
-      SET (KIT_LIBS ${KIT_LIBS} ${OPENGL_gl_LIBRARY} "-framework Cocoa")
-      # This is to resolve a linker error that happens on older (?) OS X builds.
-      # If an executable links against vtkRendering, it would get the following
-      # error unless we add the objc to its link interface:
-      # ld: /usr/lib/crt1.o illegal reference to symbol: __objcInit defined in indirectly
-      # referenced dynamic library /usr/lib/libobjc.A.dylib
-      LIST(APPEND KIT_INTERFACE_LIBRARIES objc)
-    ENDIF(VTK_USE_COCOA)
-    IF(VTK_USE_CARBON)
-      SET(KitOpenGL_SRCS ${KitOpenGL_SRCS}
-                   vtkCarbonRenderWindowInteractor.cxx
-                   vtkCarbonRenderWindow.cxx)
-      SET (KIT_LIBS ${KIT_LIBS} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} "-framework Carbon")
-    ENDIF(VTK_USE_CARBON)
-    IF(VTK_USE_X  AND  OPENGL_gl_LIBRARY)
-      SET(KitOpenGL_SRCS ${KitOpenGL_SRCS} vtkXOpenGLRenderWindow.cxx)
-    ELSE (VTK_USE_X  AND  OPENGL_gl_LIBRARY)
-      IF (VTK_OPENGL_HAS_OSMESA  AND  OSMESA_LIBRARY)
-        SET(KitOpenGL_SRCS ${KitOpenGL_SRCS} vtkOSOpenGLRenderWindow.cxx)
-        SET (KIT_LIBS ${KIT_LIBS} ${OSMESA_LIBRARY} )
-      ENDIF (VTK_OPENGL_HAS_OSMESA  AND  OSMESA_LIBRARY)
-    ENDIF(VTK_USE_X  AND  OPENGL_gl_LIBRARY)
-  ELSE (APPLE)
-    IF (VTK_USE_X AND OPENGL_gl_LIBRARY)
-      SET(KitOpenGL_SRCS ${KitOpenGL_SRCS} vtkXOpenGLRenderWindow.cxx)
-      SET (KIT_LIBS ${KIT_LIBS} ${OPENGL_gl_LIBRARY} )
-    ELSE (VTK_USE_X AND OPENGL_gl_LIBRARY)
-      IF (VTK_OPENGL_HAS_OSMESA  AND  OSMESA_LIBRARY)
-        SET(KitOpenGL_SRCS ${KitOpenGL_SRCS} vtkOSOpenGLRenderWindow.cxx)
-        SET (KIT_LIBS ${KIT_LIBS} ${OSMESA_LIBRARY} )
-      ENDIF (VTK_OPENGL_HAS_OSMESA  AND  OSMESA_LIBRARY)
-    ENDIF (VTK_USE_X AND OPENGL_gl_LIBRARY)
-  ENDIF (APPLE)
-ENDIF (WIN32)
-
-IF(VTK_USE_CG_SHADERS)
-  SET(KIT_LIBS ${KIT_LIBS} ${OPENGL_glu_LIBRARY})
-ENDIF(VTK_USE_CG_SHADERS)
-
-if(DirectX_FOUND)
- # d3d9.lib for symbol Direct3DCreate9
- # symbol CLSID_WbemLocator IID_IWbemLocator: wbemuuid.lib
- # wbemuuid.lib is *NOT A FILE* (you cannot find it), it is probably an
- # embedded library added by the linker itself.
- set(KIT_LIBS ${KIT_LIBS} ${DirectX_LIBRARY} wbemuuid)
- include_directories(${DirectX_INCLUDE_DIR})
-endif(DirectX_FOUND)
-
-if(VTK_USE_CORE_GRAPHICS)
- set(KIT_LIBS ${KIT_LIBS} ${ApplicationServices_LIBRARY} ${IOKit_LIBRARY})
- include_directories(${ApplicationServices_INCLUDE_DIR} ${IOKit_INCLUDE_DIR})
-endif(VTK_USE_CORE_GRAPHICS)
-
-if(VTK_USE_NVCONTROL)
- # NVCONTROL depends on X11. We solve that by making KIT_LIBS depending on
- # vtkRendering, as vtkRendering depends on X11 on Unix.
- set(KIT_LIBS ${KIT_LIBS} ${NVCtrlLib_LIBRARY} vtkRendering)
- include_directories(${NVCtrlLib_INCLUDE_DIR})
-endif(VTK_USE_NVCONTROL)
-
-IF(VTK_OPENGL_HAS_OSMESA AND OSMESA_LIBRARY)
-  SET(KIT_LIBS ${KIT_LIBS} ${OSMESA_LIBRARY})
-ENDIF(VTK_OPENGL_HAS_OSMESA AND OSMESA_LIBRARY)
-
-SET(Kit_SRCS ${Kit_SRCS} ${KitOpenGL_SRCS})
-SET(Kit_EXTRA_SRCS ${Kit_EXTRA_SRCS} ${Kit_FT_SRCS})
-
-IF(VTK_USE_GL2PS)
-  SET(Kit_EXTRA_SRCS ${Kit_EXTRA_SRCS} ${Kit_GL2PS_SRCS})
-ENDIF(VTK_USE_GL2PS)
-
-SET(Kit_EXTRA_CMDS)
-SET(Kit_TCL_EXTRA_SRCS)
-SET(Kit_PYTHON_EXTRA_SRCS)
-SET(Kit_JAVA_EXTRA_SRCS)
-SET(Kit_TCL_EXTRA_CMDS)
-SET(KIT_TCL_DEPS)
-SET(KIT_PYTHON_DEPS)
-SET(KIT_JAVA_DEPS)
-
-IF (TK_FOUND AND VTK_USE_TK)
-  SET(VTK_GENERATE_TK_INTERNALS 1)
-ENDIF (TK_FOUND AND VTK_USE_TK)
-
-IF(VTK_GENERATE_TK_INTERNALS)
-  INCLUDE (CheckIncludeFiles)
-  CHECK_INCLUDE_FILES("limits.h" HAVE_LIMITS_H)
-  CHECK_INCLUDE_FILES("unistd.h" HAVE_UNISTD_H)
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/vtkTkInternals.h.in
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkTkInternals.h)
-  IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-    INSTALL(FILES
-      ${CMAKE_CURRENT_BINARY_DIR}/vtkTkInternals.h
-      DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}
-      COMPONENT Development
-      )
-  ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-ENDIF (VTK_GENERATE_TK_INTERNALS)
-
-IF (VTK_WRAP_TCL AND VTK_USE_TK)
-  SET(KitTCL_SRCS
-    vtkTkRenderWidget.cxx
-    vtkTkImageViewerWidget.cxx)
-  IF (VTK_USE_COCOA)
-    SET(KitTCL_SRCS ${KitTCL_SRCS}
-      vtkCocoaTkUtilities.mm)
-    SET_SOURCE_FILES_PROPERTIES(vtkCocoaTkUtilities WRAP_EXCLUDE)
-    IF(VTK_REQUIRED_OBJCXX_FLAGS)
-      SET_SOURCE_FILES_PROPERTIES(vtkCocoaTkUtilities
-        PROPERTIES COMPILE_FLAGS "${VTK_REQUIRED_OBJCXX_FLAGS}")
-    ENDIF(VTK_REQUIRED_OBJCXX_FLAGS)
-  ENDIF(VTK_USE_COCOA)
-
-  # Use special interactor for X and Tk.
-  IF(VTK_USE_X)
-    SET(KitTCL_SRCS ${KitTCL_SRCS} vtkXRenderWindowTclInteractor.cxx)
-    SET(KIT_TCL_LIBS ${KIT_TCL_LIBS} ${X11_LIBRARIES})
-  ENDIF(VTK_USE_X)
-  IF(VTK_USE_CARBON)
-    SET(KIT_TCL_LIBS ${KIT_TCL_LIBS} "-framework Carbon")
-  ENDIF(VTK_USE_CARBON)
-  SET(Kit_TCL_EXTRA_CMDS
-    vtkTkRenderWidget
-    vtkTkImageViewerWidget)
-ENDIF (VTK_WRAP_TCL AND VTK_USE_TK)
-
-#-----------------------------------------------------------------------------
-# Include CMake code common to all kits.
-INCLUDE(${VTK_CMAKE_DIR}/KitCommonBlock.cmake)
-#-----------------------------------------------------------------------------
-
-# when crosscompiling vtkParseOGLExt is imported, don't add a dependency to it
-# this should be handled by cmake so it doesn't have to be done here
-IF(NOT CMAKE_CROSSCOMPILING)
-  # Add target dependency to ensure the vtkParseOGLExt is built before
-  # Rendering is.
-  ADD_DEPENDENCIES(vtk${KIT} vtkParseOGLExt)
-ENDIF(NOT CMAKE_CROSSCOMPILING)
-
-IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-  INSTALL(FILES
-    ${shader_h_files}
-    ${CMAKE_CURRENT_SOURCE_DIR}/vtkOpenGL.h
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkgl.h
-    DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}
-    COMPONENT Development
-    )
-
-  INSTALL(FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/vtkTestingObjectFactory.cmake
-    DESTINATION ${VTK_INSTALL_PACKAGE_DIR_CM24}/CMake
-    COMPONENT Development
-    )
-ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-
-IF (VTK_WRAP_PYTHON AND VTK_USE_TK AND TK_FOUND)
-  SET(RenderingPythonTkWidgets_SRCS
-    vtkTkWidgetsInit.cxx
-    vtkTkRenderWidgetPython.cxx
-    vtkTkImageViewerWidgetPython.cxx
-    )
-  IF (VTK_USE_COCOA)
-    SET(RenderingPythonTkWidgets_SRCS ${RenderingPythonTkWidgets_SRCS}
-        vtkCocoaTkUtilities.mm)
-  ENDIF (VTK_USE_COCOA)
-
-  VTK_ADD_LIBRARY(vtkRenderingPythonTkWidgets SHARED
-              ${RenderingPythonTkWidgets_SRCS})
-  SET(VTK_PYTHONTK_LIBRARIES ${VTK_TK_LIBRARIES})
-  IF(VTK_USE_X)
-    SET(VTK_PYTHONTK_LIBRARIES ${VTK_PYTHONTK_LIBRARIES} ${X11_LIBRARIES})
-  ENDIF(VTK_USE_X)
-  IF(VTK_USE_CARBON)
-    SET(VTK_PYTHONTK_LIBRARIES ${VTK_PYTHONTK_LIBRARIES} "-framework Carbon")
-  ENDIF(VTK_USE_CARBON)
-
-  TARGET_LINK_LIBRARIES (vtkRenderingPythonTkWidgets
-                        vtk${KIT}
-                        ${VTK_PYTHONTK_LIBRARIES})
-
-  # Apply user-defined properties to the library target.
-  IF(VTK_LIBRARY_PROPERTIES)
-    SET_TARGET_PROPERTIES(vtkRenderingPythonTkWidgets PROPERTIES
-      ${VTK_LIBRARY_PROPERTIES})
-  ENDIF(VTK_LIBRARY_PROPERTIES)
-
-  IF(NOT VTK_INSTALL_NO_LIBRARIES)
-    INSTALL(TARGETS vtkRenderingPythonTkWidgets
-      EXPORT ${VTK_INSTALL_EXPORT_NAME}
-      RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-      LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-      ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
-  ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
-ENDIF (VTK_WRAP_PYTHON AND VTK_USE_TK AND TK_FOUND)
-
-IF(VTK_USE_X)
-  SET(X11_LIB_SEARCH_PATH
-    /usr/X11R6/lib
-    /usr/local/lib
-    /usr/openwin/lib
-    /usr/lib
-    )
-  FIND_LIBRARY(X11_Xt_LIB Xt ${X11_LIB_SEARCH_PATH})
-  MARK_AS_ADVANCED(X11_Xt_LIB)
-  IF (X11_Xt_LIB)
-    TARGET_LINK_LIBRARIES(vtk${KIT} ${X11_Xt_LIB})
-  ENDIF (X11_Xt_LIB)
-  TARGET_LINK_LIBRARIES(vtk${KIT} ${X11_LIBRARIES})
-  IF (VTK_USE_TK)
-    # Definitely needed in case we are linking against a Tcl/Tk 8.5 static,
-    # which by default seems to be missing Xss and Xft. It can not just be
-    # attached to the vtk interpreter because sub-projects may need the
-    # very same fix.
-    FIND_LIBRARY(X11_Xscreensaver_LIB Xss ${X11_LIB_SEARCH_PATH})
-    MARK_AS_ADVANCED(X11_Xscreensaver_LIB)
-    IF(X11_Xscreensaver_LIB)
-      TARGET_LINK_LIBRARIES(vtk${KIT} ${X11_Xscreensaver_LIB})
-    ENDIF(X11_Xscreensaver_LIB)
-    FIND_LIBRARY(X11_Xft_LIB Xft ${X11_LIB_SEARCH_PATH})
-    MARK_AS_ADVANCED(X11_Xft_LIB)
-    IF(X11_Xft_LIB)
-      TARGET_LINK_LIBRARIES(vtk${KIT} ${X11_Xft_LIB})
-    ENDIF(X11_Xft_LIB)
-    IF(APPLE)
-      FIND_LIBRARY(X11_fontconfig_LIB fontconfig ${X11_LIB_SEARCH_PATH})
-      MARK_AS_ADVANCED(X11_fontconfig_LIB)
-      IF(X11_fontconfig_LIB)
-        TARGET_LINK_LIBRARIES(vtk${KIT} ${X11_fontconfig_LIB})
-      ENDIF(X11_fontconfig_LIB)
-    ENDIF(APPLE)
-  ENDIF(VTK_USE_TK)
-ENDIF(VTK_USE_X)
-
-IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-  SET(__inst_files
-    ${VTK_SOURCE_DIR}/${KIT}/Testing/Cxx/vtkRegressionTestImage.h
-    ${VTK_BINARY_DIR}/Rendering/vtkTDxConfigure.h
-    ${VTK_SOURCE_DIR}/${KIT}/vtkTDxMotionEventInfo.h
-    )
-  INSTALL(FILES ${__inst_files}
-    DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}
-    COMPONENT Development)
-ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-
-IF(NOT CMAKE_CROSSCOMPILING)
-  # Add target dependency to ensure the vtkEncodeString is built before
-  # Rendering is.
-  ADD_DEPENDENCIES(vtk${KIT} vtkEncodeString)
-ENDIF(NOT CMAKE_CROSSCOMPILING)
diff --git a/Rendering/Testing/CMakeLists.txt b/Rendering/Testing/CMakeLists.txt
deleted file mode 100644
index 45d5bb6049ead3ecf8603fc54b027a8fd1a3db5b..0000000000000000000000000000000000000000
--- a/Rendering/Testing/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-ADD_SUBDIRECTORY(Cxx)
-
-IF (VTK_WRAP_TCL)
-  ADD_SUBDIRECTORY(Tcl)
-ENDIF (VTK_WRAP_TCL)
-
-IF (VTK_WRAP_PYTHON)
-  ADD_SUBDIRECTORY(Python)
-ENDIF (VTK_WRAP_PYTHON)
-
-IF(PYTHON_EXECUTABLE)
-  ADD_TEST(HeaderTesting-Rendering ${PYTHON_EXECUTABLE}
-    ${VTK_SOURCE_DIR}/Common/Testing/HeaderTesting.py
-    "${VTK_SOURCE_DIR}/Rendering"
-    VTK_RENDERING_EXPORT
-    vtkCocoaMacOSXSDKCompatibility.h
-    vtkCocoaGLView.h
-    vtkFreeTypeUtilities.h
-    vtkgl.h
-    vtkgluPickMatrix.h
-    vtkGPUInfoListArray.h
-    vtkLabelHierarchyPrivate.h
-    vtkNoise200x200.h
-    vtkOpenGL.h
-    vtkOpenGLExtensionManagerConfigure.h
-    vtkOpenGLState.h
-    vtkPythagoreanQuadruples.h
-    vtkRenderState.h
-    vtkShadowMapPassInternal.h
-    vtkTDxMotionEventInfo.h
-    vtkTkImageViewerWidget.h
-    vtkTkInternals.h
-    vtkTkRenderWidget.h
-    )
-ENDIF(PYTHON_EXECUTABLE)
diff --git a/Rendering/Testing/Python/CMakeLists.txt b/Rendering/Testing/Python/CMakeLists.txt
deleted file mode 100644
index 47ef1c6d3bba965964e1913efcad0ad9fe991c8d..0000000000000000000000000000000000000000
--- a/Rendering/Testing/Python/CMakeLists.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-INCLUDE(${VTK_SOURCE_DIR}/Utilities/vtkTclTest2Py/vtkConvertTclTestToPy.cmake)
-IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-
-  #
-  # Add tests, with the data
-  #
-  IF (VTK_DATA_ROOT)
-    IF (VTK_PYTHON_EXE)
-      IF(VTK_USE_TK)
-        FOREACH ( tfile
-                  TestTkRenderWidget
-                  TestTkRenderWindowInteractor
-                  )
-          ADD_TEST(${tfile}Python-image ${VTK_PYTHON_EXE}
-            ${VTK_SOURCE_DIR}/Rendering/Testing/Python/${tfile}.py
-            -B ${VTK_DATA_ROOT}/Baseline/Rendering
-            -D ${VTK_DATA_ROOT}/Data)
-        ENDFOREACH( tfile )
-
-        #############################
-        # This test reuses an image in Widgets.
-        ADD_TEST(TestMapperLUTPython-image ${VTK_PYTHON_EXE}
-            ${VTK_SOURCE_DIR}/Rendering/Testing/Python/TestMapperLUT.py
-            -B ${VTK_DATA_ROOT}/Baseline/Widgets
-            -D ${VTK_DATA_ROOT})
-
-      ENDIF(VTK_USE_TK)
-      
-      #############################
-      # Add GL2PS specific tests.
-      IF(VTK_USE_GL2PS)
-        FOREACH ( tfile
-                  TestGL2PSExporter
-                  )
-          ADD_TEST(${tfile}Python-image ${VTK_PYTHON_EXE}
-            ${VTK_SOURCE_DIR}/Rendering/Testing/Python/${tfile}.py
-            -B ${VTK_DATA_ROOT}/Baseline/Rendering
-            -D ${VTK_DATA_ROOT}/Data)
-        ENDFOREACH( tfile )
-      ENDIF(VTK_USE_GL2PS)
-      #############################
-
-      # Add test converted from Tcl
-      SET(tests
-          assembly
-          CamBlur
-          #cells -- too complex file IO
-          ImageActor
-          ImageActorStressed
-          labeledContours
-          labeledMesh
-          multiLineText
-          pickCells
-          propAssembly
-          rendererSource
-          rotations
-          ScalarBar
-          TestFlyTo
-          TestOnePoint
-          TestParallelCoordinates
-          #TestStyleTerrain  -- file source
-          #TestTiling
-          TestTriangleStripCellColor
-          )
-        SET(tests ${tests}
-          #TestStyleJoystickActor --file source
-          #TestStyleJoystickCamera
-          TestStyleRubberBandZoom
-          #TestStyleTrackballActor -- file source
-          #TestStyleTrackballCamera -- file source
-          )
-        CONVERT_TCL_TEST_TO_PY(
-          tests
-          Rendering)
-    ENDIF (VTK_PYTHON_EXE)
-  ENDIF (VTK_DATA_ROOT)
-
-ENDIF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-
diff --git a/Rendering/Testing/Tcl/CMakeLists.txt b/Rendering/Testing/Tcl/CMakeLists.txt
deleted file mode 100644
index 0a0f9637b2b22481222511a2d969b1a60bb7f603..0000000000000000000000000000000000000000
--- a/Rendering/Testing/Tcl/CMakeLists.txt
+++ /dev/null
@@ -1,99 +0,0 @@
-IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-
-  #
-  # Add tests, with the data
-  #
-  IF (VTK_DATA_ROOT)
-    SET( tests
-      assembly
-      CamBlur
-      cells 
-      ImageActor
-      ImageActorStressed
-      labeledContours
-      labeledMesh
-      multiLineText
-      pickCells
-      PickerWithLocator
-      propAssembly
-      rendererSource
-      rotations
-      ScalarBar
-      SurfacePickerWithTexture
-      TestFlyTo
-      TestLeaderActor2D
-      TestOnePoint
-      TestOpacity2
-      TestParallelCoordinates
-      TestQuadricLODActor
-      TestStyleTerrain
-      TestTriangleStripCellColor
-      TestWindowToImageTransparency
-      TexturedSphere
-    )
-    IF(VTK_USE_TK)
-      SET(tests ${tests}
-        TestStyleJoystickActor
-        TestStyleJoystickCamera
-        TestStyleRubberBandZoom
-        TestStyleTrackballActor
-        TestStyleTrackballCamera
-        )
-    ENDIF(VTK_USE_TK)
-
-    IF (VTK_USE_CG_SHADERS)
-      # Tests testing Cg Shaders.
-      SET(tests ${tests}
-        TestCgShader
-        TestGenericVertexAttributesCg
-        )
-    ENDIF (VTK_USE_CG_SHADERS)
-
-    IF (VTK_USE_GLSL_SHADERS)
-      # Tests testing GLSL Shaders.
-      SET(tests ${tests}
-        TestGLSLShader
-        TestGenericVertexAttributesGLSL
-        )
-    ENDIF (VTK_USE_GLSL_SHADERS)
-
-    FOREACH ( tfile ${tests} )
-      ADD_TEST(${tfile}-image ${VTK_EXECUTABLE}
-        ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-        ${VTK_SOURCE_DIR}/Rendering/Testing/Tcl/${tfile}.tcl
-        -D ${VTK_DATA_ROOT}
-        -V Baseline/Rendering/${tfile}.png
-        -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-    ENDFOREACH( tfile )
-
-    FOREACH ( tfile
-      TestFreetypeTextMapper
-      TestFreetypeTextMapperBigger
-      TestFreetypeTextOverlay
-    )
-      ADD_TEST(${tfile}-image ${VTK_EXECUTABLE}
-        ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-        ${VTK_SOURCE_DIR}/Rendering/Testing/Tcl/${tfile}.tcl
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
-        -V Baseline/Rendering/${tfile}.png
-        -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-    ENDFOREACH( tfile )
-
-  #
-  # If we do not have the data, still run the tests that we can
-  #
-  ELSE (VTK_DATA_ROOT)
-  ENDIF (VTK_DATA_ROOT)
-
-ENDIF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-
-ADD_TEST(PrintSelf-Rendering ${TCL_TCLSH}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/PrintSelfCheck.tcl  
-         ${VTK_SOURCE_DIR}/Rendering)
-
-ADD_TEST(TestSetObjectMacro-Rendering ${TCL_TCLSH}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/FindString.tcl
-         "${VTK_SOURCE_DIR}/Rendering/vtk\\\\*.h"
-         "vtkSetObjectMacro"
-         )
diff --git a/Testing.txt b/Testing.txt
deleted file mode 100644
index 0aa24b9e6bbcda673c34d25891ee0eb06e357cb1..0000000000000000000000000000000000000000
--- a/Testing.txt
+++ /dev/null
@@ -1,129 +0,0 @@
-How to run and create tests.... 
-
-In creating tests there are a few goals to strive for.
-
-1) Increase coverage of the code to help detect defects
-
-2) Don't mess up the tester's directories. If a test wants to write out a
-   file, first make sure the directory is writable, and if it is, then write
-   out the files, and then delete them. So that the directory is left in its
-   original state.
-
-3) Don't require excessive disk space or CPU time. Most tests that run on a
-   512 cubed volume will work just as well on a 64 cubed volume. The 64 cubed
-   volume will require less disk space for the data, less CPU time to
-   process, and much less CPU time to purify. The same applies to valid
-   images. Typically there isn't any need for a 600 by 600 pixel valid
-   image. A 300 by 300 image will work fine and require less storage and less
-   CPU time to compute the image difference.
-
-4) Try to use existing data files. If you can create a test using a data file
-   that is already present, use that data file. Don't add a new data file
-   unless it is critical to test the functionality you want tested. If you do
-   need to add a new data file consider its size. If it is a large data file
-   can you produce a lower resolution version of it and check that in instead?
-
-The current status is that the new tree has about 100 tests and is achieving
-about 43 percent coverage. These tests require about three minutes to run on
-a 1 GHz Pentium and currently require about ten megabytes of disk space for
-the data files and valid images. 
-
-
-How to run a test
---------------------------
-
-The easiest way to run a test is using ctest which is included with
-cmake. You must make sure your build of VTK was done with BUILD_TESTS set to
-on when running cmake. Once your build is complete you can run tests in a few
-different ways. For example; you can cd to the top of your binary tree and
-run ctest. This will run every test in VTk and show you the results. If you
-only want to run specific tests you can use ctest -R <regexp> and provide a
-regular expression or ctest -I start,end,stride,extra ... Run ctest --help to
-see a more complete listing of options.
-
-How to create a new test
----------------------------
-
-The easiest approach is to look at an existing test and use that as a
-starting point. The tests are kept in Testing sub-directories under each main
-package. (e.g. VTK/Graphics/Testing) In Testing there will be sub-directories
-for each type of test (Cxx Tcl Python Java). For C++ tests you need to write
-the test and then add it to the CMakeLists.txt file in Testing/Cxx. For
-Tclexamples you would write a Tcl script, and then add it to the
-CMakeLists.txt file in Testing/Tcl. Just follow the examples already in the
-tree. Most tests take a few common arguments:
-
-  -D /path/to/VTKData
-  -V relative/path/to/valid/image
-  
-Tcl scripts also accept:
-
-  -A /path/to/vtktcl/package
-
-Typically these arguments are optional and the test will try to run without
-them. If the -V option is provided the test will try to perform image
-differences between the valid image and the rendered image. If the valid
-image specified with -V doesn't exist it will create it.
-
-
-Running a Tcl example
------------------------
-
-The most common way to run a Tcl example is to first set TCLLIBPATH to
-/path/to/VTK/Wrapping/Tcl so that the examples can find the vtktcl
-package. On UNIX you can do:
-
-setenv TCLLIBPATH /home/you/VTK/Wrapping/Tcl
-
-or on windows set TCLLIBPATH to c:/your/VTK/Wrapping/Tcl note that UNIX style
-slashes are used on windows as well. Once TCLLIBPATH is set you can run the
-example as
-
-cd VTK/Graphics/Testing/Tcl
-/path/to/VTK/bin/vtk yourScript.tcl 
-
-It will look for VTKData to be at the same level as VTK on your disk. If it
-isn't you will need to provide the -D argument.
-
-/path/to/VTK/bin/vtk yourScript.tcl -D /path/to/VTKData
-
-to run the example as a regression test you should make the example the first
-argument to VTK/Common/Testing/Tcl/rtImageTest.tcl. For example
-
-/path/to/VTK/bin/vtk /path/to/VTK/Common/Testing/Tcl/rtImageTest.tcl yourScript.tcl -D /path/to/VTKData -V Baseline/Graphics/yourScript.png
-
-That is a long command line but normally Dart will take care of it for you.
-
-
-VTK-Python tests
-------------------
-
-Writing and running VTK-Python tests is documented in
-Wrapping/Python/README.txt.  There are two types of Python tests, the
-old tests and the newer tests that use unit testing approach
-(unittest).  The newer tests can be run with a -h or --help argument.
-This provides information on the available command line options.  The
-other options for the newer tests are slightly different from the Tcl
-test scripts.  Please read Wrapping/Python/README.txt for more details
-on the newer tests.  The older tests should have the same command line
-options that the Tcl scripts have.  Test writers are encouraged to use
-the new approach (unittest) for the tests.
-
-
-Producing a dashboard
--------------------------
-
-If you want to test your build of VTK you can produce a dashboard. To do this
-you will need to have cmake installed on your system (which you need anyhow
-to build VTK).  Then when you run CMake, make sure BUILD_TESTING is on. Then
-you can do
-
-make Experimental
-
-on UNIX to perform a build, run the tests, and submit the result to the
-dashboard. If you just want to run the tests you can do
-
-make ExperimentalTest
-
-on windows there are targets in the workspace for Experiemental and
-ExperimentalTest
diff --git a/UseVTK.cmake.in b/UseVTK.cmake.in
deleted file mode 100644
index f7a52665da4083f2dbc2cde92b4974bc0ac0dd84..0000000000000000000000000000000000000000
--- a/UseVTK.cmake.in
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# This module is provided as VTK_USE_FILE by VTKConfig.cmake.  It can
-# be INCLUDEd in a project to load the needed compiler and linker
-# settings to use VTK.
-#
-
-IF(NOT VTK_USE_FILE_INCLUDED)
-  SET(VTK_USE_FILE_INCLUDED 1)
-
-  # Update CMAKE_MODULE_PATH so includes work.
-  SET (CMAKE_MODULE_PATH
-    ${CMAKE_MODULE_PATH}
-    ${VTK_CMAKE_DIR})
-
-  # Load the compiler settings used for VTK.
-  IF(VTK_BUILD_SETTINGS_FILE AND NOT SKIP_VTK_BUILD_SETTINGS_FILE)
-    INCLUDE(${CMAKE_ROOT}/Modules/CMakeImportBuildSettings.cmake)
-    CMAKE_IMPORT_BUILD_SETTINGS(${VTK_BUILD_SETTINGS_FILE})
-  ENDIF(VTK_BUILD_SETTINGS_FILE AND NOT SKIP_VTK_BUILD_SETTINGS_FILE)
-
-  # Add compiler flags needed to use VTK.
-  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${VTK_REQUIRED_C_FLAGS}")
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VTK_REQUIRED_CXX_FLAGS}")
-  SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${VTK_REQUIRED_EXE_LINKER_FLAGS}")
-  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${VTK_REQUIRED_SHARED_LINKER_FLAGS}")
-  SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${VTK_REQUIRED_MODULE_LINKER_FLAGS}")
-
-  # Add include directories needed to use VTK.
-  INCLUDE_DIRECTORIES(${VTK_INCLUDE_DIRS})
-
-  # Import the VTK_LOAD_CMAKE_EXTENSIONS macro.
-  INCLUDE(vtkMakeInstantiator)
-
-ENDIF(NOT VTK_USE_FILE_INCLUDED)
diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt
deleted file mode 100644
index 107539cd5b038d33d70bd1aa769569aab8277a8a..0000000000000000000000000000000000000000
--- a/Utilities/CMakeLists.txt
+++ /dev/null
@@ -1,147 +0,0 @@
-# Build kwsys
-ADD_SUBDIRECTORY(kwsys)
-IF(NOT VTK_INSTALL_NO_LIBRARIES)
-  SET_PROPERTY(GLOBAL APPEND PROPERTY VTK_TARGETS vtksys)
-ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
-
-# Build third-party utilities.
-
-SET(_VTK_THIRD_PARTY_HEADERS "")
-FOREACH(u expat freetype gl2ps hdf5 jpeg libproj4 libxml2 oggtheora png tiff zlib)
-  CONFIGURE_FILE(${VTK_SOURCE_DIR}/Utilities/vtk_${u}.h.in
-                 ${VTK_BINARY_DIR}/Utilities/vtk_${u}.h @ONLY)
-  LIST(APPEND _VTK_THIRD_PARTY_HEADERS ${VTK_BINARY_DIR}/Utilities/vtk_${u}.h)
-ENDFOREACH()
-
-VTK_THIRD_PARTY_SUBDIR(ZLIB vtkzlib)
-VTK_THIRD_PARTY_SUBDIR(HDF5 vtkhdf5)
-
-IF(NOT VTK_USE_SYSTEM_HDF5 AND NOT VTK_INSTALL_NO_LIBRARIES)
-  SET_PROPERTY(GLOBAL APPEND PROPERTY VTK_TARGETS vtkhdf5)
-  IF(HDF5_BUILD_HL_LIB)
-    SET_PROPERTY(GLOBAL APPEND PROPERTY VTK_TARGETS vtkhdf5_hl)
-  ENDIF(HDF5_BUILD_HL_LIB)
-ENDIF(NOT VTK_USE_SYSTEM_HDF5 AND NOT VTK_INSTALL_NO_LIBRARIES)
-
-IF(VTK_USE_GL2PS)
-  VTK_THIRD_PARTY_SUBDIR(GL2PS vtkgl2ps)
-ENDIF(VTK_USE_GL2PS)
-VTK_THIRD_PARTY_SUBDIR(JPEG vtkjpeg)
-VTK_THIRD_PARTY_SUBDIR(PNG  vtkpng)
-VTK_THIRD_PARTY_SUBDIR(TIFF vtktiff)
-VTK_THIRD_PARTY_SUBDIR(EXPAT vtkexpat)
-VTK_THIRD_PARTY_SUBDIR(FREETYPE vtkfreetype)
-VTK_THIRD_PARTY_SUBDIR(LIBXML2 vtklibxml2)
-VTK_THIRD_PARTY_SUBDIR(DICOMParser DICOMParser)
-VTK_THIRD_PARTY_SUBDIR(MATERIALLIBRARY MaterialLibrary)
-VTK_THIRD_PARTY_SUBDIR(LIBPROJ4 vtklibproj4)
-VTK_THIRD_PARTY_SUBDIR(MRMPI mrmpi)
-IF(VTK_USE_OGGTHEORA_ENCODER)
-  VTK_THIRD_PARTY_SUBDIR(OGGTHEORA vtkoggtheora)
-ENDIF(VTK_USE_OGGTHEORA_ENCODER)
-
-# Force build options for verdict
-SET( VERDICT_USE_FLOAT OFF CACHE BOOL "VTK requires doubles" FORCE )
-SET( VERDICT_ENABLE_TESTING OFF CACHE BOOL "Verdict testing is currently broken." FORCE )
-SET( VERDICT_NO_LIBRARY_VERSION 1 )
-SET( VERDICT_LIBRARY_PROPERTIES ${VTK_LIBRARY_PROPERTIES} )
-MARK_AS_ADVANCED( VERDICT_USE_FLOAT  VERDICT_ENABLE_TESTING VERDICT_BUILD_DOC )
-set( VERDICT_MANGLE ON CACHE BOOL "VTK requires verdict to be mangled." FORCE )
-set( VERDICT_MANGLE_PREFIX "vtk" CACHE STRING "VTK requires the verdict prefix to be vtk" FORCE )
-SET( verdict_INSTALL_DOC_DIR ${VTK_INSTALL_DOC_DIR_CM24})
-SET( verdict_INSTALL_INCLUDE_DIR ${VTK_INSTALL_INCLUDE_DIR_CM24})
-SET( verdict_INSTALL_BIN_DIR ${VTK_INSTALL_BIN_DIR_CM24})
-SET( verdict_INSTALL_LIB_DIR ${VTK_INSTALL_LIB_DIR_CM24})
-ADD_SUBDIRECTORY(verdict)
-
-ADD_SUBDIRECTORY(vtknetcdf)
-IF(VTK_USE_METAIO)
-  SET(METAIO_FOR_VTK 1)
-  ADD_SUBDIRECTORY(vtkmetaio)
-  IF(NOT VTK_INSTALL_NO_LIBRARIES)
-    SET_PROPERTY(GLOBAL APPEND PROPERTY VTK_TARGETS vtkmetaio)
-  ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
-ENDIF(VTK_USE_METAIO)
-ADD_SUBDIRECTORY(vtksqlite)
-
-IF(VTK_HAS_EXODUS)
-  ADD_SUBDIRECTORY(vtkexodus2)
-ENDIF(VTK_HAS_EXODUS)
-
-# helper classes for vtkLSDynaReader
-VTK_THIRD_PARTY_SUBDIR(LSDyna LSDyna)
-  
-ADD_SUBDIRECTORY(vtkalglib)
-
-ADD_SUBDIRECTORY(Doxygen)
-IF(VTK_INCLUDE_NEED_TCL)
-  ADD_SUBDIRECTORY(TclTk)
-ENDIF(VTK_INCLUDE_NEED_TCL)
-
-ADD_SUBDIRECTORY(EncodeString)
-
-IF(VTK_USE_PARALLEL)
-  # vtkParallel uses source hashes during network handshakes.
-  ADD_SUBDIRECTORY(HashSource)
-  
-  # helper classes for vtkVPICReader
-  VTK_THIRD_PARTY_SUBDIR(VPIC VPIC)
-  
-  # helper classes for vtkPCosmoReader and vtkPCosmoHaloFinder
-  VTK_THIRD_PARTY_SUBDIR(Cosmo Cosmo)
-ENDIF(VTK_USE_PARALLEL)
-
-IF(VTK_USE_RENDERING)
-  ADD_SUBDIRECTORY(ftgl)
-  ADD_SUBDIRECTORY(ParseOGLExt)
-ENDIF(VTK_USE_RENDERING)
-
-IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-  INSTALL(FILES
-    ${_VTK_THIRD_PARTY_HEADERS}
-    DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}
-    COMPONENT Development
-    )
-ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-
-#-----------------------------------------------------------------------------
-# Check for stdarg problem on SGI.
-IF(NOT CMAKE_COMPILER_IS_GNUCXX)
-  IF(CMAKE_SYSTEM MATCHES "IRIX.*")
-    IF("VTK_COMPILER_NO_SGI_STDARG_WORKAROUND" MATCHES "^VTK_COMPILER_NO_SGI_STDARG_WORKAROUND$")
-      MESSAGE(STATUS "Checking whether SGI MIPSpro 7.4 stdarg work-around is needed")
-      TRY_COMPILE(VTK_COMPILER_NO_SGI_STDARG_WORKAROUND
-        ${VTK_BINARY_DIR}/CMakeTmp
-        ${VTK_CMAKE_DIR}/vtkTestSGIstdarg.cxx
-        OUTPUT_VARIABLE OUTPUT)
-      IF(VTK_COMPILER_NO_SGI_STDARG_WORKAROUND)
-        MESSAGE(STATUS "Checking whether SGI MIPSpro 7.4 stdarg work-around is needed -- no")
-        SET(VTK_COMPILER_NO_SGI_STDARG_WORKAROUND 1 CACHE INTERNAL "Whether SGI MIPSpro 7.4 stdarg work-around is needed")
-        WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log
-          "Determining whether SGI MIPSpro does not have stdarg problems "
-          "passed with the following output:\n"
-          "${OUTPUT}\n" APPEND)
-      ELSE(VTK_COMPILER_NO_SGI_STDARG_WORKAROUND)
-        MESSAGE(STATUS "Checking whether SGI MIPSpro 7.4 stdarg work-around is needed -- yes")
-        SET(VTK_COMPILER_NO_SGI_STDARG_WORKAROUND 0 CACHE INTERNAL "Whether SGI MIPSpro 7.4 stdarg work-around is needed")
-        WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
-          "Determining whether SGI MIPSpro does not have stdarg problems "
-          "failed with the following output:\n"
-          "${OUTPUT}\n" APPEND)
-      ENDIF(VTK_COMPILER_NO_SGI_STDARG_WORKAROUND)
-    ENDIF("VTK_COMPILER_NO_SGI_STDARG_WORKAROUND" MATCHES "^VTK_COMPILER_NO_SGI_STDARG_WORKAROUND$")
-  ENDIF(CMAKE_SYSTEM MATCHES "IRIX.*")
-ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX)
-IF(NOT VTK_COMPILER_NO_SGI_STDARG_WORKAROUND)
-  # See internal_stdio_core.h.in for explanation.
-  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/internal_stdio_core.h.in
-                 ${CMAKE_CURRENT_BINARY_DIR}/internal/stdio_core.h
-                 @ONLY IMMEDIATE)
-
-  # Install the work-around header.
-  IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/internal/stdio_core.h
-      DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}/internal
-      COMPONENT Development)
-  ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-ENDIF(NOT VTK_COMPILER_NO_SGI_STDARG_WORKAROUND)
diff --git a/Utilities/LSDyna/CMakeLists.txt b/Utilities/LSDyna/CMakeLists.txt
deleted file mode 100644
index 93158dc335202ea108bb51ec6297d0d4cfe0b524..0000000000000000000000000000000000000000
--- a/Utilities/LSDyna/CMakeLists.txt
+++ /dev/null
@@ -1,44 +0,0 @@
- 
-project(LSDyna)
-
-SET(LSDyna_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
-
-CONFIGURE_FILE (${LSDyna_SOURCE_DIR}/LSDynaExport.h.in
-                ${LSDyna_BINARY_DIR}/LSDynaExport.h)
-
-# Do full dependency headers.
-INCLUDE_REGULAR_EXPRESSION("^LSDyna.*$")
- 
-SET(LSDyna_SOURCES
-  LSDynaFamily.h
-  LSDynaMetaData.h
-  LSDynaFamily.cxx
-  LSDynaMetaData.cxx
-)
-
-INCLUDE_DIRECTORIES (${LSDyna_SOURCE_DIR} ${LSDyna_BINARY_DIR})
-
-VTK_ADD_LIBRARY(LSDyna ${LSDyna_SOURCES})
-TARGET_LINK_LIBRARIES(LSDyna vtksys)
-
-# Apply user-defined properties to the library target. Such as SO Version
-IF(VTK_LIBRARY_PROPERTIES)
-  SET_TARGET_PROPERTIES(LSDyna PROPERTIES ${VTK_LIBRARY_PROPERTIES})
-ENDIF(VTK_LIBRARY_PROPERTIES)
-
-IF(NOT VTK_INSTALL_NO_LIBRARIES)
-  INSTALL(TARGETS LSDyna
-    EXPORT ${VTK_INSTALL_EXPORT_NAME}
-    RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
-    LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
-ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
-
-IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-  INSTALL(FILES
-    ${LSDyna_SOURCE_DIR}/LSDynaFamily.h
-    ${LSDyna_SOURCE_DIR}/LSDynaMetaData.h
-    ${LSDyna_BINARY_DIR}/LSDynaExport.h
-    DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}/LSDyna
-    COMPONENT Development)
-ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
diff --git a/VTKCPack.cmake b/VTKCPack.cmake
deleted file mode 100644
index a4377328964a63fa972d78be38bb5752766915a0..0000000000000000000000000000000000000000
--- a/VTKCPack.cmake
+++ /dev/null
@@ -1,83 +0,0 @@
-#-----------------------------------------------------------------------------
-# Build a CPack installer if CPack is available and this is a build of just
-# VTK (as opposed to a build of VTK included in some other project...)
-
-IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
-  IF("${VTK_BINARY_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
-
-    # For now, only build the CPack installer if vtk(.exe) or vtkpython will be available for
-    # installation:
-    #
-    IF(VTK_WRAP_TCL OR VTK_WRAP_PYTHON)
-      # Disable component based installation.
-      set(CPACK_MONOLITHIC_INSTALL ON)
-      
-      SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "VTK - The Visualization Toolkit")
-      SET(CPACK_PACKAGE_VENDOR "Kitware, Inc.")
-      SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright.txt")
-      SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright.txt")
-      
-      IF (CMAKE_SYSTEM_PROCESSOR MATCHES "unknown")
-        SET (CMAKE_SYSTEM_PROCESSOR "x86")
-      ENDIF (CMAKE_SYSTEM_PROCESSOR MATCHES "unknown")
-
-      IF(NOT DEFINED CPACK_SYSTEM_NAME)
-        SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
-      ENDIF(NOT DEFINED CPACK_SYSTEM_NAME)
-
-      IF(${CPACK_SYSTEM_NAME} MATCHES Windows)
-        IF(CMAKE_CL_64)
-          SET(CPACK_SYSTEM_NAME win64-${CMAKE_SYSTEM_PROCESSOR})
-        ELSE(CMAKE_CL_64)
-          SET(CPACK_SYSTEM_NAME win32-${CMAKE_SYSTEM_PROCESSOR})
-        ENDIF(CMAKE_CL_64)
-      ENDIF(${CPACK_SYSTEM_NAME} MATCHES Windows)
-      
-      IF(${CPACK_SYSTEM_NAME} MATCHES Darwin AND CMAKE_OSX_ARCHITECTURES)
-        LIST(LENGTH CMAKE_OSX_ARCHITECTURES _length)
-        IF(_length GREATER 1)
-          SET(CPACK_SYSTEM_NAME Darwin-Universal)
-        ELSE(_length GREATER 1)
-          SET(CPACK_SYSTEM_NAME Darwin-${CMAKE_OSX_ARCHITECTURES})
-        ENDIF(_length GREATER 1)
-      ENDIF(${CPACK_SYSTEM_NAME} MATCHES Darwin AND CMAKE_OSX_ARCHITECTURES)
-
-      SET(CPACK_PACKAGE_VERSION_MAJOR "${VTK_MAJOR_VERSION}")
-      SET(CPACK_PACKAGE_VERSION_MINOR "${VTK_MINOR_VERSION}")
-      SET(CPACK_PACKAGE_VERSION_PATCH "${VTK_BUILD_VERSION}")
-      SET(CPACK_PACKAGE_INSTALL_DIRECTORY "VTK ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-      SET(CPACK_SOURCE_PACKAGE_FILE_NAME "vtk-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-      SET(CPACK_PACKAGE_EXECUTABLES
-        "vtk" "VTK"
-        "vtkpython" "VTKPython"
-        )
-
-      # Set VTK Components to be installed
-      SET (CPACK_INSTALL_CMAKE_PROJECTS
-        "${VTK_BINARY_DIR}" "VTK Runtime Executables" "RuntimeExecutables" "/"
-        "${VTK_BINARY_DIR}" "VTK Runtime Libs" "RuntimeLibraries" "/"
-      )
-
-      # Append in CPACK rule for the Development Component
-      IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-        LIST(APPEND CPACK_INSTALL_CMAKE_PROJECTS
-        "${VTK_BINARY_DIR}" "VTK Development Headers, Libs and Tools" "Development" "/"
-        )
-      ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-
-      IF(WIN32)
-        STRING(REGEX REPLACE "/" "\\\\\\\\" CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/Utilities/Release/VTKInstall.bmp")
-        SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\vtk.exe")
-        set(CPACK_NSIS_MUI_ICON "${VTK_SOURCE_DIR}\\\\vtkLogo.ico")
-        set(CPACK_NSIS_MUI_UNIICON "${VTK_SOURCE_DIR}\\\\vtkLogo.ico")
-        SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
-        SET(CPACK_NSIS_HELP_LINK "http://www.vtk.org")
-        SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.kitware.com")
-        SET(CPACK_NSIS_CONTACT "kitware@kitware.com")
-      ENDIF(WIN32)
-
-      INCLUDE(CPack)
-    ENDIF(VTK_WRAP_TCL OR VTK_WRAP_PYTHON)
-
-  ENDIF("${VTK_BINARY_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
-ENDIF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
diff --git a/VTKConfig.cmake.in b/VTKConfig.cmake.in
deleted file mode 100644
index 6772f4fab116fb0bf262241fa65255bee1f8c736..0000000000000000000000000000000000000000
--- a/VTKConfig.cmake.in
+++ /dev/null
@@ -1,252 +0,0 @@
-#-----------------------------------------------------------------------------
-#
-# VTKConfig.cmake - VTK CMake configuration file for external projects.
-#
-# This file is configured by VTK and used by the UseVTK.cmake module
-# to load VTK's settings for an external project.
-@VTK_CONFIG_INSTALL_ONLY@
-
-# The set of VTK libraries
-SET(VTK_LIBRARIES "@VTK_LIBRARIES@")
-
-# The VTK include file directories.
-SET(VTK_INCLUDE_DIRS "@VTK_INCLUDE_DIRS_CONFIG@")
-
-# The VTK library directories.
-SET(VTK_LIBRARY_DIRS "@VTK_LIBRARY_DIRS_CONFIG@")
-
-# The VTK binary executable directories.  Note that if
-# VTK_CONFIGURATION_TYPES is set (see below) then these directories
-# will be the parent directories under which there will be a directory
-# of runtime binaries for each configuration type.
-SET(VTK_EXECUTABLE_DIRS "@VTK_EXECUTABLE_DIRS_CONFIG@")
-
-# The VTK runtime library directories.  Note that if
-# VTK_CONFIGURATION_TYPES is set (see below) then these directories
-# will be the parent directories under which there will be a directory
-# of runtime libraries for each configuration type.
-SET(VTK_RUNTIME_LIBRARY_DIRS "@VTK_RUNTIME_LIBRARY_DIRS_CONFIG@")
-
-# The runtime library path variable name e.g. LD_LIBRARY_PATH,
-# this environment variable should be set to VTK_RUNTIME_LIBRARY_DIRS
-SET(VTK_RUNTIME_PATH_VAR_NAME "@SHARED_LIBRARY_PATH_VAR_NAME@")
-
-# The C and C++ flags added by VTK to the cmake-configured flags.
-SET(VTK_REQUIRED_C_FLAGS "@VTK_REQUIRED_C_FLAGS@")
-SET(VTK_REQUIRED_CXX_FLAGS "@VTK_REQUIRED_CXX_FLAGS@")
-SET(VTK_REQUIRED_EXE_LINKER_FLAGS "@VTK_REQUIRED_EXE_LINKER_FLAGS@")
-SET(VTK_REQUIRED_SHARED_LINKER_FLAGS "@VTK_REQUIRED_SHARED_LINKER_FLAGS@")
-SET(VTK_REQUIRED_MODULE_LINKER_FLAGS "@VTK_REQUIRED_MODULE_LINKER_FLAGS@")
-
-# The VTK version number
-SET(VTK_MAJOR_VERSION "@VTK_MAJOR_VERSION@")
-SET(VTK_MINOR_VERSION "@VTK_MINOR_VERSION@")
-SET(VTK_BUILD_VERSION "@VTK_BUILD_VERSION@")
-
-# The location of the UseVTK.cmake file.
-SET(VTK_USE_FILE "@VTK_USE_FILE@")
-
-# The build settings file.
-SET(VTK_BUILD_SETTINGS_FILE "@VTK_BUILD_SETTINGS_FILE@")
-
-# The directory containing class list files for each kit.
-SET(VTK_KITS_DIR "@VTK_KITS_DIR_CONFIG@")
-
-# The wrapping hints file.
-SET(VTK_WRAP_HINTS "@VTK_WRAP_HINTS_CONFIG@")
-
-# CMake extension module directory and macro file.
-SET(VTK_LOAD_CMAKE_EXTENSIONS_MACRO "@VTK_LOAD_CMAKE_EXTENSIONS_MACRO_CONFIG@")
-SET(VTK_CMAKE_DIR "@VTK_CMAKE_DIR_CONFIG@")
-SET(VTK_CMAKE_EXTENSIONS_DIR "@VTK_CMAKE_EXTENSIONS_DIR_CONFIG@")
-
-# The list of available kits.
-SET(VTK_KITS "@VTK_KITS@")
-
-# The list of available languages.
-SET(VTK_LANGUAGES "@VTK_LANGUAGES@")
-
-# VTK Configuration options.
-SET(VTK_BUILD_SHARED_LIBS "@BUILD_SHARED_LIBS@")
-SET(VTK_DEBUG_LEAKS "@VTK_DEBUG_LEAKS@")
-SET(VTK_HAVE_VP1000 "@VTK_HAVE_VP1000@")
-SET(VTK_LEGACY_REMOVE "@VTK_LEGACY_REMOVE@")
-SET(VTK_LEGACY_SILENT "@VTK_LEGACY_SILENT@")
-SET(VTK_OPENGL_HAS_OSMESA "@VTK_OPENGL_HAS_OSMESA@")
-SET(VTK_USE_64BIT_IDS "@VTK_USE_64BIT_IDS@")
-SET(VTK_USE_ANSI_STDLIB "@VTK_USE_ANSI_STDLIB@")
-SET(VTK_USE_BOOST "@VTK_USE_BOOST@")
-SET(VTK_USE_QT "@VTK_USE_QT@")
-SET(VTK_USE_CARBON "@VTK_USE_CARBON@")
-SET(VTK_USE_CG_SHADERS "@VTK_USE_CG_SHADERS@")
-SET(VTK_USE_CHARTS "@VTK_USE_CHARTS@")
-SET(VTK_USE_CHEMISTRY "@VTK_USE_CHEMISTRY@")
-SET(VTK_USE_COCOA "@VTK_USE_COCOA@")
-SET(VTK_USE_GEOVIS "@VTK_USE_GEOVIS@")
-SET(VTK_USE_GL2PS "@VTK_USE_GL2PS@")
-SET(VTK_USE_GLSL_SHADERS "@VTK_USE_GLSL_SHADERS@")
-SET(VTK_USE_GNU_R "@VTK_USE_GNU_R@")
-SET(VTK_USE_GUISUPPORT "@VTK_USE_GUISUPPORT@")
-SET(VTK_USE_INFOVIS "@VTK_USE_INFOVIS@")
-SET(VTK_USE_MATLAB_MEX "@VTK_USE_MATLAB_MEX@")
-SET(VTK_USE_MATROX_IMAGING "@VTK_USE_MATROX_IMAGING@")
-SET(VTK_USE_METAIO "@VTK_USE_METAIO@")
-SET(VTK_USE_MFC "@VTK_USE_MFC@")
-SET(VTK_USE_MPI "@VTK_USE_MPI@")
-SET(VTK_USE_MYSQL "@VTK_USE_MYSQL@")
-SET(VTK_USE_N_WAY_ARRAYS "@VTK_USE_N_WAY_ARRAYS@")
-SET(VTK_USE_ODBC "@VTK_USE_ODBC@")
-SET(VTK_USE_PARALLEL "@VTK_USE_PARALLEL@")
-SET(VTK_USE_PARALLEL_BGL "@VTK_USE_PARALLEL_BGL@")
-SET(VTK_USE_POSTGRES "@VTK_USE_POSTGRES@") 
-SET(VTK_USE_QVTK "@VTK_USE_QVTK@")
-SET(VTK_USE_QVTK_OPENGL "@VTK_USE_QVTK_OPENGL@")
-SET(VTK_USE_RENDERING "@VTK_USE_RENDERING@")
-SET(VTK_USE_TDX "@VTK_USE_TDX@")
-SET(VTK_USE_TK "@VTK_USE_TK@")
-SET(VTK_USE_VIDEO_FOR_WINDOWS "@VTK_USE_VIDEO_FOR_WINDOWS@")
-SET(VTK_USE_VIEWS "@VTK_USE_VIEWS@")
-SET(VTK_USE_VOLUMEPRO_1000 "@VTK_USE_VOLUMEPRO_1000@")
-SET(VTK_USE_X "@VTK_USE_X@")
-SET(VTK_WRAP_JAVA "@VTK_WRAP_JAVA@")
-SET(VTK_WRAP_PYTHON "@VTK_WRAP_PYTHON@")
-SET(VTK_WRAP_TCL "@VTK_WRAP_TCL@")
-SET(VTK_WRAP_PYTHON_SIP "@VTK_WRAP_PYTHON_SIP@")
-
-# The Hybrid and VolumeRendering kits are now switched with Rendering.
-SET(VTK_USE_HYBRID "@VTK_USE_RENDERING@")
-SET(VTK_USE_VOLUMERENDERING "@VTK_USE_RENDERING@")
-
-# The MPI configuration
-SET(VTK_MPIRUN_EXE "@VTK_MPIRUN_EXE_CONFIG@")
-SET(VTK_MPI_CLIENT_POSTFLAGS "@VTK_MPI_CLIENT_POSTFLAGS_CONFIG@")
-SET(VTK_MPI_CLIENT_PREFLAGS "@VTK_MPI_CLIENT_PREFLAGS_CONFIG@")
-SET(VTK_MPI_MAX_NUMPROCS "@VTK_MPI_MAX_NUMPROCS_CONFIG@")
-SET(VTK_MPI_PRENUMPROC_FLAGS "@VTK_MPI_PRENUMPROC_FLAGS_CONFIG@")
-SET(VTK_MPI_NUMPROC_FLAG "@VTK_MPI_NUMPROC_FLAG_CONFIG@")
-SET(VTK_MPI_POSTFLAGS "@VTK_MPI_POSTFLAGS_CONFIG@")
-SET(VTK_MPI_PREFLAGS "@VTK_MPI_PREFLAGS_CONFIG@")
-SET(VTK_MPI_SERVER_POSTFLAGS "@VTK_MPI_SERVER_POSTFLAGS_CONFIG@")
-SET(VTK_MPI_SERVER_PREFLAGS "@VTK_MPI_SERVER_PREFLAGS_CONFIG@")
-SET(VTK_MPI_INCLUDE_DIR "@MPI_INCLUDE_PATH@")
-SET(VTK_MPI_LIBRARIES "@MPI_LIBRARY@;@MPI_EXTRA_LIBRARY@")
-
-# The Tcl/Tk configuration.
-SET(VTK_TCL_TK_STATIC "@VTK_TCL_TK_STATIC@")
-SET(VTK_TCL_TK_COPY_SUPPORT_LIBRARY "@VTK_TCL_TK_COPY_SUPPORT_LIBRARY@")
-SET(VTK_TCL_SUPPORT_LIBRARY_PATH "@VTK_TCL_SUPPORT_LIBRARY_PATH_CONFIG@")
-SET(VTK_TK_SUPPORT_LIBRARY_PATH "@VTK_TK_SUPPORT_LIBRARY_PATH_CONFIG@")
-SET(VTK_TCL_TK_MACROS_MODULE "@VTK_TCL_TK_MACROS_MODULE_CONFIG@")
-SET(VTK_TCL_HOME "@VTK_TCL_HOME_CONFIG@")
-IF (NOT CMAKE_CROSSCOMPILING)
-  SET(VTK_WRAP_TCL_EXE "@VTK_WRAP_TCL_EXE_CONFIG@")
-  SET(VTK_WRAP_TCL_INIT_EXE "@VTK_WRAP_TCL_INIT_EXE_CONFIG@")
-ENDIF (NOT CMAKE_CROSSCOMPILING)
-SET(VTK_TK_INTERNAL_DIR "@VTK_TK_INTERNAL_DIR_CONFIG@")
-SET(VTK_TK_RESOURCES_DIR "@VTK_TK_RESOURCES_DIR_CONFIG@")
-SET(VTK_TCL_INCLUDE_DIR "@TCL_INCLUDE_PATH@")
-SET(VTK_TCL_LIBRARY "@TCL_LIBRARY@")
-SET(VTK_TK_INCLUDE_DIR "@TK_INCLUDE_PATH@")
-SET(VTK_TK_LIBRARY "@TK_LIBRARY@")
-
-# The Java configuration.
-SET(VTK_JAVA_JAR "@VTK_JAVA_JAR_CONFIG@")
-IF (NOT CMAKE_CROSSCOMPILING)
-  SET(VTK_PARSE_JAVA_EXE "@VTK_PARSE_JAVA_EXE_CONFIG@")
-  SET(VTK_WRAP_JAVA_EXE "@VTK_WRAP_JAVA_EXE_CONFIG@")
-ENDIF (NOT CMAKE_CROSSCOMPILING)
-SET(VTK_JAVA_INCLUDE_DIR "@JAVA_INCLUDE_PATH@;@JAVA_INCLUDE_PATH2@")
-SET(VTK_JAVA_AWT_LIBRARY "@JAVA_AWT_LIBRARY@")
-SET(VTK_JVM_LIBRARY "@JAVA_JVM_LIBRARY@")
-
-# The Matlab configuration.
-SET(VTK_MATLAB_ROOT_DIR "@MATLAB_ROOT_DIR@")
-SET(VTK_MATLAB_INCLUDE_DIR "@MATLAB_INCLUDE_DIR@")
-SET(VTK_MATLAB_LIB_DIR "@MATLAB_LIB_DIR@")
-
-# The Python configuration.
-# If VTK_CONFIGURATION_TYPES is set (see below) then the VTK_PYTHONPATH_DIRS
-# will have subdirectories for each configuration type.
-SET(VTK_PYTHONPATH_DIRS "@VTK_PYTHONPATH_DIRS_CONFIG@")
-IF (NOT CMAKE_CROSSCOMPILING)
-  SET(VTK_WRAP_PYTHON_EXE "@VTK_WRAP_PYTHON_EXE_CONFIG@")
-  SET(VTK_WRAP_PYTHON_INIT_EXE "@VTK_WRAP_PYTHON_INIT_EXE_CONFIG@")
-ENDIF (NOT CMAKE_CROSSCOMPILING)
-SET(VTK_PYTHON_INCLUDE_DIR "@PYTHON_INCLUDE_DIR@")
-SET(VTK_PYTHON_LIBRARY "@PYTHON_LIBRARY@")
-
-# Other executables
-IF (NOT CMAKE_CROSSCOMPILING)
-  SET(VTK_ENCODESTRING_EXE "@VTK_ENCODESTRING_EXE_CONFIG@")
-ENDIF (NOT CMAKE_CROSSCOMPILING)
-
-# The Doxygen configuration.
-SET(VTK_DOXYGEN_HOME "@VTK_DOXYGEN_HOME_CONFIG@")
-
-# The VTK test script locations.
-SET(VTK_HEADER_TESTING_PY "@VTK_HEADER_TESTING_PY_CONFIG@")
-SET(VTK_FIND_STRING_TCL "@VTK_FIND_STRING_TCL_CONFIG@")
-SET(VTK_PRINT_SELF_CHECK_TCL "@VTK_PRINT_SELF_CHECK_TCL_CONFIG@")
-SET(VTK_RT_IMAGE_TEST_TCL "@VTK_RT_IMAGE_TEST_TCL_CONFIG@")
-SET(VTK_PRT_IMAGE_TEST_TCL "@VTK_PRT_IMAGE_TEST_TCL_CONFIG@")
-
-# The names of utility libraries used by VTK.
-SET(VTK_PNG_LIBRARIES        "@VTK_PNG_LIBRARIES@")
-SET(VTK_PNG__INCLUDE_DIR     "@VTK_PNG__INCLUDE_DIR@")
-SET(VTK_ZLIB_LIBRARIES       "@VTK_ZLIB_LIBRARIES@")
-SET(VTK_ZLIB_INCLUDE_DIR     "@VTK_ZLIB_INCLUDE_DIR@")
-SET(VTK_JPEG_LIBRARIES       "@VTK_JPEG_LIBRARIES@")
-SET(VTK_JPEG_INCLUDE_DIR     "@VTK_JPEG_INCLUDE_DIR@")
-SET(VTK_TIFF_LIBRARIES       "@VTK_TIFF_LIBRARIES@")
-SET(VTK_TIFF_INCLUDE_DIR     "@VTK_TIFF_INCLUDE_DIR@")
-SET(VTK_EXPAT_LIBRARIES      "@VTK_EXPAT_LIBRARIES@")
-SET(VTK_EXPAT_INCLUDE_DIR    "@VTK_EXPAT_INCLUDE_DIR@")
-SET(VTK_FREETYPE_LIBRARIES   "@VTK_FREETYPE_LIBRARIES@")
-SET(VTK_FREETYPE_INCLUDE_DIR "@VTK_FREETYPE_INCLUDE_DIR@")
-SET(VTK_LIBXML2_LIBRARIES    "@VTK_LIBXML2_LIBRARIES@")
-SET(VTK_LIBXML2_INCLUDE_DIR  "@VTK_LIBXML2_INCLUDE_DIR@")
-SET(VTK_LIBPROJ4_LIBRARIES   "@VTK_LIBPROJ4_LIBRARIES@")
-SET(VTK_LIBPROJ4_INCLUDE_DIR "@VTK_LIBPROJ4_INCLUDE_DIR@")
-SET(VTK_HDF5_LIBRARIES       "@VTK_HDF5_LIBRARIES@")
-SET(VTK_HDF5_INCLUDE_DIR     "@VTK_HDF5_INCLUDE_DIR@")
-
-# The VTK Qt configuration.
-IF(VTK_USE_QVTK)
-  INCLUDE(${VTK_DIR}/VTKConfigQt.cmake)
-ENDIF(VTK_USE_QVTK)
-
-# Relative install paths in the VTK install tree
-SET(VTK_INSTALL_BIN_DIR "@VTK_INSTALL_BIN_DIR@")
-SET(VTK_INSTALL_INCLUDE_DIR "@VTK_INSTALL_INCLUDE_DIR@")
-SET(VTK_INSTALL_LIB_DIR "@VTK_INSTALL_LIB_DIR@")
-SET(VTK_INSTALL_PACKAGE_DIR "@VTK_INSTALL_PACKAGE_DIR@")
-
-# A VTK install tree always provides one build configuration.  A VTK
-# build tree may provide either one or multiple build configurations
-# depending on the CMake generator used.  Since VTK can be used either
-# from a build tree or an install tree it is useful for outside
-# projects to know the configurations available.  If this
-# VTKConfig.cmake is in a VTK install tree VTK_CONFIGURATION_TYPES
-# will be empty and VTK_BUILD_TYPE will be set to the value of
-# CMAKE_BUILD_TYPE used to build VTK.  If VTKConfig.cmake is in a VTK
-# build tree then VTK_CONFIGURATION_TYPES and VTK_BUILD_TYPE will have
-# values matching CMAKE_CONFIGURATION_TYPES and CMAKE_BUILD_TYPE for
-# that build tree (only one will ever be set).
-SET(VTK_CONFIGURATION_TYPES @VTK_CONFIGURATION_TYPES_CONFIG@)
-SET(VTK_BUILD_TYPE @VTK_BUILD_TYPE_CONFIG@)
-
-# The VTK targets file.
-IF(NOT VTK_INSTALL_EXPORT_NAME AND NOT TARGET vtkCommon
-   AND EXISTS "@VTK_TARGETS_FILE@")
-  INCLUDE("@VTK_TARGETS_FILE@")
-ENDIF()
-
-# The old, less clear name for VTK_RUNTIME_LIBRARY_DIRS.  Kept here
-# for compatibility.
-SET(VTK_RUNTIME_DIRS ${VTK_RUNTIME_LIBRARY_DIRS})
-
-# The name of the encoders used by VTK
-SET( VTK_USE_FFMPEG_ENCODER "@VTK_USE_FFMPEG_ENCODER@" )
-SET( VTK_USE_OGGTHEORA_ENCODER "@VTK_USE_OGGTHEORA_ENCODER@")
-
-@VTK_CONFIG_BACKWARD_COMPATIBILITY_HACK@
diff --git a/Views/CMakeLists.txt b/Views/CMakeLists.txt
deleted file mode 100644
index 9e2e0360c34c4d9991994b6cb00fcd7e7f2ab815..0000000000000000000000000000000000000000
--- a/Views/CMakeLists.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-SET(KIT Views)
-SET(UKIT VIEWS)
-SET(KIT_TCL_LIBS vtkInfovisTCL)
-SET(KIT_PYTHON_LIBS vtkInfovisPythonD)
-SET(KIT_JAVA_LIBS vtkInfovisJava)
-SET(KIT_INTERFACE_LIBRARIES vtkInfovis)
-
-SET( Kit_SRCS
-vtkConvertSelectionDomain.cxx
-vtkDataRepresentation.cxx
-vtkEmptyRepresentation.cxx
-vtkGraphLayoutView.cxx
-vtkHierarchicalGraphPipeline.cxx
-vtkHierarchicalGraphView.cxx
-vtkIcicleView.cxx
-vtkInteractorStyleAreaSelectHover.cxx
-vtkInteractorStyleTreeMapHover.cxx
-vtkRenderedSurfaceRepresentation.cxx
-vtkRenderedGraphRepresentation.cxx
-vtkRenderedRepresentation.cxx
-vtkRenderedTreeAreaRepresentation.cxx
-vtkRenderedHierarchyRepresentation.cxx
-vtkRenderView.cxx
-vtkRenderViewBase.cxx
-vtkTreeAreaView.cxx
-vtkTreeMapView.cxx
-vtkTreeRingView.cxx
-vtkView.cxx
-vtkViewUpdater.cxx
-)
-
-IF(VTK_USE_N_WAY_ARRAYS)
-  SET(Kit_SRCS
-    ${Kit_SRCS}
-    vtkParallelCoordinatesHistogramRepresentation.cxx
-    vtkParallelCoordinatesRepresentation.cxx
-    vtkParallelCoordinatesView.cxx
-    )
-
-  IF(VTK_USE_BOOST)
-    INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
-    SET(Kit_SRCS
-      ${Kit_SRCS}
-      vtkPipelineGraphSource.cxx
-      )
-  ENDIF(VTK_USE_BOOST)
-
-ENDIF(VTK_USE_N_WAY_ARRAYS)
-
-#SET_SOURCE_FILES_PROPERTIES(
-#vtkView.cxx
-#ABSTRACT
-#)
-
-SET(Kit_EXTRA_SRCS)
-SET(Kit_EXTRA_CMDS)
-SET(Kit_TCL_EXTRA_SRCS)
-SET(Kit_PYTHON_EXTRA_SRCS)
-SET(Kit_JAVA_EXTRA_SRCS)
-SET(KIT_TCL_DEPS)
-SET(KIT_PYTHON_DEPS)
-SET(KIT_JAVA_DEPS)
-
-#-----------------------------------------------------------------------------
-# Include CMake code common to all kits.
-INCLUDE(${VTK_CMAKE_DIR}/KitCommonBlock.cmake)
-#-----------------------------------------------------------------------------
diff --git a/Views/Testing/CMakeLists.txt b/Views/Testing/CMakeLists.txt
deleted file mode 100644
index 857c125c150edae63f30016a0511ebb7cd0a7a8d..0000000000000000000000000000000000000000
--- a/Views/Testing/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ADD_SUBDIRECTORY(Cxx)
-
-IF (VTK_WRAP_TCL)
-  ADD_SUBDIRECTORY(Tcl)
-ENDIF (VTK_WRAP_TCL)
-
-#IF (VTK_WRAP_PYTHON)
-#  ADD_SUBDIRECTORY(Python)
-#ENDIF (VTK_WRAP_PYTHON)
-
-IF(PYTHON_EXECUTABLE)
-  ADD_TEST(HeaderTesting-Views ${PYTHON_EXECUTABLE}
-    ${VTK_SOURCE_DIR}/Common/Testing/HeaderTesting.py
-    "${VTK_SOURCE_DIR}/Views"
-    VTK_VIEWS_EXPORT
-    vtkPipelineGraphSource.h
-    )
-ENDIF(PYTHON_EXECUTABLE)
diff --git a/Views/Testing/Cxx/CMakeLists.txt b/Views/Testing/Cxx/CMakeLists.txt
deleted file mode 100644
index ab49d8c43df193591663bbf92e52665008f341c3..0000000000000000000000000000000000000000
--- a/Views/Testing/Cxx/CMakeLists.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-# if we have rendering add the following tests
-IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-  SET(KIT Views)
-  # add tests that do not require data
-  SET(MyTests
-    TestRenderView.cxx
-    TestInteractorStyleTreeMapHover
-    )
-  IF (VTK_DATA_ROOT)
-    # add tests that require data
-    SET(MyTests ${MyTests}
-      TestCoincidentGraphLayoutView.cxx
-      TestGraphLayoutView.cxx
-      TestHierarchicalGraphView.cxx
-      TestIconGlyphFilter.cxx
-      TestTreeMapView.cxx
-      TestTreeRingView.cxx
-      TestIcicleView.cxx
-      TestConeLayoutStrategy.cxx
-      TestSpanTreeLayoutStrategy.cxx
-      )
-
-    IF (VTK_USE_QT)
-      #add tests that require Qt
-      INCLUDE(${QT_USE_FILE})
-
-      SET(MyTests ${MyTests}
-        TestQtTreeRingLabeler.cxx
-        )
-    ENDIF(VTK_USE_QT)
-    
-    # Add these classes only if vtkTypeUInt64Array exists
-    IF(VTK_HAS_UINT64_ARRAY)
-      SET(MyTests ${MyTests}
-        TestNetworkViews.cxx
-        )
-    ENDIF(VTK_HAS_UINT64_ARRAY)
-  ENDIF (VTK_DATA_ROOT)
-  CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx ${MyTests}
-    EXTRA_INCLUDE vtkTestDriver.h)
-  ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
-  TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkViews)
-
-  IF(VTK_USE_QT)
-    TARGET_LINK_LIBRARIES(${KIT}CxxTests ${QT_LIBRARIES})
-  ENDIF(VTK_USE_QT)
-
-  SET (TestsToRun ${Tests})
-  REMOVE (TestsToRun ${KIT}CxxTests.cxx)
-  
-  #
-  # Add all the executables 
-  FOREACH (test ${TestsToRun})
-    GET_FILENAME_COMPONENT(TName ${test} NAME_WE)
-    IF (VTK_DATA_ROOT)
-      ADD_TEST(Views-${TName} ${CXX_TEST_PATH}/${KIT}CxxTests ${TName}
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
-        -V Baseline/${KIT}/${TName}.png)
-    ELSE (VTK_DATA_ROOT)
-      ADD_TEST(Views-${TName} ${CXX_TEST_PATH}/${KIT}CxxTests ${TName}) 
-    ENDIF (VTK_DATA_ROOT)
-  ENDFOREACH (test) 
-ENDIF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
diff --git a/Views/Testing/Tcl/CMakeLists.txt b/Views/Testing/Tcl/CMakeLists.txt
deleted file mode 100644
index 36c8d022cedf980fa1448b77b2a0fb46fa302832..0000000000000000000000000000000000000000
--- a/Views/Testing/Tcl/CMakeLists.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-  
-  #
-  # Add tests, with the data
-  #
-  IF (VTK_DATA_ROOT)
-
-    FOREACH ( tfile
-      )
-      ADD_TEST(${tfile}-image ${VTK_EXECUTABLE}
-        ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-        ${VTK_SOURCE_DIR}/Views/Testing/Tcl/${tfile}.tcl
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
-        -V Baseline/Views/${tfile}.png
-        -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-    ENDFOREACH ( tfile )
-
-  #
-  # If we do not have the data, still run the tests that we can
-  #
-  ELSE (VTK_DATA_ROOT)
-    FOREACH ( tfile
-      )
-      ADD_TEST(${tfile} ${VTK_EXECUTABLE}
-        ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-        ${VTK_SOURCE_DIR}/Views/Testing/Tcl/${tfile}.tcl
-        -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-    ENDFOREACH ( tfile )
-  ENDIF (VTK_DATA_ROOT)
-
-ENDIF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-
-ADD_TEST(PrintSelf-Views ${TCL_TCLSH}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/PrintSelfCheck.tcl  
-         ${VTK_SOURCE_DIR}/Views)
-
-ADD_TEST(TestSetObjectMacro-Views ${TCL_TCLSH}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/FindString.tcl
-         "${VTK_SOURCE_DIR}/Views/vtk\\\\*.h"
-         "vtkSetObjectMacro"
-         )
diff --git a/VolumeRendering/Testing/CMakeLists.txt b/VolumeRendering/Testing/CMakeLists.txt
deleted file mode 100644
index 792347db224cd0297fd6a582a15cefb503a9bd25..0000000000000000000000000000000000000000
--- a/VolumeRendering/Testing/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-ADD_SUBDIRECTORY(Cxx)
-
-IF (VTK_WRAP_TCL)
-  ADD_SUBDIRECTORY(Tcl)
-ENDIF (VTK_WRAP_TCL)
-
-IF (VTK_WRAP_PYTHON)
-  ADD_SUBDIRECTORY(Python)
-ENDIF (VTK_WRAP_PYTHON)
-
-IF(PYTHON_EXECUTABLE)
-  ADD_TEST(HeaderTesting-VolumeRendering ${PYTHON_EXECUTABLE}
-    ${VTK_SOURCE_DIR}/Common/Testing/HeaderTesting.py
-    "${VTK_SOURCE_DIR}/VolumeRendering"
-    VTK_VOLUMERENDERING_EXPORT
-    )
-ENDIF(PYTHON_EXECUTABLE)
diff --git a/VolumeRendering/Testing/Cxx/CMakeLists.txt b/VolumeRendering/Testing/Cxx/CMakeLists.txt
deleted file mode 100644
index fbf76065f8701e9ad38e736e22e1f89438afa118..0000000000000000000000000000000000000000
--- a/VolumeRendering/Testing/Cxx/CMakeLists.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-# if we are using the display add the tests
-IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-  SET(KIT VolumeRendering)
-  # add tests that do not require data
-  SET(MyTests)
-  IF (VTK_DATA_ROOT)
-    # add tests that require data
-    SET(MyTests
-      HomogeneousRayIntegration.cxx
-      LinearRayIntegration.cxx
-      PartialPreIntegration.cxx
-      PreIntegrationIncremental.cxx
-      PreIntegrationNonIncremental.cxx
-      ProjectedTetrahedraZoomIn.cxx
-      TestFinalColorWindowLevel.cxx
-      TestFixedPointRayCastLightComponents.cxx
-      TestGPURayCastAdditive.cxx
-      TestGPURayCastCompositeMaskBlend.cxx
-      TestGPURayCastCompositeMask.cxx
-      TestGPURayCastCompositeBinaryMask.cxx
-      TestGPURayCastCompositeShadeMask.cxx
-      TestGPURayCastCompositeToMIP.cxx
-      TestGPURayCastCropping.cxx
-      TestGPURayCastDataTypesMinIP.cxx
-      TestGPURayCastMIPBinaryMask.cxx
-      TestGPURayCastDataTypesMIP.cxx
-      TestGPURayCastFourComponentsComposite.cxx
-      TestGPURayCastFourComponentsCompositeStreaming.cxx
-      TestGPURayCastFourComponentsMinIP.cxx
-      TestGPURayCastFourComponentsMIP.cxx
-      TestGPURayCastMIPToComposite.cxx
-      TestGPURayCastNearestDataTypesMIP.cxx
-      TestGPURayCastPerspectiveParallel.cxx
-      #TestHAVSVolumeMapper.cxx
-      TestMinIntensityRendering.cxx
-      TestProjectedTetrahedra.cxx
-      TestProjectedHexahedra.cxx
-      TestProp3DFollower.cxx
-      TestSmartVolumeMapper.cxx
-      TestSmartVolumeMapperWindowLevel.cxx
-      TestTM3DLightComponents.cxx
-      volProt.cxx
-      ZsweepConcavities.cxx
-      )
-    SET(MyTestSupport
-      ExerciseUnstructuredGridRayCastMapper.cxx
-      )
-  ENDIF (VTK_DATA_ROOT)
-
-  # use the testing interactor.
-  INCLUDE(${VTK_SOURCE_DIR}/Rendering/vtkTestingObjectFactory.cmake)
-
-  # Force to not enable floating point exception as we hit some exception
-  # inside the OpenGL driver at vtkgl::LinkProgram() (nVidia 185.18.36).
-  set(CMAKE_TESTDRIVER_BEFORE_TESTMAIN "${CMAKE_TESTDRIVER_BEFORE_TESTMAIN}
-    try {")
-
-  ADD_EXECUTABLE(${KIT}CxxTests ${Tests} ${MyTestSupport} )
-  TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkVolumeRendering)
-  SET (TestsToRun ${Tests})
-  REMOVE (TestsToRun ${KIT}CxxTests.cxx)
-
-  #
-  # Add all the executables
-  FOREACH (test ${TestsToRun})
-    GET_FILENAME_COMPONENT(TName ${test} NAME_WE)
-    IF (VTK_DATA_ROOT)
-      ADD_TEST(${TName} ${CXX_TEST_PATH}/${KIT}CxxTests ${TName}
-          -D ${VTK_DATA_ROOT}
-          -T ${VTK_BINARY_DIR}/Testing/Temporary
-          -V Baseline/${KIT}/${TName}.png)
-    ELSE (VTK_DATA_ROOT)
-      ADD_TEST(${TName} ${CXX_TEST_PATH}/${KIT}CxxTests ${TName})
-    ENDIF (VTK_DATA_ROOT)
-  ENDFOREACH (test)
-ENDIF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
diff --git a/VolumeRendering/Testing/Python/CMakeLists.txt b/VolumeRendering/Testing/Python/CMakeLists.txt
deleted file mode 100644
index fe007187c309a2139e93c9fd1e2b5e8d8f9084c4..0000000000000000000000000000000000000000
--- a/VolumeRendering/Testing/Python/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-INCLUDE(${VTK_SOURCE_DIR}/Utilities/vtkTclTest2Py/vtkConvertTclTestToPy.cmake)
-IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-  #
-  # Add tests, with the data
-  #
-  IF (VTK_DATA_ROOT)
-    IF (VTK_PYTHON_EXE)
-      # Add test converted from Tcl
-      SET( tests
-        gaussian
-        TestBunykRayCastFunction
-        #TestFixedPointRayCasterLinear -- source file
-        TestFixedPointRayCasterNearest
-        #TestFixedPointRayCasterLinearCropped -- source file
-        #TestFixedPointRayCasterNearestCropped -- source file
-        TestLODProp3D
-        TestPTZSweep
-        volRCClipPlanes
-        volRCCropRegions
-        volRCRotateClip
-        volTM2DCropRegions
-        volTM2DRotateClip
-        #VolumePicker
-        )
-
-      CONVERT_TCL_TEST_TO_PY (
-        tests
-        VolumeRendering)
-
-     
-
-    ENDIF (VTK_PYTHON_EXE)
-  ENDIF (VTK_DATA_ROOT)
-ENDIF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
diff --git a/VolumeRendering/Testing/Tcl/CMakeLists.txt b/VolumeRendering/Testing/Tcl/CMakeLists.txt
deleted file mode 100644
index 257e3b557ce7fe302721734827faa37e5314fb1b..0000000000000000000000000000000000000000
--- a/VolumeRendering/Testing/Tcl/CMakeLists.txt
+++ /dev/null
@@ -1,102 +0,0 @@
-IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-
-  #
-  # Add tests, with the data
-  #
-  IF (VTK_DATA_ROOT)
-    FOREACH ( tfile
-      gaussian
-      TestBunykRayCastFunction
-      TestFixedPointRayCasterLinear
-      TestFixedPointRayCasterNearest
-      TestFixedPointRayCasterLinearCropped
-      TestFixedPointRayCasterNearestCropped
-      TestLODProp3D
-      TestPTZSweep
-      volRCClipPlanes
-      volRCCropRegions
-      volRCRotateClip
-      volTM2DCropRegions
-      volTM2DRotateClip
-      volTM3DCompressedCropRegions
-      volTM3DCropRegions
-      volTM3DRotateClip
-      VolumeOutlineSource
-      VolumeOutlineSourceClipped
-      VolumePicker
-      VolumePickerCrop
-    )
-      ADD_TEST(${tfile}-image ${VTK_EXECUTABLE}
-        ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-        ${VTK_SOURCE_DIR}/VolumeRendering/Testing/Tcl/${tfile}.tcl
-        -D ${VTK_DATA_ROOT}
-        -V Baseline/VolumeRendering/${tfile}.png
-        -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-    ENDFOREACH( tfile )
-    IF(VTK_USE_TK)
-      ADD_TEST(imageCursor3D-image ${VTK_EXECUTABLE}
-        ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-        ${VTK_SOURCE_DIR}/VolumeRendering/Testing/Tcl/cursor3D.tcl
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
-        -V Baseline/VolumeRendering/cursor3D.png
-        -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-      IF (VTK_USE_VOLUMEPRO_1000)
-        ADD_TEST(imageCursor3DVP-image ${VTK_EXECUTABLE}
-          ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-          ${VTK_SOURCE_DIR}/VolumeRendering/Testing/Tcl/cursor3DVP.tcl
-          -D ${VTK_DATA_ROOT}
-          -T ${VTK_BINARY_DIR}/Testing/Temporary
-          -V Baseline/VolumeRendering/cursor3D.png
-          -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-      ENDIF (VTK_USE_VOLUMEPRO_1000)
-    ENDIF(VTK_USE_TK)
-    IF (VTK_USE_VOLUMEPRO_1000)
-      ADD_TEST(gaussianVP-image ${VTK_EXECUTABLE}
-        ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-        ${VTK_SOURCE_DIR}/VolumeRendering/Testing/Tcl/gaussianVP.tcl
-        -D ${VTK_DATA_ROOT}
-        -V Baseline/VolumeRendering/gaussianVP.png
-        -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-      ADD_TEST(volVPClipPlanes-image ${VTK_EXECUTABLE}
-        ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-        ${VTK_SOURCE_DIR}/VolumeRendering/Testing/Tcl/volVPClipPlanes.tcl
-        -D ${VTK_DATA_ROOT}
-        -V Baseline/VolumeRendering/volVPClipPlanes.png
-        -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-      ADD_TEST(volVPCropRegions-image ${VTK_EXECUTABLE}
-        ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-        ${VTK_SOURCE_DIR}/VolumeRendering/Testing/Tcl/volVPCropRegions.tcl
-        -D ${VTK_DATA_ROOT}
-        -V Baseline/VolumeRendering/volVPCropRegions.png
-        -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-      ADD_TEST(volVPGradientOpacity-image ${VTK_EXECUTABLE}
-        ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-        ${VTK_SOURCE_DIR}/VolumeRendering/Testing/Tcl/volVPGradientOpacity.tcl
-        -D ${VTK_DATA_ROOT}
-        -V Baseline/VolumeRendering/volVPGradientOpacity.png
-        -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-      ADD_TEST(volVPMipmap-image ${VTK_EXECUTABLE}
-        ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-        ${VTK_SOURCE_DIR}/VolumeRendering/Testing/Tcl/volVPMipmap.tcl
-        -D ${VTK_DATA_ROOT}
-        -V Baseline/VolumeRendering/volVPMipmap.png
-        -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-    ENDIF (VTK_USE_VOLUMEPRO_1000)
-  #
-  # If we do not have the data, still run the tests that we can
-  #
-  ELSE (VTK_DATA_ROOT)
-  ENDIF (VTK_DATA_ROOT)
-
-ENDIF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
-
-ADD_TEST(PrintSelf-VolumeRendering ${TCL_TCLSH}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/PrintSelfCheck.tcl  
-         ${VTK_SOURCE_DIR}/VolumeRendering)
-
-ADD_TEST(TestSetObjectMacro-VolumeRendering ${TCL_TCLSH}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/FindString.tcl
-         "${VTK_SOURCE_DIR}/VolumeRendering/vtk\\\\*.h"
-         "vtkSetObjectMacro"
-         )
diff --git a/Widgets/CMakeLists.txt b/Widgets/CMakeLists.txt
deleted file mode 100644
index 6dc58ef13fdb8fc7d1c30a4c124c6e21f8a272f0..0000000000000000000000000000000000000000
--- a/Widgets/CMakeLists.txt
+++ /dev/null
@@ -1,180 +0,0 @@
-SET(KIT Widgets)
-SET(UKIT WIDGETS)
-
-SET(KIT_TCL_LIBS vtkRenderingTCL vtkHybridTCL)
-SET(KIT_PYTHON_LIBS vtkRenderingPythonD vtkHybridPythonD)
-SET(KIT_JAVA_LIBS vtkRenderingJava vtkHybridJava)
-SET(KIT_INTERFACE_LIBRARIES vtkRendering vtkHybrid vtkVolumeRendering)
-SET(KIT_LIBS ${OPENGL_gl_LIBRARY})
-
-IF (VTK_OPENGL_HAS_OSMESA AND OSMESA_LIBRARY)
-  SET (KIT_LIBS ${KIT_LIBS} ${OSMESA_LIBRARY} )
-ENDIF (VTK_OPENGL_HAS_OSMESA AND OSMESA_LIBRARY)
-
-SET ( Kit_SRCS
-vtk3DWidget.cxx
-vtkAbstractWidget.cxx
-vtkAffineRepresentation.cxx
-vtkAffineRepresentation2D.cxx
-vtkAffineWidget.cxx
-vtkAngleRepresentation.cxx
-vtkAngleRepresentation2D.cxx
-vtkAngleRepresentation3D.cxx
-vtkAngleWidget.cxx
-vtkAxesTransformWidget.cxx
-vtkAxesTransformRepresentation.cxx
-vtkBalloonRepresentation.cxx
-vtkBalloonWidget.cxx
-vtkBezierContourLineInterpolator.cxx
-vtkBiDimensionalRepresentation.cxx
-vtkBiDimensionalRepresentation2D.cxx
-vtkBiDimensionalWidget.cxx
-vtkBorderRepresentation.cxx
-vtkBorderWidget.cxx
-vtkBoundedPlanePointPlacer.cxx
-vtkBoxRepresentation.cxx
-vtkBoxWidget.cxx
-vtkBoxWidget2.cxx
-vtkBrokenLineWidget.cxx
-vtkButtonRepresentation.cxx
-vtkButtonWidget.cxx
-vtkCameraRepresentation.cxx
-vtkCameraWidget.cxx
-vtkCaptionRepresentation.cxx
-vtkCaptionWidget.cxx
-vtkCellCentersPointPlacer.cxx
-vtkCenteredSliderRepresentation.cxx
-vtkCenteredSliderWidget.cxx
-vtkContinuousValueWidget.cxx
-vtkContinuousValueWidgetRepresentation.cxx
-vtkContourLineInterpolator.cxx
-vtkContourRepresentation.cxx
-vtkFocalPlaneContourRepresentation.cxx
-vtkContourWidget.cxx
-vtkCheckerboardRepresentation.cxx
-vtkCheckerboardWidget.cxx
-vtkConstrainedPointHandleRepresentation.cxx
-vtkDijkstraImageContourLineInterpolator.cxx
-vtkDistanceWidget.cxx
-vtkDistanceRepresentation.cxx
-vtkDistanceRepresentation2D.cxx
-vtkDistanceRepresentation3D.cxx
-vtkEllipsoidTensorProbeRepresentation.cxx
-vtkEvent.cxx
-vtkFixedSizeHandleRepresentation3D.cxx
-vtkFocalPlanePointPlacer.cxx
-vtkHandleRepresentation.cxx
-vtkHandleWidget.cxx
-vtkHoverWidget.cxx
-vtkImageActorPointPlacer.cxx
-vtkImageCroppingRegionsWidget.cxx
-vtkImageOrthoPlanes.cxx
-vtkImagePlaneWidget.cxx
-vtkImageTracerWidget.cxx
-vtkImplicitPlaneRepresentation.cxx
-vtkImplicitPlaneWidget.cxx
-vtkImplicitPlaneWidget2.cxx
-vtkLinearContourLineInterpolator.cxx
-vtkLineRepresentation.cxx
-vtkLineWidget.cxx
-vtkLineWidget2.cxx
-vtkLogoRepresentation.cxx
-vtkLogoWidget.cxx
-vtkOrientationMarkerWidget.cxx
-vtkOrientedGlyphContourRepresentation.cxx
-vtkOrientedGlyphFocalPlaneContourRepresentation.cxx
-vtkParallelopipedRepresentation.cxx
-vtkParallelopipedWidget.cxx
-vtkClosedSurfacePointPlacer.cxx
-vtkPlaneWidget.cxx
-vtkPlaybackRepresentation.cxx
-vtkPlaybackWidget.cxx
-vtkPointHandleRepresentation2D.cxx
-vtkPointHandleRepresentation3D.cxx
-vtkPointPlacer.cxx
-vtkPointWidget.cxx
-vtkPolyDataSourceWidget.cxx
-vtkPolyDataPointPlacer.cxx
-vtkAbstractPolygonalHandleRepresentation3D.cxx
-vtkPolygonalHandleRepresentation3D.cxx
-vtkOrientedPolygonalHandleRepresentation3D.cxx
-vtkPolygonalSurfacePointPlacer.cxx
-vtkPolyDataContourLineInterpolator.cxx
-vtkPolygonalSurfaceContourLineInterpolator.cxx
-vtkProp3DButtonRepresentation.cxx
-vtkRectilinearWipeRepresentation.cxx
-vtkRectilinearWipeWidget.cxx
-vtkResliceCursorThickLineRepresentation.cxx
-vtkResliceCursorLineRepresentation.cxx
-vtkResliceCursorRepresentation.cxx
-vtkResliceCursorWidget.cxx
-vtkResliceImageViewer.cxx
-vtkResliceImageViewerMeasurements.cxx
-vtkScalarBarRepresentation.cxx
-vtkScalarBarWidget.cxx
-vtkSeedRepresentation.cxx
-vtkSeedWidget.cxx
-vtkSliderRepresentation.cxx
-vtkSliderRepresentation2D.cxx
-vtkSliderRepresentation3D.cxx
-vtkSliderWidget.cxx
-vtkSphereHandleRepresentation.cxx
-vtkSphereRepresentation.cxx
-vtkSphereWidget.cxx
-vtkSphereWidget2.cxx
-vtkSplineRepresentation.cxx
-vtkSplineWidget.cxx
-vtkSplineWidget2.cxx
-vtkTensorProbeWidget.cxx
-vtkTensorProbeRepresentation.cxx
-vtkTerrainDataPointPlacer.cxx
-vtkTerrainContourLineInterpolator.cxx
-vtkTextRepresentation.cxx
-vtkTexturedButtonRepresentation.cxx
-vtkTexturedButtonRepresentation2D.cxx
-vtkTextWidget.cxx
-vtkWidgetCallbackMapper.cxx
-vtkWidgetEvent.cxx
-vtkWidgetEventTranslator.cxx
-vtkWidgetRepresentation.cxx
-vtkWidgetSet.cxx
-vtkXYPlotWidget.cxx
-)
-
-SET_SOURCE_FILES_PROPERTIES(
-vtk3DWidget
-vtkAbstractWidget
-vtkAbstractPolygonalHandleRepresentation3D
-vtkAffineRepresentation
-vtkAngleRepresentation
-vtkBiDimensionalRepresentation
-vtkButtonRepresentation
-vtkContinuousValueWidget
-vtkContinuousValueWidgetRepresentation
-vtkContourLineInterpolator
-vtkContourRepresentation
-vtkFocalPlaneContourRepresentation
-vtkDistanceRepresentation
-vtkHandleRepresentation
-vtkPolyDataContourLineInterpolator
-vtkPolyDataSourceWidget
-vtkResliceCursorRepresentation
-vtkSliderRepresentation
-vtkTensorProbeRepresentation
-vtkWidgetRepresentation
-ABSTRACT
-)
-
-SET(Kit_EXTRA_SRCS)
-SET(Kit_EXTRA_CMDS)
-SET(Kit_TCL_EXTRA_SRCS)
-SET(Kit_PYTHON_EXTRA_SRCS)
-SET(Kit_JAVA_EXTRA_SRCS)
-SET(KIT_TCL_DEPS)
-SET(KIT_PYTHON_DEPS)
-SET(KIT_JAVA_DEPS)
-
-#-----------------------------------------------------------------------------
-# Include CMake code common to all kits.
-INCLUDE(${VTK_CMAKE_DIR}/KitCommonBlock.cmake)
-#-----------------------------------------------------------------------------
diff --git a/Widgets/Testing/CMakeLists.txt b/Widgets/Testing/CMakeLists.txt
deleted file mode 100644
index bef856941a235744e7cd3164c1769c93578a8e82..0000000000000000000000000000000000000000
--- a/Widgets/Testing/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-ADD_SUBDIRECTORY(Cxx)
-
-IF (VTK_WRAP_TCL)
-  ADD_SUBDIRECTORY(Tcl)
-ENDIF (VTK_WRAP_TCL)
-
-IF (VTK_WRAP_PYTHON)
-  ADD_SUBDIRECTORY(Python)
-ENDIF (VTK_WRAP_PYTHON)
-
-IF(PYTHON_EXECUTABLE)
-  ADD_TEST(HeaderTesting-Widgets ${PYTHON_EXECUTABLE}
-           ${VTK_SOURCE_DIR}/Common/Testing/HeaderTesting.py
-           "${VTK_SOURCE_DIR}/Widgets"
-           VTK_WIDGETS_EXPORT
-           )
-ENDIF(PYTHON_EXECUTABLE)
diff --git a/Widgets/Testing/Python/CMakeLists.txt b/Widgets/Testing/Python/CMakeLists.txt
deleted file mode 100644
index a4b20632343e1a3372b105fb86c363d0fe2f44ba..0000000000000000000000000000000000000000
--- a/Widgets/Testing/Python/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Add tests, with the data
-#
-IF (VTK_PYTHON_EXE AND VTK_USE_RENDERING AND VTK_DATA_ROOT AND 
-    VTK_USE_DISPLAY)
-  FOREACH ( tfile
-      TestImagePlaneWidget
-      )
-    ADD_TEST(${tfile}Python-image ${VTK_PYTHON_EXE}
-             ${VTK_SOURCE_DIR}/Widgets/Testing/Python/${tfile}.py
-             -D ${VTK_DATA_ROOT}
-             -B ${VTK_DATA_ROOT}/Baseline/Widgets
-             )                   
-  ENDFOREACH( tfile )
-ENDIF (VTK_PYTHON_EXE AND VTK_USE_RENDERING AND VTK_DATA_ROOT AND 
-       VTK_USE_DISPLAY)
diff --git a/Widgets/Testing/Tcl/CMakeLists.txt b/Widgets/Testing/Tcl/CMakeLists.txt
deleted file mode 100644
index 0dd05c8992619080d303e36cc63f3b4b1767905c..0000000000000000000000000000000000000000
--- a/Widgets/Testing/Tcl/CMakeLists.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-IF (VTK_USE_RENDERING)
-
-  #
-  # Add tests, with the data
-  #
-  IF (VTK_DATA_ROOT)
-    FOREACH ( tfile 
-      TestInteractorEventRecorder
-      TestSphereWidget
-      )
-      ADD_TEST(${tfile}-image ${VTK_EXECUTABLE}
-        ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-        ${VTK_SOURCE_DIR}/Widgets/Testing/Tcl/${tfile}.tcl
-        -D ${VTK_DATA_ROOT}
-        -V Baseline/Widgets/${tfile}.png
-        -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-    ENDFOREACH( tfile )
-  #
-  # If we do not have the data, still run the tests that we can
-  #
-  ELSE (VTK_DATA_ROOT)
-    FOREACH ( tfile 
-      )
-      ADD_TEST(${tfile}-image ${VTK_EXECUTABLE}
-        ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl 
-        ${VTK_SOURCE_DIR}/Widgets/Testing/Tcl/${tfile}.tcl
-        -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
-        -V Baseline/Widgets/${tfile}.png
-        -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
-    ENDFOREACH( tfile )
-  ENDIF (VTK_DATA_ROOT)
-
-ENDIF (VTK_USE_RENDERING)
-
-ADD_TEST(PrintSelf-Widgets ${TCL_TCLSH}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/PrintSelfCheck.tcl  
-         ${VTK_SOURCE_DIR}/Widgets)
-
-ADD_TEST(TestSetObjectMacro-Widgets ${TCL_TCLSH}
-         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/FindString.tcl
-         "${VTK_SOURCE_DIR}/Widgets/vtk\\\\*.h"
-         "vtkSetObjectMacro")
diff --git a/Wrapping/Java/.cvsignore b/Wrapping/Java/.cvsignore
deleted file mode 100644
index 6b468b62a9884e67ca19b673f8e14e1931d65036..0000000000000000000000000000000000000000
--- a/Wrapping/Java/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.class
diff --git a/Wrapping/Java/vtk/.cvsignore b/Wrapping/Java/vtk/.cvsignore
deleted file mode 100644
index 6b468b62a9884e67ca19b673f8e14e1931d65036..0000000000000000000000000000000000000000
--- a/Wrapping/Java/vtk/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.class
diff --git a/Wrapping/Python/.cvsignore b/Wrapping/Python/.cvsignore
deleted file mode 100644
index 0d20b6487c61e7d1bde93acf4a14b7a89083a16d..0000000000000000000000000000000000000000
--- a/Wrapping/Python/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.pyc
diff --git a/Wrapping/Python/vtk/.cvsignore b/Wrapping/Python/vtk/.cvsignore
deleted file mode 100644
index 0d20b6487c61e7d1bde93acf4a14b7a89083a16d..0000000000000000000000000000000000000000
--- a/Wrapping/Python/vtk/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.pyc
diff --git a/Wrapping/Python/vtk/__helper.py b/Wrapping/Python/vtk/__helper.py
deleted file mode 100644
index 7529c2f4906487813e8d22cce8a86189b760306d..0000000000000000000000000000000000000000
--- a/Wrapping/Python/vtk/__helper.py
+++ /dev/null
@@ -1,33 +0,0 @@
-""" This provides some useful code used by other modules.  This is not to be
-used by the end user which is why it is hidden. """
-
-import string, sys
-class LinkError(Exception):
-    pass
-
-def refine_import_err(mod_name, extension_name, exc):
-    """ Checks to see if the ImportError was because the library
-    itself was not there or because there was a link error.  If there
-    was a link error it raises a LinkError if not it does nothing.
-
-    Keyword arguments
-    -----------------
-
-     - mod_name : The name of the Python module that was imported.
-
-     - extension_name : The name of the extension module that is to be
-     imported by the module having mod_name.
-
-     - exc : The exception raised when the module called mod_name was
-     imported.
-
-    To see example usage look at __init__.py.
-
-    """
-    try:
-        del sys.modules['vtk.%s'%mod_name]
-    except KeyError:
-        pass
-    if string.find(str(exc), extension_name) == -1:
-	raise LinkError, str(exc)
-
diff --git a/Wrapping/Python/vtk/charts.py b/Wrapping/Python/vtk/charts.py
deleted file mode 100644
index eec44e21fd522598ce1c775f8f23c99baffdbccc..0000000000000000000000000000000000000000
--- a/Wrapping/Python/vtk/charts.py
+++ /dev/null
@@ -1,4 +0,0 @@
-""" This module loads all the classes from the VTK Charts library into
-its namespace.  This is an optional module."""
-
-from vtkChartsPython import *
diff --git a/Wrapping/Python/vtk/chemistry.py b/Wrapping/Python/vtk/chemistry.py
deleted file mode 100644
index 242fccb201432150d12c550759b599ad5e0cf05a..0000000000000000000000000000000000000000
--- a/Wrapping/Python/vtk/chemistry.py
+++ /dev/null
@@ -1,4 +0,0 @@
-""" This module loads all the classes from the VTK Chemistry library into
-its namespace.  This is an optional module."""
-
-from vtkChemistryPython import *
diff --git a/Wrapping/Python/vtk/common.py b/Wrapping/Python/vtk/common.py
deleted file mode 100644
index 00ed965d4b7a6ed10ef6bdd8fa01e2faa67fa291..0000000000000000000000000000000000000000
--- a/Wrapping/Python/vtk/common.py
+++ /dev/null
@@ -1,4 +0,0 @@
-""" This module loads all the classes from the VTK Common library into its
-namespace.  This is a required module."""
-
-from vtkCommonPython import *
diff --git a/Wrapping/Python/vtk/filtering.py b/Wrapping/Python/vtk/filtering.py
deleted file mode 100644
index fab6abebb5eb079afd9b88a73fa9af88c5306902..0000000000000000000000000000000000000000
--- a/Wrapping/Python/vtk/filtering.py
+++ /dev/null
@@ -1,4 +0,0 @@
-""" This module loads all the classes from the VTK Filtering library into
-its namespace.  This is a required module."""
-
-from vtkFilteringPython import *
diff --git a/Wrapping/Python/vtk/genericfiltering.py b/Wrapping/Python/vtk/genericfiltering.py
deleted file mode 100644
index cac3fb523b8b3c9eb80ce3c2553da27ab25021b9..0000000000000000000000000000000000000000
--- a/Wrapping/Python/vtk/genericfiltering.py
+++ /dev/null
@@ -1,4 +0,0 @@
-""" This module loads all the classes from the VTK GenericFiltering
-library into its namespace.  This is an optional module."""
-
-from vtkGenericFilteringPython import *
diff --git a/Wrapping/Python/vtk/geovis.py b/Wrapping/Python/vtk/geovis.py
deleted file mode 100644
index 439b570e5e7a990c8ce8cf2b195cfa6d062d0939..0000000000000000000000000000000000000000
--- a/Wrapping/Python/vtk/geovis.py
+++ /dev/null
@@ -1,4 +0,0 @@
-""" This module loads all the classes from the VTK Geovis library into
-its namespace.  This is an optional module."""
-
-from vtkGeovisPython import *
diff --git a/Wrapping/Python/vtk/graphics.py b/Wrapping/Python/vtk/graphics.py
deleted file mode 100644
index 25e72db75c3531fee9436c27f9e2e68316b9b68f..0000000000000000000000000000000000000000
--- a/Wrapping/Python/vtk/graphics.py
+++ /dev/null
@@ -1,4 +0,0 @@
-""" This module loads all the classes from the VTK Graphics library into its
-namespace.  This is a required module."""
-
-from vtkGraphicsPython import *
diff --git a/Wrapping/Python/vtk/hybrid.py b/Wrapping/Python/vtk/hybrid.py
deleted file mode 100644
index fdfc1b31244392c0fd0e4e53fa64af0300214a4e..0000000000000000000000000000000000000000
--- a/Wrapping/Python/vtk/hybrid.py
+++ /dev/null
@@ -1,4 +0,0 @@
-""" This module loads all the classes from the VTK Hybrid library into
-its namespace.  This is an optional module."""
-
-from vtkHybridPython import *
diff --git a/Wrapping/Python/vtk/imaging.py b/Wrapping/Python/vtk/imaging.py
deleted file mode 100644
index 879b5dfd9aca204d30b8a56c866a0892b1adf72d..0000000000000000000000000000000000000000
--- a/Wrapping/Python/vtk/imaging.py
+++ /dev/null
@@ -1,4 +0,0 @@
-""" This module loads all the classes from the VTK Imaging library into
-its namespace.  This is a required module."""
-
-from vtkImagingPython import *
diff --git a/Wrapping/Python/vtk/infovis.py b/Wrapping/Python/vtk/infovis.py
deleted file mode 100644
index 9f1a631695101b52b7ed15ab209b8db481d78138..0000000000000000000000000000000000000000
--- a/Wrapping/Python/vtk/infovis.py
+++ /dev/null
@@ -1,4 +0,0 @@
-""" This module loads all the classes from the VTK Infovis library into
-its namespace.  This is an optional module."""
-
-from vtkInfovisPython import *
diff --git a/Wrapping/Python/vtk/io.py b/Wrapping/Python/vtk/io.py
deleted file mode 100644
index fe9cf9b64ec17eb86d266516f08a4187a5a13ea8..0000000000000000000000000000000000000000
--- a/Wrapping/Python/vtk/io.py
+++ /dev/null
@@ -1,4 +0,0 @@
-""" This module loads all the classes from the VTK IO library into its
-namespace.  This is a required module."""
-
-from vtkIOPython import *
diff --git a/Wrapping/Python/vtk/parallel.py b/Wrapping/Python/vtk/parallel.py
deleted file mode 100644
index 98945112df8919aba0b87b8cca72b386cc58a41e..0000000000000000000000000000000000000000
--- a/Wrapping/Python/vtk/parallel.py
+++ /dev/null
@@ -1,4 +0,0 @@
-""" This module loads all the classes from the VTK Parallel library into
-its namespace.  This is an optional module."""
-
-from vtkParallelPython import *
diff --git a/Wrapping/Python/vtk/qvtk.py b/Wrapping/Python/vtk/qvtk.py
deleted file mode 100644
index 253b47db9201bdd2929276ba667d1959a6e68757..0000000000000000000000000000000000000000
--- a/Wrapping/Python/vtk/qvtk.py
+++ /dev/null
@@ -1,8 +0,0 @@
-""" This module loads all the classes from the VTK/Qt libraries into
-its namespace.  This is an optional module."""
-
-# library for VTK classes with Qt support (load first)
-from vtkQtPython import *
-
-# library for Qt classes with VTK support
-from QVTKPython import *
diff --git a/Wrapping/Python/vtk/rendering.py b/Wrapping/Python/vtk/rendering.py
deleted file mode 100644
index bd2fad9faefd1beb0a0c609df528af6b10321aa6..0000000000000000000000000000000000000000
--- a/Wrapping/Python/vtk/rendering.py
+++ /dev/null
@@ -1,4 +0,0 @@
-""" This module loads all the classes from the VTK Rendering library into
-its namespace.  This is an optional module."""
-
-from vtkRenderingPython import *
diff --git a/Wrapping/Python/vtk/required.py b/Wrapping/Python/vtk/required.py
deleted file mode 100644
index e59b20dadd75faabd8fa72ff87a45278d02d5bea..0000000000000000000000000000000000000000
--- a/Wrapping/Python/vtk/required.py
+++ /dev/null
@@ -1,8 +0,0 @@
-""" This module loads all the required VTK libraries."""
-
-# Load all required kits.
-from vtkCommonPython import *
-from vtkFilteringPython import *
-from vtkIOPython import *
-from vtkImagingPython import *
-from vtkGraphicsPython import *
diff --git a/Wrapping/Python/vtk/views.py b/Wrapping/Python/vtk/views.py
deleted file mode 100644
index b7939be72528d80fb6f0036f43f35508e57e55bb..0000000000000000000000000000000000000000
--- a/Wrapping/Python/vtk/views.py
+++ /dev/null
@@ -1,4 +0,0 @@
-""" This module loads all the classes from the VTK Views library into
-its namespace.  This is an optional module."""
-
-from vtkViewsPython import *
diff --git a/Wrapping/Python/vtk/volumerendering.py b/Wrapping/Python/vtk/volumerendering.py
deleted file mode 100644
index 717cbd709acaafb9c5736af99e78f76f9e3a6a28..0000000000000000000000000000000000000000
--- a/Wrapping/Python/vtk/volumerendering.py
+++ /dev/null
@@ -1,4 +0,0 @@
-""" This module loads all the classes from the VTK VolumeRendering library into
-its namespace.  This is an optional module."""
-
-from vtkVolumeRenderingPython import *
diff --git a/Wrapping/Python/vtk/widgets.py b/Wrapping/Python/vtk/widgets.py
deleted file mode 100644
index 2f412f18856506088196953526eba1a0c15c0f78..0000000000000000000000000000000000000000
--- a/Wrapping/Python/vtk/widgets.py
+++ /dev/null
@@ -1,4 +0,0 @@
-""" This module loads all the classes from the VTK Widgets library
-into its namespace.  This is an optional module."""
-
-from vtkWidgetsPython import *
diff --git a/Wrapping/Tcl/vtk/CMakeLists.txt b/Wrapping/Tcl/vtk/CMakeLists.txt
deleted file mode 100644
index 307f6820485984423ff62d41f96c60c5feb54467..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtk/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-IF(NOT VTK_INSTALL_NO_RUNTIME)
-
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/vtk.tcl.in
-    ${CMAKE_CURRENT_BINARY_DIR}/vtk.tcl
-    @ONLY)
-    
-  INSTALL(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/vtk.tcl
-    DESTINATION ${VTK_TCL_INSTALL_DIR_CM24}/vtk
-    COMPONENT RuntimeLibraries)
-ENDIF(NOT VTK_INSTALL_NO_RUNTIME)
diff --git a/Wrapping/Tcl/vtkbase/CMakeLists.txt b/Wrapping/Tcl/vtkbase/CMakeLists.txt
deleted file mode 100644
index 789033557c60d2fb6b2fea93099c9090c0d3990f..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkbase/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-IF(NOT VTK_INSTALL_NO_RUNTIME)
-
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/vtkbase.tcl.in
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkbase.tcl
-    @ONLY)
-
-  INSTALL(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkbase.tcl
-    DESTINATION ${VTK_TCL_INSTALL_DIR_CM24}/vtkbase
-    COMPONENT RuntimeLibraries)
-ENDIF(NOT VTK_INSTALL_NO_RUNTIME)
diff --git a/Wrapping/Tcl/vtkcommon/CMakeLists.txt b/Wrapping/Tcl/vtkcommon/CMakeLists.txt
deleted file mode 100644
index a9e69a9c0a6b3b36fdc335ec6e62949ec2c1959d..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkcommon/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-IF(NOT VTK_INSTALL_NO_RUNTIME)
-
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/vtkcommon.tcl.in
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkcommon.tcl
-    @ONLY)
-
-  INSTALL(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkcommon.tcl
-    DESTINATION ${VTK_TCL_INSTALL_DIR_CM24}/vtkcommon
-    COMPONENT RuntimeLibraries)
-ENDIF(NOT VTK_INSTALL_NO_RUNTIME)
diff --git a/Wrapping/Tcl/vtkfiltering/CMakeLists.txt b/Wrapping/Tcl/vtkfiltering/CMakeLists.txt
deleted file mode 100644
index b4adcdd4cf064495eafee08305dc6c6ca61c0b5c..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkfiltering/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-IF(NOT VTK_INSTALL_NO_RUNTIME)
-
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/vtkfiltering.tcl.in
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkfiltering.tcl
-    @ONLY)
-
-  INSTALL(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkfiltering.tcl
-    DESTINATION ${VTK_TCL_INSTALL_DIR_CM24}/vtkfiltering
-    COMPONENT RuntimeLibraries)
-ENDIF(NOT VTK_INSTALL_NO_RUNTIME)
diff --git a/Wrapping/Tcl/vtkfiltering/vtkfiltering.tcl.in b/Wrapping/Tcl/vtkfiltering/vtkfiltering.tcl.in
deleted file mode 100644
index d7b232fb6021526691638cb23a972b6216c87f7d..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkfiltering/vtkfiltering.tcl.in
+++ /dev/null
@@ -1,12 +0,0 @@
-package require -exact vtkcommon @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-
-if {[info commands ::vtk::init::require_package] != ""} {
-  if {[::vtk::init::require_package vtkFilteringTCL @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@]} {
-    package provide vtkfiltering @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-  }
-} else {
-  if {[info commands vtkCardinalSpline] != "" ||
-    [::vtk::load_component vtkFilteringTCL] == ""} {
-    package provide vtkfiltering @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-  }
-}
diff --git a/Wrapping/Tcl/vtkgeovis/CMakeLists.txt b/Wrapping/Tcl/vtkgeovis/CMakeLists.txt
deleted file mode 100644
index b908c507cb8d1cf4e422775e2f4241397b413c9a..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkgeovis/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-IF(NOT VTK_INSTALL_NO_RUNTIME)
-
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/vtkgeovis.tcl.in
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkgeovis.tcl
-    @ONLY)
-
-  INSTALL(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkgeovis.tcl
-    DESTINATION ${VTK_TCL_INSTALL_DIR_CM24}/vtkgeovis
-    COMPONENT RuntimeLibraries)
-ENDIF(NOT VTK_INSTALL_NO_RUNTIME)
diff --git a/Wrapping/Tcl/vtkgeovis/vtkgeovis.tcl.in b/Wrapping/Tcl/vtkgeovis/vtkgeovis.tcl.in
deleted file mode 100644
index b2a68c0af4f8e390cf62dfac48d737a97a6dce48..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkgeovis/vtkgeovis.tcl.in
+++ /dev/null
@@ -1,12 +0,0 @@
-package require -exact vtkwidgets @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-
-if {[info commands ::vtk::init::require_package] != ""} {
-  if {[::vtk::init::require_package vtkGeovisTCL @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@]} {
-    package provide vtkgeovis @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-  }
-} else {
-  if {[info commands vtkGeoMath] != "" ||
-    [::vtk::load_component vtkGeovisTCL] == ""} {
-    package provide vtkgeovis @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-  }
-}
diff --git a/Wrapping/Tcl/vtkgraphics/CMakeLists.txt b/Wrapping/Tcl/vtkgraphics/CMakeLists.txt
deleted file mode 100644
index 75d98a60eedb899902513ba69f75d7739382fe95..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkgraphics/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-IF(NOT VTK_INSTALL_NO_RUNTIME)
-
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/vtkgraphics.tcl.in
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkgraphics.tcl
-    @ONLY)
-
-  INSTALL(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkgraphics.tcl
-    DESTINATION ${VTK_TCL_INSTALL_DIR_CM24}/vtkgraphics
-    COMPONENT RuntimeLibraries)
-ENDIF(NOT VTK_INSTALL_NO_RUNTIME)
diff --git a/Wrapping/Tcl/vtkgraphics/vtkgraphics.tcl.in b/Wrapping/Tcl/vtkgraphics/vtkgraphics.tcl.in
deleted file mode 100644
index d61768e0e3f76e3e790500791e48cc2f6e3e4023..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkgraphics/vtkgraphics.tcl.in
+++ /dev/null
@@ -1,12 +0,0 @@
-package require -exact vtkfiltering @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-
-if {[info commands ::vtk::init::require_package] != ""} {
-  if {[::vtk::init::require_package vtkGraphicsTCL @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@]} {
-    package provide vtkgraphics @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-  }
-} else {
-  if {[info commands vtkAxes]  != "" ||
-    [::vtk::load_component vtkGraphicsTCL] == ""} {
-    package provide vtkgraphics @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-  }
-}
diff --git a/Wrapping/Tcl/vtkhybrid/CMakeLists.txt b/Wrapping/Tcl/vtkhybrid/CMakeLists.txt
deleted file mode 100644
index 1ced32f529af0f72c920d3cd2f0c3bb530d3f011..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkhybrid/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-IF(NOT VTK_INSTALL_NO_RUNTIME)
-
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/vtkhybrid.tcl.in
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkhybrid.tcl
-    @ONLY)
-
-  INSTALL(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkhybrid.tcl
-    DESTINATION ${VTK_TCL_INSTALL_DIR_CM24}/vtkhybrid
-    COMPONENT RuntimeLibraries)
-ENDIF(NOT VTK_INSTALL_NO_RUNTIME)
diff --git a/Wrapping/Tcl/vtkhybrid/vtkhybrid.tcl.in b/Wrapping/Tcl/vtkhybrid/vtkhybrid.tcl.in
deleted file mode 100644
index db38ad341134448b35fa997d818039f6773afecc..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkhybrid/vtkhybrid.tcl.in
+++ /dev/null
@@ -1,13 +0,0 @@
-package require -exact vtkio @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-package require -exact vtkrendering @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-
-if {[info commands ::vtk::init::require_package] != ""} {
-  if {[::vtk::init::require_package vtkHybridTCL @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@]} {
-    package provide vtkhybrid @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-  }
-} else {
-  if {[info commands vtkEarthSource] != "" ||
-    [::vtk::load_component vtkHybridTCL] == ""} {
-    package provide vtkhybrid @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-  }
-}
diff --git a/Wrapping/Tcl/vtkimaging/CMakeLists.txt b/Wrapping/Tcl/vtkimaging/CMakeLists.txt
deleted file mode 100644
index 2772e4a2ff036fb3317aa194f22b9a1a64daf30f..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkimaging/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-IF(NOT VTK_INSTALL_NO_RUNTIME)
-
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/vtkimaging.tcl.in
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkimaging.tcl
-    @ONLY)
-
-  INSTALL(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkimaging.tcl
-    DESTINATION ${VTK_TCL_INSTALL_DIR_CM24}/vtkimaging
-    COMPONENT RuntimeLibraries)
-ENDIF(NOT VTK_INSTALL_NO_RUNTIME)
diff --git a/Wrapping/Tcl/vtkimaging/vtkimaging.tcl.in b/Wrapping/Tcl/vtkimaging/vtkimaging.tcl.in
deleted file mode 100644
index 25dc462e8edfe8f59fa3e31a1b39b71e5b4bc1e5..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkimaging/vtkimaging.tcl.in
+++ /dev/null
@@ -1,12 +0,0 @@
-package require -exact vtkfiltering @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-
-if {[info commands ::vtk::init::require_package] != ""} {
-  if {[::vtk::init::require_package vtkImagingTCL @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@]} {
-    package provide vtkimaging @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-  }
-} else {
-  if {[info commands vtkImageFFT] != "" ||
-    [::vtk::load_component vtkImagingTCL] == ""} {
-    package provide vtkimaging @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-  }
-}
diff --git a/Wrapping/Tcl/vtkinfovis/CMakeLists.txt b/Wrapping/Tcl/vtkinfovis/CMakeLists.txt
deleted file mode 100644
index 21c2a7739cbe2128e82ba2436a00fc413ff474d5..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkinfovis/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-IF(NOT VTK_INSTALL_NO_RUNTIME)
-
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/vtkinfovis.tcl.in
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkinfovis.tcl
-    @ONLY)
-
-  INSTALL(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkinfovis.tcl
-    DESTINATION ${VTK_TCL_INSTALL_DIR_CM24}/vtkinfovis
-    COMPONENT RuntimeLibraries)
-ENDIF(NOT VTK_INSTALL_NO_RUNTIME)
diff --git a/Wrapping/Tcl/vtkinfovis/vtkinfovis.tcl.in b/Wrapping/Tcl/vtkinfovis/vtkinfovis.tcl.in
deleted file mode 100644
index e04c2037c2aba6dbeafc7c2921597e385b482666..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkinfovis/vtkinfovis.tcl.in
+++ /dev/null
@@ -1,12 +0,0 @@
-package require -exact vtkwidgets @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-
-if {[info commands ::vtk::init::require_package] != ""} {
-  if {[::vtk::init::require_package vtkInfovisTCL @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@]} {
-    package provide vtkinfovis @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-  }
-} else {
-  if {[info commands vtkGraphLayout] != "" ||
-    [::vtk::load_component vtkInfovisTCL] == ""} {
-    package provide vtkinfovis @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-  }
-}
diff --git a/Wrapping/Tcl/vtkinteraction/CMakeLists.txt b/Wrapping/Tcl/vtkinteraction/CMakeLists.txt
deleted file mode 100644
index b87886595f7616e9440ff44ab6c1959bdc494fdb..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkinteraction/CMakeLists.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-IF(NOT VTK_INSTALL_NO_RUNTIME)
-
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/bindings.tcl
-    ${CMAKE_CURRENT_BINARY_DIR}/bindings.tcl
-    COPYONLY)
-    
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/bindings-iw.tcl
-    ${CMAKE_CURRENT_BINARY_DIR}/bindings-iw.tcl
-    COPYONLY)
-
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/bindings-rw.tcl
-    ${CMAKE_CURRENT_BINARY_DIR}/bindings-rw.tcl
-    COPYONLY)
-
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/Interactor.tcl
-    ${CMAKE_CURRENT_BINARY_DIR}/Interactor.tcl
-    COPYONLY)
- 
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/setget.tcl
-    ${CMAKE_CURRENT_BINARY_DIR}/setget.tcl
-    COPYONLY)
-
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/vtkinteraction.tcl.in
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkinteraction.tcl
-    @ONLY)
-
-  INSTALL(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkinteraction.tcl
-    ${CMAKE_CURRENT_SOURCE_DIR}/Interactor.tcl
-    ${CMAKE_CURRENT_SOURCE_DIR}/bindings.tcl
-    ${CMAKE_CURRENT_SOURCE_DIR}/bindings-iw.tcl
-    ${CMAKE_CURRENT_SOURCE_DIR}/bindings-rw.tcl
-    ${CMAKE_CURRENT_SOURCE_DIR}/setget.tcl
-    DESTINATION ${VTK_TCL_INSTALL_DIR_CM24}/vtkinteraction
-    COMPONENT RuntimeLibraries)
-ENDIF(NOT VTK_INSTALL_NO_RUNTIME)
diff --git a/Wrapping/Tcl/vtkinteraction/Interactor.tcl b/Wrapping/Tcl/vtkinteraction/Interactor.tcl
deleted file mode 100644
index 7feac8e2757f70fd8fa184a3d786a93f83ec1f35..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkinteraction/Interactor.tcl
+++ /dev/null
@@ -1,100 +0,0 @@
-# a generic interactor for tcl and vtk
-#
-
-catch {unset vtkInteract.bold}
-catch {unset vtkInteract.normal}
-catch {unset vtkInteract.tagcount}
-set vtkInteractBold "-background #43ce80 -foreground #221133 -relief raised -borderwidth 1"
-set vtkInteractNormal "-background #dddddd -foreground #221133 -relief flat"
-set vtkInteractTagcount 1
-set vtkInteractCommandList ""
-set vtkInteractCommandIndex 0
-
-proc vtkInteract {} {
-    global vtkInteractCommandList vtkInteractCommandIndex
-    global vtkInteractTagcount
-    
-    proc dovtk {s w} {
-	global vtkInteractBold vtkInteractNormal vtkInteractTagcount 
-	global vtkInteractCommandList vtkInteractCommandIndex
-	
-	set tag [append tagnum $vtkInteractTagcount]
-	set vtkInteractCommandIndex $vtkInteractTagcount
-	incr vtkInteractTagcount 1
-	.vtkInteract.display.text configure -state normal
-	.vtkInteract.display.text insert end $s $tag
-	set vtkInteractCommandList [linsert $vtkInteractCommandList end $s]
-	eval .vtkInteract.display.text tag configure $tag $vtkInteractNormal
-	.vtkInteract.display.text tag bind $tag <Any-Enter> \
-		".vtkInteract.display.text tag configure $tag $vtkInteractBold"
-	.vtkInteract.display.text tag bind $tag <Any-Leave> \
-		".vtkInteract.display.text tag configure $tag $vtkInteractNormal"
-	.vtkInteract.display.text tag bind $tag <1> "dovtk [list $s] .vtkInteract"
-	.vtkInteract.display.text insert end \n;
-	.vtkInteract.display.text insert end [uplevel 1 $s]
-	.vtkInteract.display.text insert end \n\n
-	.vtkInteract.display.text configure -state disabled
-	.vtkInteract.display.text yview end
-    }
-    
-    catch {destroy .vtkInteract}
-    toplevel .vtkInteract -bg #bbbbbb
-    wm title .vtkInteract "vtk Interactor"
-    wm iconname .vtkInteract "vtk"
-    
-    frame .vtkInteract.buttons -bg #bbbbbb
-    pack  .vtkInteract.buttons -side bottom -fill both -expand 0 -pady 2m
-    button .vtkInteract.buttons.dismiss -text Dismiss \
-	    -command "wm withdraw .vtkInteract" \
-	    -bg #bbbbbb -fg #221133 -activebackground #cccccc -activeforeground #221133
-    pack .vtkInteract.buttons.dismiss -side left -expand 1 -fill x
-    
-    frame .vtkInteract.file -bg #bbbbbb
-    label .vtkInteract.file.label -text "Command:" -width 10 -anchor w \
-	    -bg #bbbbbb -fg #221133
-    entry .vtkInteract.file.entry -width 40 \
-	    -bg #dddddd -fg #221133 -highlightthickness 1 -highlightcolor #221133
-    bind .vtkInteract.file.entry <Return> {
-	dovtk [%W get] .vtkInteract; %W delete 0 end
-    }
-    pack .vtkInteract.file.label -side left
-    pack .vtkInteract.file.entry -side left -expand 1 -fill x
-    
-    frame .vtkInteract.display -bg #bbbbbb
-    text .vtkInteract.display.text -yscrollcommand ".vtkInteract.display.scroll set" \
-	    -setgrid true -width 60 -height 8 -wrap word -bg #dddddd -fg #331144 \
-	    -state disabled
-    scrollbar .vtkInteract.display.scroll \
-	    -command ".vtkInteract.display.text yview" -bg #bbbbbb \
-	    -troughcolor #bbbbbb -activebackground #cccccc -highlightthickness 0 
-    pack .vtkInteract.display.text -side left -expand 1 -fill both
-    pack .vtkInteract.display.scroll -side left -expand 0 -fill y
-    
-    pack .vtkInteract.display -side bottom -expand 1 -fill both
-    pack .vtkInteract.file -pady 3m -padx 2m -side bottom -fill x 
-    
-    set vtkInteractCommandIndex 0
-    
-    bind .vtkInteract <Down> {
-	if { $vtkInteractCommandIndex < [expr $vtkInteractTagcount - 1] } {
-	    incr vtkInteractCommandIndex
-	    set command_string [lindex $vtkInteractCommandList $vtkInteractCommandIndex]
-	    .vtkInteract.file.entry delete 0 end
-	    .vtkInteract.file.entry insert end $command_string
-	} elseif { $vtkInteractCommandIndex == [expr $vtkInteractTagcount - 1] } {
-	    .vtkInteract.file.entry delete 0 end
-	}
-    }
-	
-    bind .vtkInteract <Up> {
-	if { $vtkInteractCommandIndex > 0 } { 
-	    set vtkInteractCommandIndex [expr $vtkInteractCommandIndex - 1]
-	    set command_string [lindex $vtkInteractCommandList $vtkInteractCommandIndex]
-	    .vtkInteract.file.entry delete 0 end
-	    .vtkInteract.file.entry insert end $command_string
-	}
-    }
-	
-    wm withdraw .vtkInteract
-}
-vtkInteract
diff --git a/Wrapping/Tcl/vtkinteraction/bindings-iw.tcl b/Wrapping/Tcl/vtkinteraction/bindings-iw.tcl
deleted file mode 100644
index e68273510b31e6b37068a290676bc74dfc25ce50..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkinteraction/bindings-iw.tcl
+++ /dev/null
@@ -1,223 +0,0 @@
-namespace eval ::vtk {
-
-    namespace export *
-
-    # -------------------------------------------------------------------
-    # Specific vtkTkImageViewerWidget bindings
-
-    # Create a 2d text actor that can be used to display infos
-    # like window/level, pixel picking, etc
-    
-    proc cb_vtkiw_create_text1 {vtkiw} {
-        set mapper [::vtk::get_widget_variable_value $vtkiw text1_mapper]
-        if {$mapper == ""} {
-            set mapper \
-                  [::vtk::new_widget_object $vtkiw vtkTextMapper text1_mapper]
-            $mapper SetInput "none"
-            set tprop [$mapper GetTextProperty]
-            $tprop SetFontFamilyToArial
-            $tprop SetFontSize 12
-            $tprop BoldOn
-            $tprop ShadowOn
-            $tprop SetColor 1 1 0.5
-        }
-        set actor [::vtk::get_widget_variable_value $vtkiw text1_actor]
-        if {$actor == ""} {
-            set actor \
-                    [::vtk::new_widget_object $vtkiw vtkActor2D text1_actor]
-            $actor SetMapper $mapper
-            $actor SetLayerNumber 1
-            [$actor GetPositionCoordinate] SetValue 5 4 0
-            $actor SetVisibility 0
-            [[$vtkiw GetImageViewer] GetRenderer] AddActor2D $actor
-        }
-    }
-
-    # Show/Hide the 2d text actor
-    # Ensure that it stays in the upper left corner of the window
-    
-    proc cb_vtkiw_show_text1 {vtkiw} {
-        set actor [::vtk::get_widget_variable_value $vtkiw text1_actor]
-        if {![$actor GetVisibility]} {
-            set height [lindex [$vtkiw configure -height] 4]
-            set pos [$actor GetPositionCoordinate]
-            set value [$pos GetValue]
-            $pos SetValue \
-                    [lindex $value 0] [expr $height - 15] [lindex $value 2]
-            $actor VisibilityOn
-        }
-    }
-
-    proc cb_vtkiw_hide_text1 {vtkiw} {
-        set actor [::vtk::get_widget_variable_value $vtkiw text1_actor]
-        if {[$actor GetVisibility]} {
-            $actor VisibilityOff
-        }
-    }
-
-    # -------------------------------------------------------------------
-    # vtkInteractorStyleImage callbacks/observers
-    #   istyle: interactor style
-    #   vtkiw: vtkTkImageRenderWindget
-
-    # StartWindowLevelEvent observer.
-    # Create the text actor, show it
-
-    proc cb_istyleimg_start_window_level_event {istyle vtkiw} {
-        ::vtk::cb_vtkiw_create_text1 $vtkiw
-        ::vtk::cb_vtkiw_show_text1 $vtkiw
-    }
-
-    # EndWindowLevelEvent observer.
-    # Hide the text actor.
-
-    proc cb_istyleimg_end_window_level_event {istyle vtkiw} {
-        ::vtk::cb_vtkiw_hide_text1 $vtkiw
-        $vtkiw Render
-    }
-
-    # WindowLevelEvent observer.
-    # Update the text actor with the current window/level values.
-
-    proc cb_istyleimg_window_level_event {istyle vtkiw} {
-        set mapper [::vtk::get_widget_variable_value $vtkiw text1_mapper]
-        set viewer [$vtkiw GetImageViewer]
-        $mapper SetInput [format "W/L: %.0f/%.0f" \
-                [$viewer GetColorWindow] [$viewer GetColorLevel]]
-    }
-
-    # RightButtonPressEvent observer.
-    # Invert the 'shift' key. The usual vtkInteractorStyleImage
-    # behaviour is to enable picking mode with "Shift+Right button", 
-    # whereas we want picking mode to be "Right button" (for backward
-    # compatibility).
-
-    proc cb_istyleimg_right_button_press_event {istyle} {
-        set iren [$istyle GetInteractor]
-        $iren SetShiftKey [expr [$iren GetShiftKey] ? 0 : 1]
-        $istyle OnRightButtonDown
-    }
-
-    proc cb_istyleimg_right_button_release_event {istyle} {
-        set iren [$istyle GetInteractor]
-        $iren SetShiftKey [expr [$iren GetShiftKey] ? 0 : 1]
-        $istyle OnRightButtonUp
-    }
-
-    # StartPickEvent observer.
-    # Create the text actor, show it
-
-    proc cb_istyleimg_start_pick_event {istyle vtkiw} {
-        ::vtk::cb_vtkiw_create_text1 $vtkiw
-        ::vtk::cb_vtkiw_show_text1 $vtkiw
-    }
-
-    # EndPickEvent observer.
-    # Hide the text actor.
-
-    proc cb_istyleimg_end_pick_event {istyle vtkiw} {
-        ::vtk::cb_vtkiw_hide_text1 $vtkiw
-        $vtkiw Render
-    }
-
-    # PickEvent observer.
-    # Update the text actor with the current value of the picked pixel.
-
-    proc cb_istyleimg_pick_event {istyle vtkiw} {
-
-        set viewer [$vtkiw GetImageViewer]
-        set input [$viewer GetInput]
-        set pos [[$istyle  GetInteractor] GetEventPosition]
-        set x [lindex $pos 0]
-        set y [lindex $pos 1]
-        set z [$viewer GetZSlice]
-
-        # Y is flipped upside down
-
-        set height [lindex [$vtkiw configure -height] 4]
-        set y [expr $height - $y]
-
-        # Make sure point is in the whole extent of the image.
-
-        scan [$input GetWholeExtent] "%d %d %d %d %d %d" \
-                xMin xMax yMin yMax zMin zMax
-        if {$x < $xMin || $x > $xMax || \
-            $y < $yMin || $y > $yMax || \
-            $z < $zMin || $z > $zMax} {
-           return
-        }
-
-        $input SetUpdateExtent $x $x $y $y $z $z
-        $input Update
-
-        set num_comps [$input GetNumberOfScalarComponents]
-        set str "($x, $y):"
-        for {set idx 0} {$idx < $num_comps} {incr idx} {
-            set str [format "%s %.0f" $str \
-                    [$input GetScalarComponentAsDouble $x $y $z $idx]]
-        }
-
-        set mapper [::vtk::get_widget_variable_value $vtkiw text1_mapper]
-        $mapper SetInput "$str"
-        $vtkiw Render
-    }
-
-    # -------------------------------------------------------------------
-    # Create vtkTkImageViewerWidget bindings, setup observers
-
-    proc bind_tk_imageviewer_widget {vtkiw} {
-
-        bind_tk_widget $vtkiw [[$vtkiw GetImageViewer] GetRenderWindow]
-
-        set viewer [$vtkiw GetImageViewer]
-        set iren [[$viewer GetRenderWindow] GetInteractor]
-
-        # Ask the viewer to setup an image style interactor
-
-        $viewer SetupInteractor $iren
-        set istyle [$iren GetInteractorStyle]
-
-        # Window/Level observers
-
-        ::vtk::set_widget_variable_value $istyle StartWindowLevelEventTag \
-                [$istyle AddObserver StartWindowLevelEvent \
-                "::vtk::cb_istyleimg_start_window_level_event $istyle $vtkiw"]
-
-        ::vtk::set_widget_variable_value $istyle WindowLevelEventTag \
-                [$istyle AddObserver WindowLevelEvent \
-                "::vtk::cb_istyleimg_window_level_event $istyle $vtkiw"]
-
-        ::vtk::set_widget_variable_value $istyle EndWindowLevelEventTag \
-                [$istyle AddObserver EndWindowLevelEvent \
-                "::vtk::cb_istyleimg_end_window_level_event $istyle $vtkiw"]
-
-        # Picking observers
-
-        ::vtk::set_widget_variable_value $istyle RightButtonPressEventTag \
-                [$istyle AddObserver RightButtonPressEvent \
-                "::vtk::cb_istyleimg_right_button_press_event $istyle"]
-
-        ::vtk::set_widget_variable_value $istyle RightButtonReleaseEventTag \
-                [$istyle AddObserver RightButtonReleaseEvent \
-                "::vtk::cb_istyleimg_right_button_release_event $istyle"]
-
-        ::vtk::set_widget_variable_value $istyle StartPickEventTag \
-                [$istyle AddObserver StartPickEvent \
-                "::vtk::cb_istyleimg_start_pick_event $istyle $vtkiw"]
-
-        ::vtk::set_widget_variable_value $istyle EndPickEventTag \
-                [$istyle AddObserver EndPickEvent \
-                "::vtk::cb_istyleimg_end_pick_event $istyle $vtkiw"]
-        
-        ::vtk::set_widget_variable_value $istyle PickEventTag \
-                [$istyle AddObserver PickEvent \
-                "::vtk::cb_istyleimg_pick_event $istyle $vtkiw"]
-    }
-}
-
-# Handle deprecated calls
-
-proc BindTkImageViewer {widget} {
-    puts stderr "BindTkImageViewer is deprecated. Please use ::vtk::bind_tk_imageviewer_widget instead"
-    ::vtk::bind_tk_imageviewer_widget $widget
-}
diff --git a/Wrapping/Tcl/vtkinteraction/bindings-rw.tcl b/Wrapping/Tcl/vtkinteraction/bindings-rw.tcl
deleted file mode 100644
index 67d5fbae7ff8fc58eefc5b45fb4af66af5bdf555..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkinteraction/bindings-rw.tcl
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace eval ::vtk {
-
-    namespace export *
-
-    # -------------------------------------------------------------------
-    # Create vtkTkRenderWidget bindings, setup observers
-
-    proc bind_tk_render_widget {vtkrw} {
-        bind_tk_widget $vtkrw [$vtkrw GetRenderWindow]
-    }
-}
-
-# Handle deprecated calls
-
-proc BindTkRenderWidget {widget} {
-    puts stderr "BindTkImageViewer is deprecated. Please use ::vtk::bind_tk_render_widget instead"
-    ::vtk::bind_tk_render_widget $widget
-}
diff --git a/Wrapping/Tcl/vtkinteraction/bindings.tcl b/Wrapping/Tcl/vtkinteraction/bindings.tcl
deleted file mode 100644
index 40504a300a3dcfee599f25d5dfade4212fc31044..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkinteraction/bindings.tcl
+++ /dev/null
@@ -1,354 +0,0 @@
-namespace eval ::vtk {
-
-    namespace export *
-
-    # -------------------------------------------------------------------
-    # vtkTk(ImageViewer/Render)Widget callbacks.
-    #    vtkw: Tk pathname of the widget
-    #    renwin: render window embedded in the widget
-    #    x:      X coord, widget relative
-    #    y:      X coord, widget relative
-    #    w:      width of an event or update
-    #    h:      height of an event or update
-    #    ctrl:   1 if the Control key modifier was pressed, 0 otherwise
-    #    shift:  1 if the Control key modifier was pressed, 0 otherwise
-    #    delta:  delta field for the MouseWheel event.
-    #    repeat: 1 if a mouse button is double clicked, 0 if single clicked
-
-    # Called when a Tk mouse motion event is triggered.
-    # Helper binding: propagate the event as a VTK event.
-
-    proc cb_vtkw_motion_binding {vtkw renwin x y} {
-        set iren [$renwin GetInteractor]
-        $iren SetEventPositionFlipY $x $y
-        $iren MouseMoveEvent 
-    }
-
-    # Called when a Tk button mouse event is triggered.
-    # Helper binding: propagate the event as a VTK event.
-    #    event:  button state, Press or Release
-    #    pos:    position of the button, Left, Middle or Right
-
-    proc cb_vtkw_button_binding {vtkw renwin x y ctrl shift event pos repeat} {
-        set iren [$renwin GetInteractor]
-        $iren SetEventPositionFlipY $x $y
-        $iren SetControlKey $ctrl
-        $iren SetShiftKey $shift
-        $iren ${pos}Button${event}Event
-        $iren SetRepeatCount $repeat
-    }
-
-    # Called when a Tk wheel motion event is triggered.
-    # Helper binding: propagate the event as a VTK event.
-
-    proc cb_vtkw_wheel_motion_binding {vtkw renwin delta} {
-        set iren [$renwin GetInteractor]
-        if {$delta < 0} {
-            $iren MouseWheelBackwardEvent
-        } else {
-            $iren MouseWheelForwardEvent
-        }
-    }
-
-    # Called when a Tk key event is triggered.
-    # Helper binding: propagate the event as a VTK event (indeed, two).
-    #    event:   key state, Press or Release
-    #    keycode: keycode field
-    #    keysym:  keysym field
-
-    proc cb_vtkw_key_binding {vtkw renwin x y ctrl shift event keycode keysym} {
-        set iren [$renwin GetInteractor]
-        # Not a bug, two times keysym, since 5th param expect a char, and
-        # $keycode is %k, which is a number
-        $iren SetEventInformationFlipY $x $y $ctrl $shift $keysym 0 $keysym
-        $iren Key${event}Event
-        if {$event == "Press"} {
-          $iren SetEventInformationFlipY $x $y $ctrl $shift $keysym 0 $keysym
-          $iren CharEvent
-        }
-    }
-
-    # Called when a Tk Expose/Configure event is triggered.
-    # Helper binding: propagate the event as a VTK event.
-
-    proc cb_vtkw_configure_binding {vtkw renwin w h} {
-        set iren [$renwin GetInteractor]
-        $iren UpdateSize $w $h
-        $iren ConfigureEvent 
-    }
-        
-    proc cb_vtkw_expose_binding {vtkw renwin x y w h} {
-        set iren [$renwin GetInteractor]
-        $iren SetEventPositionFlipY $x $y
-        $iren SetEventSize $w $h
-        $iren ExposeEvent 
-    }
-
-    # Called when a Tk Enter/Leave event is triggered.
-    # Helper binding: propagate the event as a VTK event.
-    # Note that entering the widget automatically grabs the focus so
-    # that key events can be processed.
-
-    proc cb_vtkw_enter_binding {vtkw renwin x y} {
-        focus $vtkw
-        set iren [$renwin GetInteractor]
-        $iren SetEventPositionFlipY $x $y
-        $iren EnterEvent 
-    }
-
-    proc cb_vtkw_leave_binding {vtkw renwin x y} {
-        set iren [$renwin GetInteractor]
-        $iren SetEventPositionFlipY $x $y
-        $iren LeaveEvent
-    }
-
-    # Set the above bindings for a vtkTkRenderWidget widget.
-
-    proc create_vtkw_bindings {vtkw renwin} {
-    
-        global tcl_platform
-
-        # Find the render window (which creates it if it was not set).
-        # Find the interactor, create a generic one if needed.
-
-        if {[$renwin GetInteractor] == ""} {
-            # the duh is critical in the follwing line, it causes 
-            # vtkTclUtil.cxx to know that the object was created in
-            # a Tcl script, otherwise if ${renwin} was a return value
-            # from a C++ function it would be called vtkTemp### and
-            # the interactor instance would have the same name causeing Tcl
-            # to think it also was a C++ return value. 
-            set iren [vtkGenericRenderWindowInteractor duh_${renwin}_iren]
-            $iren SetRenderWindow $renwin
-            $iren Initialize
-        }
-
-        # Mouse motion
-
-        bind $vtkw <Motion> "::vtk::cb_vtkw_motion_binding $vtkw $renwin %x %y"
-
-        # Mouse buttons and key events
-
-        foreach {modifier ctrl shift repeat} {
-            ""               0 0 0
-            "Control-"       1 0 0
-            "Shift-"         0 1 0
-            "Control-Shift-" 1 1 0
-            "Double-" 0 0 1
-            "Double-Control-" 1 0 1
-            "Double-Shift-" 0 1 1
-            "Double-Control-Shift-" 1 1 1 
-        } {
-            foreach event {
-                Press
-                Release
-            } {
-                foreach {pos number} {
-                    Left 1
-                    Middle 2
-                    Right 3
-                } {
-                    bind $vtkw <${modifier}Button${event}-${number}> \
-                   "::vtk::cb_vtkw_button_binding $vtkw $renwin %x %y $ctrl $shift $event $pos $repeat"
-                }
-
-                bind $vtkw <${modifier}Key${event}> \
-                  "::vtk::cb_vtkw_key_binding $vtkw $renwin %x %y $ctrl $shift $event %k %K"
-            }
-        }
-        
-        # Wheel motion
-        # Only x11 does not understand a mousewheel event
-        # [tk windowingsystem] can be x11, win32, classic, aqua
-        # Unfortunately this call only appear recently
-        # so for now remove it
-        # if {[tk windowingsystem] == "x11"} 
-        if {$tcl_platform(platform) == "unix"} {
-            bind $vtkw <Button-4> \
-                    "::vtk::cb_vtkw_wheel_motion_binding $vtkw $renwin 1"
-            bind $vtkw <Button-5> \
-                    "::vtk::cb_vtkw_wheel_motion_binding $vtkw $renwin -1"
-        } else {
-            bind $vtkw <MouseWheel> \
-                    "::vtk::cb_vtkw_wheel_motion_binding $vtkw $renwin %D"
-        }
-
-        # Expose/Configure
-
-        bind $vtkw <Configure> \
-                "::vtk::cb_vtkw_configure_binding $vtkw $renwin %w %h"
-
-        bind $vtkw <Expose> \
-                "::vtk::cb_vtkw_expose_binding $vtkw $renwin %x %y %w %h"
-
-        # Enter/Leave
-
-        bind $vtkw <Enter> \
-                "::vtk::cb_vtkw_enter_binding $vtkw $renwin %x %y"
-
-        bind $vtkw <Leave> \
-                "::vtk::cb_vtkw_leave_binding $vtkw $renwin %x %y"
-    }
-
-    # -------------------------------------------------------------------
-    # vtkRenderWindow callbacks/observers
-    #   renwin: render window object
-
-    # AbortCheckEvent observer.
-    # Check if some events are pending, and abort render in that case
-
-    proc cb_renwin_abort_check_event {renwin} {
-        if {[$renwin GetEventPending] != 0} {    
-            $renwin SetAbortRender 1        
-        }                                   
-    }
-
-    # Add the above observers to a vtkRenderWindow
-
-    proc add_renwin_observers {renwin} {
-        
-        # Check for aborting rendering
-
-        ::vtk::set_widget_variable_value $renwin AbortCheckEventTag \
-                [$renwin AddObserver AbortCheckEvent \
-                [list ::vtk::cb_renwin_abort_check_event $renwin]]
-    }
-
-    # -------------------------------------------------------------------
-    # vtk(Generic)RenderWindowInteractor callbacks/observers
-    #   iren: interactor object
-
-    # CreateTimerEvent/DestroyTimerEvent obversers.
-    # Handle the creation of a timer event (10 ms)
-    
-    proc cb_iren_create_timer_event {iren} {
-        set timer [after 10 "$iren TimerEvent"]
-        ::vtk::set_widget_variable_value $iren CreateTimerEventTimer $timer
-    }
-
-    proc cb_iren_destroy_timer_event {iren} {
-        set timer \
-                [::vtk::get_widget_variable_value $iren CreateTimerEventTimer]
-        if {$timer != ""} {
-            after cancel $timer
-        }
-    }
-
-    # UserEvent obverser.
-    # Popup the vtkInteract widget (simple wish-like console)
-    
-    proc cb_iren_user_event {} {
-        wm deiconify .vtkInteract
-    }
-
-    # ConfigureEvent obverser.
-    # This event is triggered when the widget is re-configured, i.e. its
-    # size is changed. Note that for every ConfigureEvent an ExposeEvent is
-    # triggered too and the corresponding observer will re-render the window.
-    # It might be nice to switch the frame update rate to an interactive
-    # update rate while the window is getting resized, so that the user can
-    # experience a decent feedback. This is achieved by launching a timer
-    # each time the ConfigureEvent is triggered. This timer lasts 300 ms. When
-    # the ExposeEvent observer is called, it checks if this timer still exists.
-    # If it is the case, it implies that the user is configuring/resizing the
-    # window and that an interactive frame rate may be used. If it is not, 
-    # it uses the still update rate to render the scene with full details. 
-    # The timer itself is a call to the ExposeEvent observer, which will 
-    # finaly render the window using a still update rate.
-
-    proc cb_iren_configure_event {iren} {
-        # Cancel the previous timer if any
-        set timer [::vtk::get_widget_variable_value $iren ConfigureEventTimer]
-        if {$timer != ""} {
-            after cancel $timer
-        }
-        ::vtk::set_widget_variable_value $iren ConfigureEventTimer \
-                [after 300 [list ::vtk::cb_iren_expose_event $iren]]
-    }
-
-    # ExposeEvent obverser.
-    # This event is triggered when a part (or all) of the widget is exposed,
-    # i.e. a new area is visible. It usually happens when the widget window
-    # is brought to the front, or when the widget is resized.
-    # See above for explanations about the update rate tricks.
-
-    proc cb_iren_expose_event {iren} {
-        set renwin [$iren GetRenderWindow]
-        # Check if a ConfigureEvent timer is pending
-        set timer [::vtk::get_widget_variable_value $iren ConfigureEventTimer]
-        if {$timer != ""} {
-            if {[catch {after info $timer}]} {
-                ::vtk::unset_widget_variable $iren ConfigureEventTimer
-                $renwin SetDesiredUpdateRate [$iren GetStillUpdateRate]
-            } else {
-                $renwin SetDesiredUpdateRate [$iren GetDesiredUpdateRate]
-            }
-        }
-        if { ! [$renwin IsA vtkCocoaRenderWindow] } {
-          update
-        }
-        $renwin Render
-    }
-
-    # ExitEvent obverser.
-    # Destroy all VTK objects (therefore, try not to call this function
-    # directly from a VTK object), then exit.
-
-    proc cb_exit {} {
-        vtkCommand DeleteAllObjects
-        exit
-    }
-
-    proc cb_iren_exit_event {} {
-        ::vtk::cb_exit
-    }
-
-    # Add the above observers to a vtk(Generic)RenderWindowInteractor
-
-    proc add_iren_observers {iren} {
-
-        # Timer events
-
-        ::vtk::set_widget_variable_value $iren CreateTimerEventTag \
-                [$iren AddObserver CreateTimerEvent \
-                [list ::vtk::cb_iren_create_timer_event $iren]]
-
-        ::vtk::set_widget_variable_value $iren DestroyTimerEventTag \
-                [$iren AddObserver DestroyTimerEvent \
-                [list ::vtk::cb_iren_destroy_timer_event $iren]]
-
-        # User Tk interactor
-
-        ::vtk::set_widget_variable_value $iren UserEventTag \
-                [$iren AddObserver UserEvent \
-                [list ::vtk::cb_iren_user_event]]
-
-        # Expose and Configure
-
-        ::vtk::set_widget_variable_value $iren ConfigureEventTag \
-                [$iren AddObserver ConfigureEvent \
-                [list ::vtk::cb_iren_configure_event $iren]]
-
-        ::vtk::set_widget_variable_value $iren ExposeEventTag \
-                [$iren AddObserver ExposeEvent \
-                [list ::vtk::cb_iren_expose_event $iren]]
-
-        # Exit
-        # Since the callback is likely to delete all VTK objects
-        # using vtkCommand::DeleteAllObject, let's try not to call it from
-        # the object itself. Use a timer.
-
-        ::vtk::set_widget_variable_value $iren ExitEventTag \
-                [$iren AddObserver ExitEvent \
-                "after 100 [list ::vtk::cb_iren_exit_event]"]
-    }
-
-    # -------------------------------------------------------------------
-    # Create vtkTk(ImageViewer/Render)Widget bindings, setup observers
-
-    proc bind_tk_widget {vtkw renwin} {
-        create_vtkw_bindings $vtkw $renwin
-        add_renwin_observers $renwin
-        add_iren_observers [$renwin GetInteractor]
-    }
-}
diff --git a/Wrapping/Tcl/vtkinteraction/setget.tcl b/Wrapping/Tcl/vtkinteraction/setget.tcl
deleted file mode 100644
index 4a5ee3bea5450a06c1c0b6fbfc76774801e8e1fa..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkinteraction/setget.tcl
+++ /dev/null
@@ -1,77 +0,0 @@
-namespace eval ::vtk {
-
-    namespace export *
-
-    # -------------------------------------------------------------------
-    # Some functions that can be used to associate variables to
-    # widgets without polluting the global space
-
-    variable gvars
-
-    # Generate a "unique" name for a widget variable
-
-    proc get_widget_variable {widget var_name} {
-        variable gvars
-        return "gvars($widget,vars,$var_name)"
-    }
-
-    # Set the value of a widget variable
-
-    proc set_widget_variable_value {widget var_name value} {
-        variable gvars
-        set var [get_widget_variable $widget $var_name]
-        set $var $value
-    }
-
-    proc unset_widget_variable {widget var_name} {
-        variable gvars
-        set var [get_widget_variable $widget $var_name]
-        if {[info exists $var]} {
-            unset $var
-        }
-    }
-
-    # Get the value of a widget variable ("" if undef)
-
-    proc get_widget_variable_value {widget var_name} {
-        variable gvars
-        set var [get_widget_variable $widget $var_name]
-        if {[info exists $var]} {
-            return [expr $$var]
-        } else {
-            return ""
-        }
-    }
-
-    # Return an object which will be associated with a widget
-
-    proc new_widget_object {widget type var_name} {
-        variable gvars
-        set var [get_widget_variable $widget "${var_name}_obj"]
-        $type $var
-        set_widget_variable_value $widget $var_name $var
-        return $var
-    }
-}
-
-# Handle deprecated calls
-
-proc GetWidgetVariable {widget varName} {
-    puts stderr "GetWidgetVariable is deprecated. Please use ::vtk::get_widget_variable instead"
-    return [::vtk::get_widget_variable $widget $varName]
-}
-
-proc SetWidgetVariableValue {widget varName value} {
-    puts stderr "SetWidgetVariableValue is deprecated. Please use ::vtk::set_widget_variable_value instead"
-    ::vtk::set_widget_variable_value $widget $varName $value
-}
-
-proc GetWidgetVariableValue {widget varName} {
-    puts stderr "GetWidgetVariableValue is deprecated. Please use ::vtk::get_widget_variable_value instead"
-    return [::vtk::get_widget_variable_value $widget $varName]
-}
-
-proc NewWidgetObject {widget type varName} {
-    puts stderr "NewWidgetObject is deprecated. Please use ::vtk::new_widget_object instead"
-    return [::vtk::new_widget_object $widget $type $varName]
-}
diff --git a/Wrapping/Tcl/vtkinteraction/vtkinteraction.tcl.in b/Wrapping/Tcl/vtkinteraction/vtkinteraction.tcl.in
deleted file mode 100644
index ad7f434b661a5940f91bb5c4c2870ab4d4a7922b..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkinteraction/vtkinteraction.tcl.in
+++ /dev/null
@@ -1,11 +0,0 @@
-package require -exact vtkrendering @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-
-# We need Tk to implement the interactive features.
-package require Tk
-
-# Load the interaction features.
-foreach s {Interactor bindings-rw bindings-iw bindings setget} {
-  source [file join [file dirname [info script]] "${s}.tcl"]
-}
-
-package provide vtkinteraction @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
diff --git a/Wrapping/Tcl/vtkio/CMakeLists.txt b/Wrapping/Tcl/vtkio/CMakeLists.txt
deleted file mode 100644
index 97b859f570657d2bf38095db7d2267f9efb29f29..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkio/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-IF(NOT VTK_INSTALL_NO_RUNTIME)
-
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/vtkio.tcl.in
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkio.tcl
-    @ONLY)
-
-  INSTALL(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkio.tcl
-    DESTINATION ${VTK_TCL_INSTALL_DIR_CM24}/vtkio
-    COMPONENT RuntimeLibraries)
-ENDIF(NOT VTK_INSTALL_NO_RUNTIME)
diff --git a/Wrapping/Tcl/vtkio/vtkio.tcl.in b/Wrapping/Tcl/vtkio/vtkio.tcl.in
deleted file mode 100644
index 86472a6048781a431e80a025c09f3b8b18c6d95f..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkio/vtkio.tcl.in
+++ /dev/null
@@ -1,12 +0,0 @@
-package require -exact vtkfiltering @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-
-if {[info commands ::vtk::init::require_package] != ""} {
-  if {[::vtk::init::require_package vtkIOTCL @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@]} {
-    package provide vtkio @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-  }
-} else {
-  if {[info commands vtkBMPReader] != "" ||
-    [::vtk::load_component vtkIOTCL] == ""} {
-    package provide vtkio @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-  }
-}
diff --git a/Wrapping/Tcl/vtkparallel/CMakeLists.txt b/Wrapping/Tcl/vtkparallel/CMakeLists.txt
deleted file mode 100644
index 3c2bedf9fc8b152095ef50c837c13e778eca122f..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkparallel/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-IF(NOT VTK_INSTALL_NO_RUNTIME)
-
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/vtkparallel.tcl.in
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkparallel.tcl
-    @ONLY)
-
-  INSTALL(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkparallel.tcl
-    DESTINATION ${VTK_TCL_INSTALL_DIR_CM24}/vtkparallel
-    COMPONENT RuntimeLibraries)
-ENDIF(NOT VTK_INSTALL_NO_RUNTIME)
diff --git a/Wrapping/Tcl/vtkparallel/vtkparallel.tcl.in b/Wrapping/Tcl/vtkparallel/vtkparallel.tcl.in
deleted file mode 100644
index 8fc83b983fb5e16200616c9b4f8395a2b2442b7b..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkparallel/vtkparallel.tcl.in
+++ /dev/null
@@ -1,13 +0,0 @@
-package require -exact vtkio @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-package require -exact vtkrendering @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-
-if {[info commands ::vtk::init::require_package] != ""} {
-  if {[::vtk::init::require_package vtkParallelTCL @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@]} {
-    package provide vtkparallel @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-  }
-} else {
-  if {[info commands vtkParallelFactory] != "" ||
-    [::vtk::load_component vtkParallelTCL] == ""} {
-    package provide vtkparallel @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-  }
-}
diff --git a/Wrapping/Tcl/vtkrendering/CMakeLists.txt b/Wrapping/Tcl/vtkrendering/CMakeLists.txt
deleted file mode 100644
index 52c7ade463a08e77c8c57b4b74dcf7b687c8afc9..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkrendering/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-IF(NOT VTK_INSTALL_NO_RUNTIME)
-
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/vtkrendering.tcl.in
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkrendering.tcl
-    @ONLY)
-
-  INSTALL(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkrendering.tcl
-    DESTINATION ${VTK_TCL_INSTALL_DIR_CM24}/vtkrendering
-    COMPONENT RuntimeLibraries)
-ENDIF(NOT VTK_INSTALL_NO_RUNTIME)
diff --git a/Wrapping/Tcl/vtkrendering/vtkrendering.tcl.in b/Wrapping/Tcl/vtkrendering/vtkrendering.tcl.in
deleted file mode 100644
index a59b6fc223d36b48c7995788aa3ffb3d023c3c8d..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkrendering/vtkrendering.tcl.in
+++ /dev/null
@@ -1,45 +0,0 @@
-package require -exact vtkgraphics @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-package require -exact vtkimaging @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-
-catch {
-    unset __tk_error
-}
-
-namespace eval ::vtk::rendering {
-  proc SetWin32ExitCallback {} {
-    # Set the default exit method of vtkWin32RenderWindowInteractor to
-    # call the Tcl 'exit' command
-    if {[info commands vtkWin32RenderWindowInteractor] != ""} {
-      if {[catch {
-        # this exit method is called when the user exists interactively
-        # (such as pressing 'e' or 'q'). An extra reference is added to 
-        # the callback command used to process it by the
-        # vtkSubjectHelper::InvokeEvent method. If the callback exits the
-        # application immediately in its Execute() method, this reference
-        # is never removed and the object leaks. Using 'after idle' allows
-        # the stack to unwind far enough. This is similar to Win32
-        # PostQuitMessage() logic.
-        vtkWin32RenderWindowInteractor __temp_vtkwin32iren__
-        __temp_vtkwin32iren__ SetClassExitMethod {after idle exit}
-        __temp_vtkwin32iren__ Delete
-      } errormsg]} {
-        puts $errormsg
-      }
-    }
-  }
-}
-
-if {[info commands ::vtk::init::require_package] != ""} {
-  if {![info exists __tk_error] && \
-       [::vtk::init::require_package vtkRenderingTCL @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@]} {
-    ::vtk::rendering::SetWin32ExitCallback
-    package provide vtkrendering @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-  }
-} else {
-  if {![info exists __tk_error] && \
-        ([info commands vtkAxisActor2D] != "" || \
-        [::vtk::load_component vtkRenderingTCL] == "")} {
-    ::vtk::rendering::SetWin32ExitCallback
-    package provide vtkrendering @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-  }
-}
diff --git a/Wrapping/Tcl/vtktesting/CMakeLists.txt b/Wrapping/Tcl/vtktesting/CMakeLists.txt
deleted file mode 100644
index f1ab479acf3923dd91720b315f1d5337943a2140..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtktesting/CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-IF(NOT VTK_INSTALL_NO_RUNTIME)
-
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/backdrop.tcl
-    ${CMAKE_CURRENT_BINARY_DIR}/backdrop.tcl
-    COPYONLY)
-    
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/colors.tcl
-    ${CMAKE_CURRENT_BINARY_DIR}/colors.tcl
-    COPYONLY)
-
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/mccases.tcl
-    ${CMAKE_CURRENT_BINARY_DIR}/mccases.tcl
-    COPYONLY)
-
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/vtktesting.tcl.in
-    ${CMAKE_CURRENT_BINARY_DIR}/vtktesting.tcl
-    @ONLY)
-
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/grab.tcl.in
-    ${CMAKE_CURRENT_BINARY_DIR}/grab.tcl
-    @ONLY)
-
-  INSTALL(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/vtktesting.tcl
-    ${CMAKE_CURRENT_SOURCE_DIR}/backdrop.tcl
-    ${CMAKE_CURRENT_BINARY_DIR}/grab.tcl
-    ${CMAKE_CURRENT_SOURCE_DIR}/colors.tcl
-    ${CMAKE_CURRENT_SOURCE_DIR}/mccases.tcl
-    DESTINATION ${VTK_TCL_INSTALL_DIR_CM24}/vtktesting
-    COMPONENT RuntimeLibraries)
-ENDIF(NOT VTK_INSTALL_NO_RUNTIME)
diff --git a/Wrapping/Tcl/vtkviews/CMakeLists.txt b/Wrapping/Tcl/vtkviews/CMakeLists.txt
deleted file mode 100644
index fedc2716e54a976aa5d49a3443b25d6d49966cc4..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkviews/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-IF(NOT VTK_INSTALL_NO_RUNTIME)
-
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/vtkviews.tcl.in
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkviews.tcl
-    @ONLY)
-
-  INSTALL(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkviews.tcl
-    DESTINATION ${VTK_TCL_INSTALL_DIR_CM24}/vtkviews
-    COMPONENT RuntimeLibraries)
-ENDIF(NOT VTK_INSTALL_NO_RUNTIME)
diff --git a/Wrapping/Tcl/vtkviews/vtkviews.tcl.in b/Wrapping/Tcl/vtkviews/vtkviews.tcl.in
deleted file mode 100644
index 21aa8317c6e4c65148d5f391862976b01ce776f3..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkviews/vtkviews.tcl.in
+++ /dev/null
@@ -1,12 +0,0 @@
-package require -exact vtkwidgets @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-
-if {[info commands ::vtk::init::require_package] != ""} {
-  if {[::vtk::init::require_package vtkViewsTCL @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@]} {
-    package provide vtkviews @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-  }
-} else {
-  if {[info commands vtkGraphLayout] != "" ||
-    [::vtk::load_component vtkViewsTCL] == ""} {
-    package provide vtkviews @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-  }
-}
diff --git a/Wrapping/Tcl/vtkvolumerendering/CMakeLists.txt b/Wrapping/Tcl/vtkvolumerendering/CMakeLists.txt
deleted file mode 100644
index 8d40b108831e6df80dddc29d1eb4bce86b72289c..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkvolumerendering/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-IF(NOT VTK_INSTALL_NO_RUNTIME)
-
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/vtkvolumerendering.tcl.in
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkvolumerendering.tcl
-    @ONLY)
-
-  INSTALL(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkvolumerendering.tcl
-    DESTINATION ${VTK_TCL_INSTALL_DIR_CM24}/vtkvolumerendering
-    COMPONENT RuntimeLibraries)
-ENDIF(NOT VTK_INSTALL_NO_RUNTIME)
diff --git a/Wrapping/Tcl/vtkvolumerendering/vtkvolumerendering.tcl.in b/Wrapping/Tcl/vtkvolumerendering/vtkvolumerendering.tcl.in
deleted file mode 100644
index 748603c54bb938ad70d7e865ea9f1c078e635efc..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkvolumerendering/vtkvolumerendering.tcl.in
+++ /dev/null
@@ -1,12 +0,0 @@
-package require -exact vtkrendering @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-
-if {[info commands ::vtk::init::require_package] != ""} {
-  if {[::vtk::init::require_package vtkVolumeRenderingTCL @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@]} {
-    package provide vtkvolumerendering @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-  }
-} else {
-  if {[info commands vtkEncodedGradientShader] != "" ||
-    [::vtk::load_component vtkVolumeRenderingTCL] == ""} {
-    package provide vtkvolumerendering @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-  }
-}
diff --git a/Wrapping/Tcl/vtkwidgets/CMakeLists.txt b/Wrapping/Tcl/vtkwidgets/CMakeLists.txt
deleted file mode 100644
index 83252444f21288accd948086e4b6e7ac16804698..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkwidgets/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-IF(NOT VTK_INSTALL_NO_RUNTIME)
-
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/vtkwidgets.tcl.in
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkwidgets.tcl
-    @ONLY)
-
-  INSTALL(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/vtkwidgets.tcl
-    DESTINATION ${VTK_TCL_INSTALL_DIR_CM24}/vtkwidgets
-    COMPONENT RuntimeLibraries)
-ENDIF(NOT VTK_INSTALL_NO_RUNTIME)
diff --git a/Wrapping/Tcl/vtkwidgets/vtkwidgets.tcl.in b/Wrapping/Tcl/vtkwidgets/vtkwidgets.tcl.in
deleted file mode 100644
index 16a996397a80c060841097cfa4ba08456fae84d2..0000000000000000000000000000000000000000
--- a/Wrapping/Tcl/vtkwidgets/vtkwidgets.tcl.in
+++ /dev/null
@@ -1,12 +0,0 @@
-package require -exact vtkhybrid @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-
-if {[info commands ::vtk::init::require_package] != ""} {
-  if {[::vtk::init::require_package vtkWidgetsTCL @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@]} {
-    package provide vtkwidgets @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-  }
-} else {
-  if {[info commands vtkBorderWidget] != "" ||
-    [::vtk::load_component vtkWidgetsTCL] == ""} {
-    package provide vtkwidgets @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
-  }
-}
diff --git a/vtkGenerateVTKConfig.cmake b/vtkGenerateVTKConfig.cmake
deleted file mode 100644
index cfe0cfbe7398f35cd4896b142ae0ab467d180958..0000000000000000000000000000000000000000
--- a/vtkGenerateVTKConfig.cmake
+++ /dev/null
@@ -1,377 +0,0 @@
-# Generate the VTKConfig.cmake file in the build tree.  Also configure
-# one for installation.  The file tells external projects how to use
-# VTK.
-
-# Construct version numbers for VTKConfigVersion.cmake.
-SET(_VTK_VERSION_MAJOR ${VTK_MAJOR_VERSION})
-SET(_VTK_VERSION_MINOR ${VTK_MINOR_VERSION})
-SET(_VTK_VERSION_PATCH ${VTK_BUILD_VERSION})
-# We use odd minor numbers for development versions.
-# Use a date for the development patch level.
-IF("${_VTK_VERSION_MINOR}" MATCHES "[13579]$")
-  INCLUDE(${VTK_SOURCE_DIR}/Utilities/kwsys/kwsysDateStamp.cmake)
-  SET(_VTK_VERSION_PATCH
-    "${KWSYS_DATE_STAMP_YEAR}${KWSYS_DATE_STAMP_MONTH}${KWSYS_DATE_STAMP_DAY}"
-    )
-ENDIF("${_VTK_VERSION_MINOR}" MATCHES "[13579]$")
-
-# Help store a literal dollar in a string.  CMake 2.2 allows escaped
-# dollars but we have to support CMake 2.0.
-SET(DOLLAR "$")
-
-# Executable extension
-IF(WIN32)
-  SET(VTK_EXE_EXT ".exe")
-ENDIF(WIN32)
-
-# Make sure all of the Tcl/Tk macros are loaded.
-INCLUDE(${VTK_SOURCE_DIR}/CMake/vtkTclTkMacros.cmake)
-
-#-----------------------------------------------------------------------------
-# Settings shared between the build tree and install tree.
-
-IF(VTK_USE_MPI)
-  SET(VTK_MPIRUN_EXE_CONFIG ${VTK_MPIRUN_EXE})
-  SET(VTK_MPI_PRENUMPROC_FLAGS_CONFIG ${VTK_MPI_PRENUMPROC_FLAGS})
-  SET(VTK_MPI_NUMPROC_FLAG_CONFIG ${VTK_MPI_NUMPROC_FLAG})
-  SET(VTK_MPI_MAX_NUMPROCS_CONFIG ${VTK_MPI_MAX_NUMPROCS})
-  SET(VTK_MPI_POSTFLAGS_CONFIG ${VTK_MPI_POSTFLAGS})
-  SET(VTK_MPI_PREFLAGS_CONFIG ${VTK_MPI_PREFLAGS})
-  SET(VTK_MPI_CLIENT_PREFLAGS_CONFIG ${VTK_MPI_CLIENT_PREFLAGS})
-  SET(VTK_MPI_SERVER_PREFLAGS_CONFIG ${VTK_MPI_SERVER_PREFLAGS})
-ELSE(VTK_USE_MPI)
-  SET(VTK_MPIRUN_EXE_CONFIG "")
-  SET(VTK_MPI_NUMPROC_FLAG_CONFIG "")
-  SET(VTK_MPI_MAX_NUMPROCS_CONFIG "")
-  SET(VTK_MPI_POSTFLAGS_CONFIG "")
-  SET(VTK_MPI_PREFLAGS_CONFIG "")
-  SET(VTK_MPI_CLIENT_PREFLAGS_CONFIG "")
-  SET(VTK_MPI_SERVER_PREFLAGS_CONFIG "")
-ENDIF(VTK_USE_MPI)
-
-# Some setting for the remote testing
-SET(VTK_MPI_CLIENT_POSTFLAGS_CONFIG ${VTK_MPI_CLIENT_POSTFLAGS})
-SET(VTK_MPI_SERVER_POSTFLAGS_CONFIG ${VTK_MPI_SERVER_POSTFLAGS})
-
-#-----------------------------------------------------------------------------
-# Settings specific to the build tree.
-
-# The install-only section is empty for the build tree.
-SET(VTK_CONFIG_INSTALL_ONLY)
-
-# The "use" file.
-SET(VTK_USE_FILE ${VTK_BINARY_DIR}/UseVTK.cmake)
-
-# The build settings file.
-SET(VTK_BUILD_SETTINGS_FILE ${VTK_BINARY_DIR}/VTKBuildSettings.cmake)
-
-# The directory containing class list files for each kit.
-SET(VTK_KITS_DIR_CONFIG ${VTK_BINARY_DIR}/Utilities)
-
-# The wrapping hints file.
-SET(VTK_WRAP_HINTS_CONFIG ${VTK_WRAP_HINTS})
-
-# Library directory.
-SET(VTK_LIBRARY_DIRS_CONFIG ${LIBRARY_OUTPUT_PATH})
-
-# Runtime library directory.
-SET(VTK_RUNTIME_LIBRARY_DIRS_CONFIG ${LIBRARY_OUTPUT_PATH})
-
-# Binary executable directory.
-SET(VTK_EXECUTABLE_DIRS_CONFIG ${EXECUTABLE_OUTPUT_PATH})
-
-# Determine the include directories needed.
-SET(VTK_INCLUDE_DIRS_CONFIG
-  ${VTK_INCLUDE_DIRS_BUILD_TREE}
-  ${VTK_INCLUDE_DIRS_SOURCE_TREE}
-)
-
-# Executable locations.
-SET(VTK_TCL_HOME_CONFIG "")
-SET(VTK_PYTHONPATH_DIRS_CONFIG "")
-SET(VTK_JAVA_JAR_CONFIG "")
-SET(VTK_PARSE_JAVA_EXE_CONFIG "")
-SET(VTK_WRAP_JAVA_EXE_CONFIG "")
-SET(VTK_WRAP_PYTHON_EXE_CONFIG "")
-SET(VTK_WRAP_PYTHON_INIT_EXE_CONFIG "")
-SET(VTK_WRAP_TCL_EXE_CONFIG "")
-SET(VTK_WRAP_TCL_INIT_EXE_CONFIG "")
-IF(VTK_WRAP_TCL)
-  SET(VTK_WRAP_TCL_EXE_CONFIG ${VTK_EXECUTABLE_DIR}/vtkWrapTcl${VTK_EXE_EXT})
-  SET(VTK_WRAP_TCL_INIT_EXE_CONFIG ${VTK_EXECUTABLE_DIR}/vtkWrapTclInit${VTK_EXE_EXT})
-  SET(VTK_TCL_HOME_CONFIG ${VTK_TCL_HOME})
-ENDIF(VTK_WRAP_TCL)
-IF(VTK_WRAP_PYTHON)
-  SET(VTK_PYTHONPATH_DIRS_CONFIG ${VTK_BINARY_DIR}/Wrapping/Python ${LIBRARY_OUTPUT_PATH})
-  SET(VTK_WRAP_PYTHON_EXE_CONFIG ${VTK_EXECUTABLE_DIR}/vtkWrapPython${VTK_EXE_EXT})
-  SET(VTK_WRAP_PYTHON_INIT_EXE_CONFIG ${VTK_EXECUTABLE_DIR}/vtkWrapPythonInit${VTK_EXE_EXT})
-ENDIF(VTK_WRAP_PYTHON)
-IF(VTK_WRAP_JAVA)
-  SET(VTK_PARSE_JAVA_EXE_CONFIG ${VTK_EXECUTABLE_DIR}/vtkParseJava${VTK_EXE_EXT})
-  SET(VTK_WRAP_JAVA_EXE_CONFIG ${VTK_EXECUTABLE_DIR}/vtkWrapJava${VTK_EXE_EXT})
-  SET(VTK_JAVA_JAR_CONFIG ${LIBRARY_OUTPUT_PATH}/vtk.jar)
-ENDIF(VTK_WRAP_JAVA)
-SET(VTK_ENCODESTRING_EXE_CONFIG ${VTK_EXECUTABLE_DIR}/vtkEncodeString${VTK_EXE_EXT})
-# VTK style script locations.
-SET(VTK_DOXYGEN_HOME_CONFIG ${VTK_SOURCE_DIR}/Utilities/Doxygen)
-SET(VTK_HEADER_TESTING_PY_CONFIG ${VTK_SOURCE_DIR}/Common/Testing/HeaderTesting.py)
-SET(VTK_FIND_STRING_TCL_CONFIG ${VTK_SOURCE_DIR}/Common/Testing/Tcl/FindString.tcl)
-SET(VTK_PRINT_SELF_CHECK_TCL_CONFIG ${VTK_SOURCE_DIR}/Common/Testing/Tcl/PrintSelfCheck.tcl)
-SET(VTK_RT_IMAGE_TEST_TCL_CONFIG ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl)
-
-IF(VTK_USE_PARALLEL)
-  SET(VTK_PRT_IMAGE_TEST_TCL_CONFIG ${VTK_SOURCE_DIR}/Common/Testing/Tcl/prtImageTest.tcl)
-ELSE(VTK_USE_PARALLEL)
-  SET(VTK_PRT_IMAGE_TEST_TCL_CONFIG "")
-ENDIF(VTK_USE_PARALLEL)
-
-# Location of tk internal headers and resources provided by VTK.
-SET(VTK_TK_INTERNAL_DIR_CONFIG "${TK_INTERNAL_PATH}")
-
-# The resources dir is only worth exporting if we are building with
-# Tcl/Tk static
-SET(VTK_TK_RESOURCES_DIR_CONFIG "")
-IF(VTK_USE_TK AND VTK_TCL_TK_STATIC)
-  SET(VTK_TK_RESOURCES_DIR_CONFIG ${VTK_TK_RESOURCES_DIR})
-ENDIF(VTK_USE_TK AND VTK_TCL_TK_STATIC)
-
-SET(VTK_TCL_SUPPORT_LIBRARY_PATH_CONFIG ${VTK_TCL_SUPPORT_LIBRARY_PATH})
-SET(VTK_TK_SUPPORT_LIBRARY_PATH_CONFIG ${VTK_TK_SUPPORT_LIBRARY_PATH})
-
-# CMake extension module directory.
-SET(VTK_LOAD_CMAKE_EXTENSIONS_MACRO_CONFIG
-    "${VTK_CMAKE_DIR}/vtkLoadCMakeExtensions.cmake")
-SET(VTK_CMAKE_DIR_CONFIG
-    "${VTK_CMAKE_DIR}")
-SET(VTK_TCL_TK_MACROS_MODULE_CONFIG
-    "${VTK_CMAKE_DIR}/vtkTclTkMacros.cmake")
-SET(VTK_CMAKE_EXTENSIONS_DIR_CONFIG ${VTK_BINARY_DIR}/CMake)
-
-# Export Targets file.
-SET(VTK_TARGETS_FILE "${VTK_BINARY_DIR}/${VTK_INSTALL_EXPORT_NAME}.cmake")
-
-# Build configuration information.
-SET(VTK_CONFIGURATION_TYPES_CONFIG ${CMAKE_CONFIGURATION_TYPES})
-SET(VTK_BUILD_TYPE_CONFIG ${CMAKE_BUILD_TYPE})
-
-# Hack to give source tree access for a build tree configuration.
-STRING(ASCII 35 VTK_STRING_POUND)
-STRING(ASCII 64 VTK_STRING_AT)
-SET(VTK_CONFIG_BACKWARD_COMPATIBILITY_HACK
-  "\n${VTK_STRING_POUND} For backward compatability.  DO NOT USE.\nSET(VTK_SOURCE_DIR \"${VTK_SOURCE_DIR}\")\nIF(NOT TCL_LIBRARY)\n  SET(TCL_LIBRARY \"${TCL_LIBRARY}\" CACHE FILEPATH \"Location of Tcl library imported from VTK.  This may mean your project is depending on VTK to get this setting.  Consider using FindTCL.cmake.\")\nENDIF(NOT TCL_LIBRARY)\nIF(NOT TK_LIBRARY)\n  SET(TK_LIBRARY \"${TK_LIBRARY}\" CACHE FILEPATH \"Location of Tk library imported from VTK.  This may mean your project is depending on VTK to get this setting.  Consider using FindTCL.cmake.\")\nENDIF(NOT TK_LIBRARY)\nMARK_AS_ADVANCED(TCL_LIBRARY TK_LIBRARY)\n")
-
-#-----------------------------------------------------------------------------
-# Configure VTKConfig.cmake for the build tree.
-CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfig.cmake.in
-               ${VTK_BINARY_DIR}/VTKConfig.cmake @ONLY IMMEDIATE)
-CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfigVersion.cmake.in
-               ${VTK_BINARY_DIR}/VTKConfigVersion.cmake @ONLY IMMEDIATE)
-
-#-----------------------------------------------------------------------------
-# Settings specific to the install tree.
-
-# The "use" file.
-SET(VTK_USE_FILE ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_PACKAGE_DIR}/UseVTK.cmake)
-
-# The build settings file.
-SET(VTK_BUILD_SETTINGS_FILE ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_PACKAGE_DIR}/VTKBuildSettings.cmake)
-
-# The directory containing class list files for each kit.
-SET(VTK_KITS_DIR_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_PACKAGE_DIR})
-
-# The wrapping hints file.
-IF(VTK_WRAP_HINTS)
-  GET_FILENAME_COMPONENT(VTK_HINTS_FNAME ${VTK_WRAP_HINTS} NAME)
-  SET(VTK_WRAP_HINTS_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_PACKAGE_DIR}/${VTK_HINTS_FNAME})
-ENDIF(VTK_WRAP_HINTS)
-
-# Include directories.
-SET(VTK_INCLUDE_DIRS_CONFIG
-  ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_INCLUDE_DIR}
-)
-
-# Link directories.
-IF(CYGWIN AND BUILD_SHARED_LIBS)
-  # In Cygwin programs directly link to the .dll files.
-  SET(VTK_LIBRARY_DIRS_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_BIN_DIR})
-ELSE(CYGWIN AND BUILD_SHARED_LIBS)
-  SET(VTK_LIBRARY_DIRS_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_LIB_DIR})
-ENDIF(CYGWIN AND BUILD_SHARED_LIBS)
-
-# Executable and runtime library directories.
-IF(WIN32)
-  SET(VTK_EXECUTABLE_DIRS_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_BIN_DIR})
-  SET(VTK_RUNTIME_LIBRARY_DIRS_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_BIN_DIR})
-ELSE(WIN32)
-  SET(VTK_EXECUTABLE_DIRS_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_BIN_DIR})
-  SET(VTK_RUNTIME_LIBRARY_DIRS_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_LIB_DIR})
-ENDIF(WIN32)
-
-# Executable locations.
-SET(VTK_TCL_HOME_CONFIG "")
-SET(VTK_PYTHONPATH_DIRS "")
-SET(VTK_JAVA_JAR_CONFIG "")
-SET(VTK_PARSE_JAVA_EXE_CONFIG "")
-SET(VTK_WRAP_JAVA_EXE_CONFIG "")
-SET(VTK_WRAP_PYTHON_EXE_CONFIG "")
-SET(VTK_WRAP_PYTHON_INIT_EXE_CONFIG "")
-SET(VTK_WRAP_TCL_EXE_CONFIG "")
-SET(VTK_WRAP_TCL_INIT_EXE_CONFIG "")
-SET(VTK_DOXYGEN_HOME_CONFIG "")
-IF(VTK_WRAP_TCL)
-  SET(VTK_WRAP_TCL_EXE_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_BIN_DIR}/vtkWrapTcl${VTK_EXE_EXT})
-  SET(VTK_WRAP_TCL_INIT_EXE_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_BIN_DIR}/vtkWrapTclInit${VTK_EXE_EXT})
-  SET(VTK_TCL_HOME_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_TCL_DIR})
-ENDIF(VTK_WRAP_TCL)
-IF(VTK_WRAP_PYTHON)
-  IF(VTK_PYTHON_MODULE_PLATFORM_INSTALL_DIR EQUAL "${VTK_PYTHON_MODULE_INSTALL_DIR}")
-    SET(VTK_PYTHONPATH_DIRS_CONFIG ${VTK_PYTHON_MODULE_INSTALL_DIR})
-  ELSE(VTK_PYTHON_MODULE_PLATFORM_INSTALL_DIR EQUAL "${VTK_PYTHON_MODULE_INSTALL_DIR}")
-    SET(VTK_PYTHONPATH_DIRS_CONFIG ${VTK_PYTHON_MODULE_INSTALL_DIR} ${VTK_PYTHON_MODULE_PLATFORM_INSTALL_DIR})
-  ENDIF(VTK_PYTHON_MODULE_PLATFORM_INSTALL_DIR EQUAL "${VTK_PYTHON_MODULE_INSTALL_DIR}")
-  STRING(REGEX REPLACE "{CMAKE_INSTALL_PREFIX}"
-    "{VTK_INSTALL_PREFIX}" VTK_PYTHONPATH_DIRS_CONFIG
-    "${VTK_PYTHONPATH_DIRS_CONFIG}")
-  SET(VTK_WRAP_PYTHON_EXE_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_BIN_DIR}/vtkWrapPython${VTK_EXE_EXT})
-  SET(VTK_WRAP_PYTHON_INIT_EXE_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_BIN_DIR}/vtkWrapPythonInit${VTK_EXE_EXT})
-ENDIF(VTK_WRAP_PYTHON)
-IF(VTK_WRAP_JAVA)
-  SET(VTK_PARSE_JAVA_EXE_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_BIN_DIR}/vtkParseJava${VTK_EXE_EXT})
-  SET(VTK_WRAP_JAVA_EXE_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_BIN_DIR}/vtkWrapJava${VTK_EXE_EXT})
-  SET(VTK_JAVA_JAR_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_JAVA_DIR}/vtk.jar)
-ENDIF(VTK_WRAP_JAVA)
-SET(VTK_ENCODESTRING_EXE_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_BIN_DIR}/vtkEncodeString${VTK_EXE_EXT})
-
-# VTK style script locations.
-SET(VTK_DOXYGEN_HOME_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_DOXYGEN_DIR})
-SET(VTK_HEADER_TESTING_PY_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_PACKAGE_DIR}/testing/HeaderTesting.py)
-SET(VTK_FIND_STRING_TCL_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_PACKAGE_DIR}/testing/FindString.tcl)
-SET(VTK_PRINT_SELF_CHECK_TCL_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_PACKAGE_DIR}/testing/PrintSelfCheck.tcl)
-SET(VTK_RT_IMAGE_TEST_TCL_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_PACKAGE_DIR}/testing/rtImageTest.tcl)
-
-IF(VTK_USE_PARALLEL)
-  SET(VTK_PRT_IMAGE_TEST_TCL_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_PACKAGE_DIR}/testing/prtImageTest.tcl)
-ELSE(VTK_USE_PARALLEL)
-  SET(VTK_PRT_IMAGE_TEST_TCL_CONFIG "")
-ENDIF(VTK_USE_PARALLEL)
-
-# Location of tk internal headers and resources provided by VTK.
-SET(VTK_TK_INTERNAL_DIR_CONFIG "")
-IF(TK_INTERNAL_PATH)
-  VTK_GET_TCL_TK_VERSION ("TCL_TK_MAJOR_VERSION" "TCL_TK_MINOR_VERSION")
-  SET (TCL_TK_VERSION "${TCL_TK_MAJOR_VERSION}.${TCL_TK_MINOR_VERSION}")
-  IF("${TK_INTERNAL_PATH}" MATCHES 
-     "Utilities/TclTk/internals/tk${TCL_TK_VERSION}")
-    SET(VTK_TK_INTERNAL_DIR_CONFIG 
-        ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_INCLUDE_DIR}/TclTk/internals/tk${TCL_TK_VERSION})
-  ENDIF("${TK_INTERNAL_PATH}" MATCHES 
-        "Utilities/TclTk/internals/tk${TCL_TK_VERSION}")
-ENDIF(TK_INTERNAL_PATH)
-
-SET(VTK_TK_INTERNAL_ROOT_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_INCLUDE_DIR})
-
-# The resources dir is only worth exporting if we are building with
-# Tcl/Tk static
-SET(VTK_TK_RESOURCES_DIR_CONFIG "")
-IF(VTK_USE_TK AND VTK_TCL_TK_STATIC)
-  IF(VTK_TK_RESOURCES_DIR)
-    VTK_GET_TCL_TK_VERSION ("TCL_TK_MAJOR_VERSION" "TCL_TK_MINOR_VERSION")
-    SET (TCL_TK_VERSION "${TCL_TK_MAJOR_VERSION}.${TCL_TK_MINOR_VERSION}")
-    IF("${VTK_TK_RESOURCES_DIR}" MATCHES 
-        "Utilities/TclTk/resources/tk${TCL_TK_VERSION}")
-      SET(VTK_TK_RESOURCES_DIR_CONFIG 
-        ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_INCLUDE_DIR}/TclTk/resources/tk${TCL_TK_VERSION}/win/rc)
-    ENDIF("${VTK_TK_RESOURCES_DIR}" MATCHES 
-      "Utilities/TclTk/resources/tk${TCL_TK_VERSION}")
-  ENDIF(VTK_TK_RESOURCES_DIR)
-ENDIF(VTK_USE_TK AND VTK_TCL_TK_STATIC)
-
-IF(VTK_TCL_TK_COPY_SUPPORT_LIBRARY)
-  VTK_GET_TCL_TK_VERSION ("TCL_TK_MAJOR_VERSION" "TCL_TK_MINOR_VERSION")
-  SET (TCL_TK_VERSION "${TCL_TK_MAJOR_VERSION}.${TCL_TK_MINOR_VERSION}")
-  SET(VTK_TCL_SUPPORT_LIBRARY_PATH_CONFIG 
-    ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_TCL_DIR}/tcl${TCL_TK_VERSION})
-  SET(VTK_TK_SUPPORT_LIBRARY_PATH_CONFIG
-    ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_TCL_DIR}/tk${TCL_TK_VERSION})
-ELSE(VTK_TCL_TK_COPY_SUPPORT_LIBRARY)
-  SET(VTK_TCL_SUPPORT_LIBRARY_PATH_CONFIG ${VTK_TCL_SUPPORT_LIBRARY_PATH})
-  SET(VTK_TK_SUPPORT_LIBRARY_PATH_CONFIG ${VTK_TK_SUPPORT_LIBRARY_PATH})
-ENDIF(VTK_TCL_TK_COPY_SUPPORT_LIBRARY)
-
-# CMake extension module directory and macro file.
-SET(VTK_CMAKE_DIR_CONFIG
-    "${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_PACKAGE_DIR}/CMake")
-SET(VTK_TCL_TK_MACROS_MODULE_CONFIG
-    "${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_PACKAGE_DIR}/CMake/vtkTclTkMacros.cmake")
-SET(VTK_CMAKE_EXTENSIONS_DIR_CONFIG ${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_PACKAGE_DIR}/CMake)
-
-# Exported targets file.
-SET(VTK_TARGETS_FILE "${DOLLAR}{VTK_INSTALL_PREFIX}${VTK_INSTALL_PACKAGE_DIR}/${VTK_INSTALL_EXPORT_NAME}.cmake")
-
-# No backward compatibility hack needed for installed path
-SET(VTK_CONFIG_BACKWARD_COMPATIBILITY_HACK)
-
-#-----------------------------------------------------------------------------
-# Configure VTKConfig.cmake for the install tree.
-
-# Construct the proper number of GET_FILENAME_COMPONENT(... PATH)
-# calls to compute the installation prefix from VTK_DIR.
-STRING(REGEX REPLACE "/" ";" VTK_INSTALL_PACKAGE_DIR_COUNT
-  "${VTK_INSTALL_PACKAGE_DIR}")
-SET(VTK_CONFIG_INSTALL_ONLY "
-# Compute the installation prefix from VTK_DIR.
-SET(VTK_INSTALL_PREFIX \"${DOLLAR}{VTK_DIR}\")
-")
-FOREACH(p ${VTK_INSTALL_PACKAGE_DIR_COUNT})
-  SET(VTK_CONFIG_INSTALL_ONLY
-    "${VTK_CONFIG_INSTALL_ONLY}GET_FILENAME_COMPONENT(VTK_INSTALL_PREFIX \"${DOLLAR}{VTK_INSTALL_PREFIX}\" PATH)\n"
-    )
-ENDFOREACH(p)
-
-# The install tree only has one configuration.
-SET(VTK_CONFIGURATION_TYPES_CONFIG)
-
-IF(CMAKE_CONFIGURATION_TYPES)
-  # There are multiple build configurations.  Configure one
-  # VTKConfig.cmake for each configuration.
-  FOREACH(config ${CMAKE_CONFIGURATION_TYPES})
-    SET(VTK_BUILD_TYPE_CONFIG ${config})
-    CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfig.cmake.in
-                   ${VTK_BINARY_DIR}/Utilities/${config}/VTKConfig.cmake
-                   @ONLY IMMEDIATE)
-  ENDFOREACH(config)
-
-  # Install the config file corresponding to the build configuration
-  # specified when building the install target.  The BUILD_TYPE variable
-  # will be set while CMake is processing the install files.
-  IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-    INSTALL(FILES
-      ${VTK_BINARY_DIR}/Utilities/${DOLLAR}{BUILD_TYPE}/VTKConfig.cmake
-      DESTINATION ${VTK_INSTALL_PACKAGE_DIR_CM24}
-      COMPONENT Development
-      )
-  ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-ELSE(CMAKE_CONFIGURATION_TYPES)
-  # There is only one build configuration.  Configure one VTKConfig.cmake.
-  SET(VTK_BUILD_TYPE_CONFIG ${CMAKE_BUILD_TYPE})
-  CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfig.cmake.in
-                 ${VTK_BINARY_DIR}/Utilities/VTKConfig.cmake @ONLY IMMEDIATE)
-
-  # Setup an install rule for the config file.
-  IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-    INSTALL(FILES
-      ${VTK_BINARY_DIR}/Utilities/VTKConfig.cmake
-      DESTINATION ${VTK_INSTALL_PACKAGE_DIR_CM24}
-      COMPONENT Development
-      )
-  ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-ENDIF(CMAKE_CONFIGURATION_TYPES)
-
-# Create and install the package version file.
-CONFIGURE_FILE(${VTK_SOURCE_DIR}/VTKConfigVersion.cmake.in
-               ${VTK_BINARY_DIR}/Utilities/VTKConfigVersion.cmake
-               @ONLY IMMEDIATE)
-IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
-  INSTALL(FILES ${VTK_BINARY_DIR}/Utilities/VTKConfigVersion.cmake
-    DESTINATION ${VTK_INSTALL_PACKAGE_DIR_CM24} COMPONENT Development)
-ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
diff --git a/vtkIncludeDirectories.cmake b/vtkIncludeDirectories.cmake
deleted file mode 100644
index d46723b4055b23b4841dd98e1c0a6df5440a12f0..0000000000000000000000000000000000000000
--- a/vtkIncludeDirectories.cmake
+++ /dev/null
@@ -1,259 +0,0 @@
-#-----------------------------------------------------------------------------
-# Include directories for other projects installed on the system.
-SET(VTK_INCLUDE_DIRS_SYSTEM "")
-IF(VTK_USE_RENDERING)
-  # OpenGL include directories.
-  IF(APPLE)
-    IF(VTK_USE_X)
-       SET(VTK_INCLUDE_DIRS_SYSTEM ${VTK_INCLUDE_DIRS_SYSTEM}
-           ${OPENGL_INCLUDE_DIR})
-    ENDIF(VTK_USE_X)
-  ELSE(APPLE)
-       SET(VTK_INCLUDE_DIRS_SYSTEM ${VTK_INCLUDE_DIRS_SYSTEM}
-           ${OPENGL_INCLUDE_DIR})
-  ENDIF(APPLE)
-
-  IF(VTK_USE_X)
-    # X include directories.
-    SET(VTK_INCLUDE_DIRS_SYSTEM ${VTK_INCLUDE_DIRS_SYSTEM} ${X11_INCLUDE_DIR})
-  ENDIF(VTK_USE_X)
-
-  # Off-Screen Mesa include directory.
-  IF(VTK_OPENGL_HAS_OSMESA)
-    IF(OSMESA_INCLUDE_DIR)
-      SET(VTK_INCLUDE_DIRS_SYSTEM ${VTK_INCLUDE_DIRS_SYSTEM}
-          ${OSMESA_INCLUDE_DIR})
-    ENDIF(OSMESA_INCLUDE_DIR)
-  ENDIF(VTK_OPENGL_HAS_OSMESA)
-ENDIF(VTK_USE_RENDERING)
-
-IF(VTK_INCLUDE_NEED_TCL)
-  SET(VTK_INCLUDE_DIRS_SYSTEM ${VTK_INCLUDE_DIRS_SYSTEM} ${TCL_INCLUDE_PATH})
-ENDIF(VTK_INCLUDE_NEED_TCL)
-
-# VTK_INCLUDE_NEED_TK is set in toplevel CMakeLists.txt file.
-IF(VTK_INCLUDE_NEED_TK)
-  # Tcl/Tk include directories.
-  SET(VTK_INCLUDE_DIRS_SYSTEM ${VTK_INCLUDE_DIRS_SYSTEM} ${TK_INCLUDE_PATH})
-  IF (WIN32)
-    SET(VTK_INCLUDE_DIRS_SYSTEM ${VTK_INCLUDE_DIRS_SYSTEM} ${TK_XLIB_PATH})
-  ENDIF (WIN32)
-  
-  # Need Tk internal headers for Tk initialization.
-  SET (try_file "tkInt.h")
-  SET (try_paths)
-  IF (WIN32)
-    SET (try_file "tkWinPort.h")
-  ENDIF (WIN32)
-  IF (APPLE)
-    SET (try_file "tkMacOSXDefault.h")
-    GET_FILENAME_COMPONENT(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
-    SET (try_paths "${TK_INCLUDE_PATH_PARENT}/PrivateHeaders")
-  ENDIF (APPLE)
-  IF (try_file)
-    VTK_GET_TCL_TK_VERSION ("TCL_TK_MAJOR_VERSION" "TCL_TK_MINOR_VERSION")
-    SET (TCL_TK_VERSIOND "${TCL_TK_MAJOR_VERSION}.${TCL_TK_MINOR_VERSION}")
-    SET (try_paths ${try_paths} 
-         "${VTK_SOURCE_DIR}/Utilities/TclTk/internals/tk${TCL_TK_VERSIOND}")
-    FIND_PATH(
-       TK_INTERNAL_PATH 
-       ${try_file} 
-       PATHS ${try_paths}
-       DOC "The path to the Tk internal headers (${try_file}).")
-    MARK_AS_ADVANCED(TK_INTERNAL_PATH)
-  ENDIF (try_file)
-ENDIF(VTK_INCLUDE_NEED_TK)
-
-IF(VTK_WRAP_JAVA)
-  # Java include directories.
-  SET(VTK_INCLUDE_DIRS_SYSTEM ${VTK_INCLUDE_DIRS_SYSTEM}
-      ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2} ${JAVA_AWT_INCLUDE_PATH})
-ENDIF(VTK_WRAP_JAVA)
-
-IF(VTK_USE_BOOST)
-  # Boost include directories.
-  SET(VTK_INCLUDE_DIRS_SYSTEM ${VTK_INCLUDE_DIRS_SYSTEM} ${Boost_INCLUDE_DIR})
-ENDIF(VTK_USE_BOOST)
-
-IF(VTK_USE_GNU_R)
-  # Boost include directories.
-  SET(VTK_INCLUDE_DIRS_SYSTEM ${VTK_INCLUDE_DIRS_SYSTEM} ${R_INCLUDE_DIR})
-ENDIF(VTK_USE_GNU_R)
-
-#-----------------------------------------------------------------------------
-# Include directories from the build tree.
-# ${VTK_BINARY_DIR}/Utilities is needed to access vtksys, which is prefixed
-# (i.e. include "vtksys/DynamicLoader.hxx")
-SET(VTK_INCLUDE_DIRS_BUILD_TREE
-  ${VTK_BINARY_DIR}
-  ${VTK_BINARY_DIR}/Common
-  ${VTK_BINARY_DIR}/Utilities
-  )
-
-#-----------------------------------------------------------------------------
-# Include directories from the source tree.
-SET(VTK_INCLUDE_DIRS_SOURCE_TREE "")
-
-IF(VTK_WRAP_PYTHON)
-  SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE}
-    ${VTK_SOURCE_DIR}/Wrapping/Python ${VTK_BINARY_DIR}/Wrapping/Python)
-ENDIF(VTK_WRAP_PYTHON)
-
-IF(VTK_USE_INFOVIS)
-  SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE} ${VTK_SOURCE_DIR}/Infovis)
-ENDIF(VTK_USE_INFOVIS)
-
-IF(VTK_USE_GEOVIS)
-  SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE} ${VTK_SOURCE_DIR}/Geovis)
-ENDIF(VTK_USE_GEOVIS)
-
-IF(VTK_USE_VIEWS)
-  SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE} ${VTK_SOURCE_DIR}/Views)
-ENDIF(VTK_USE_VIEWS)
-
-IF(VTK_USE_PARALLEL)
-  SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE} ${VTK_SOURCE_DIR}/Parallel)
-  SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE} ${VTK_SOURCE_DIR}/AMR)
-ENDIF(VTK_USE_PARALLEL)
-
-IF(VTK_USE_RENDERING)
-  SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE} ${VTK_SOURCE_DIR}/VolumeRendering)
-  SET(VTK_INCLUDE_DIRS_BUILD_TREE ${VTK_INCLUDE_DIRS_BUILD_TREE} ${VTK_BINARY_DIR}/VolumeRendering)
-  SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE} ${VTK_SOURCE_DIR}/Hybrid)
-  SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE} ${VTK_SOURCE_DIR}/Widgets)
-  SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE} ${VTK_SOURCE_DIR}/Rendering)
-  SET(VTK_INCLUDE_DIRS_BUILD_TREE ${VTK_INCLUDE_DIRS_BUILD_TREE} ${VTK_BINARY_DIR}/Rendering)
-  SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE} ${VTK_SOURCE_DIR}/Charts)
-  SET(VTK_INCLUDE_DIRS_BUILD_TREE ${VTK_INCLUDE_DIRS_BUILD_TREE} ${VTK_BINARY_DIR}/Charts)
-  SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE} ${VTK_SOURCE_DIR}/Chemistry)
-  SET(VTK_INCLUDE_DIRS_BUILD_TREE ${VTK_INCLUDE_DIRS_BUILD_TREE} ${VTK_BINARY_DIR}/Chemistry)
-# Access to vtkRegressionTestImage.h.
-SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE}
-  ${VTK_SOURCE_DIR}/Rendering/Testing/Cxx
-)
-ENDIF(VTK_USE_RENDERING)
-
-# These directories are always needed.
-SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE}
-  ${VTK_SOURCE_DIR}/IO
-  ${VTK_SOURCE_DIR}/Imaging
-  ${VTK_SOURCE_DIR}/Graphics
-  ${VTK_SOURCE_DIR}/GenericFiltering
-  ${VTK_SOURCE_DIR}/Filtering
-  ${VTK_SOURCE_DIR}/Common
-  ${VTK_SOURCE_DIR}/Utilities
-)
-
-
-
-# Access to vtkTestUtilities.h.
-SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE}
-  ${VTK_SOURCE_DIR}/Common/Testing/Cxx
-)
-
-#-----------------------------------------------------------------------------
-# Include directories needed for .cxx files in VTK.  These include
-# directories will NOT be available to user projects.
-SET(VTK_INCLUDE_DIRS_BUILD_TREE_CXX
-  ${VTK_SOURCE_DIR}/Utilities/ftgl/src
-  ${VTK_BINARY_DIR}/Utilities/ftgl
-)
-
-IF(VTK_USE_TK)
-  # Need access to internal Tk headers for the vtkTk... widget .cxx files.
-  SET(VTK_INCLUDE_DIRS_BUILD_TREE_CXX ${VTK_INCLUDE_DIRS_BUILD_TREE_CXX}
-      ${TK_INTERNAL_PATH})
-      
-  #-----------------------------------------------------------------------------
-  # Configure the Tk library for vtkRendering.
-  INCLUDE(${VTK_SOURCE_DIR}/Wrapping/Tcl/vtkDetermineTkResources.cmake)
-    
-ENDIF(VTK_USE_TK)
-
-IF (VTK_USE_MATROX_IMAGING)
-  # Need access to mil.h include file for vtkMILVideoSource.cxx.
-  SET(VTK_INCLUDE_DIRS_BUILD_TREE_CXX ${VTK_INCLUDE_DIRS_BUILD_TREE_CXX}
-      ${MIL_INCLUDE_PATH})
-ENDIF (VTK_USE_MATROX_IMAGING)
-
-#-----------------------------------------------------------------------------
-# Include directories for 3rd-party utilities provided by VTK.
-VTK_THIRD_PARTY_INCLUDE2(ZLIB)
-VTK_THIRD_PARTY_INCLUDE2(JPEG)
-VTK_THIRD_PARTY_INCLUDE2(PNG)
-VTK_THIRD_PARTY_INCLUDE2(TIFF)
-VTK_THIRD_PARTY_INCLUDE2(EXPAT)
-VTK_THIRD_PARTY_INCLUDE2(LIBXML2)
-VTK_THIRD_PARTY_INCLUDE(NETCDF vtknetcdf/include)
-VTK_THIRD_PARTY_INCLUDE2(Exodus2)
-IF(VTK_USE_GL2PS)
-  VTK_THIRD_PARTY_INCLUDE2(GL2PS)
-ENDIF(VTK_USE_GL2PS)
-VTK_THIRD_PARTY_INCLUDE(LIBPROJ4 vtklibproj4)
-VTK_THIRD_PARTY_INCLUDE(DICOMParser DICOMParser)
-VTK_THIRD_PARTY_INCLUDE(FREETYPE vtkfreetype/include)
-VTK_THIRD_PARTY_INCLUDE(LSDyna LSDyna)
-VTK_THIRD_PARTY_INCLUDE(MATERIALLIBRARY MaterialLibrary)
-IF(VTK_USE_METAIO)
-  VTK_THIRD_PARTY_INCLUDE(METAIO vtkmetaio)
-ENDIF(VTK_USE_METAIO)
-VTK_THIRD_PARTY_INCLUDE(VERDICT verdict)
-VTK_THIRD_PARTY_INCLUDE(HDF5 vtkhdf5)
-VTK_THIRD_PARTY_INCLUDE(HDF5 vtkhdf5/src)
-VTK_THIRD_PARTY_INCLUDE(HDF5 vtkhdf5/hl/src)
-IF(VTK_USE_PARALLEL)
-  VTK_THIRD_PARTY_INCLUDE(Cosmo Cosmo)
-  VTK_THIRD_PARTY_INCLUDE(VPIC VPIC)
-ENDIF(VTK_USE_PARALLEL)
-IF(VTK_USE_OGGTHEORA_ENCODER)
-  VTK_THIRD_PARTY_INCLUDE(OGGTHEORA vtkoggtheora/include)
-ENDIF(VTK_USE_OGGTHEORA_ENCODER)
-
-# Include UTF-8 support
-SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE}
-  ${VTK_SOURCE_DIR}/Utilities/utf8/source)
-
-# Include GUI support
-IF(VTK_USE_GUISUPPORT)
-  IF(VTK_USE_QVTK)
-    SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE}
-      ${VTK_SOURCE_DIR}/GUISupport/Qt)
-    SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE}
-      ${VTK_BINARY_DIR}/GUISupport/Qt)
-    SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE}
-      ${VTK_SOURCE_DIR}/GUISupport/Qt/Chart)
-    SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE}
-      ${VTK_BINARY_DIR}/GUISupport/Qt/Chart)
-  ENDIF(VTK_USE_QVTK)
-  IF(VTK_USE_MFC)
-    SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE}
-      ${VTK_SOURCE_DIR}/GUISupport/MFC)
-    SET(VTK_INCLUDE_DIRS_BUILD_TREE ${VTK_INCLUDE_DIRS_BUILD_TREE}
-      ${VTK_BINARY_DIR}/GUISupport/MFC)
-  ENDIF(VTK_USE_MFC)
-ENDIF(VTK_USE_GUISUPPORT)
-
-# Infovis support
-IF(VTK_USE_INFOVIS)
-  SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE}
-    ${VTK_SOURCE_DIR}/Infovis
-    ${VTK_SOURCE_DIR}/Utilities/vtkalglib
-    )
-  SET(VTK_INCLUDE_DIRS_BUILD_TREE ${VTK_INCLUDE_DIRS_BUILD_TREE}
-    ${VTK_BINARY_DIR}/Utilities/vtkalglib
-    )
-ENDIF(VTK_USE_INFOVIS)
-
-# Geovis support
-IF(VTK_USE_GEOVIS)
-  SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE}
-    ${VTK_SOURCE_DIR}/Geovis
-    )
-ENDIF(VTK_USE_GEOVIS)
-
-# Views support
-IF(VTK_USE_VIEWS)
-  SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE}
-    ${VTK_SOURCE_DIR}/Views
-    )
-ENDIF(VTK_USE_VIEWS)
diff --git a/vtkMacros.cmake b/vtkMacros.cmake
deleted file mode 100644
index 8f6551546cf3eb9f61b4b693ee692a75a216cd9f..0000000000000000000000000000000000000000
--- a/vtkMacros.cmake
+++ /dev/null
@@ -1,101 +0,0 @@
-#
-# add the instantiator logic for this kit
-#
-# takes as arguments:
-#   KIT e.g. Common IO
-#   CAPS_KIT e.g. COMMON IO
-#
-MACRO(VTK_USE_INSTANTIATOR KIT CAPS_KIT)
-  # Setup vtkInstantiator registration for this library's classes.
-  IF (COMMAND VTK_MAKE_INSTANTIATOR2)
-    VTK_MAKE_INSTANTIATOR2(vtk${KIT}Instantiator Instantiator_SRCS
-                        ${${KIT}_SRCS}
-                        EXPORT_MACRO VTK_${CAPS_KIT}_EXPORT
-                        HEADER_LOCATION ${VTK_BINARY_DIR})
-  ELSE (COMMAND VTK_MAKE_INSTANTIATOR2)
-    VTK_MAKE_INSTANTIATOR(vtk${KIT}Instantiator Instantiator_SRCS
-                        ${${KIT}_SRCS}
-                        EXPORT_MACRO VTK_${CAPS_KIT}_EXPORT
-                        HEADER_LOCATION ${VTK_BINARY_DIR})
-  ENDIF (COMMAND VTK_MAKE_INSTANTIATOR2)
-  VTK_ADD_LIBRARY(vtk${KIT}${VTK_VERSION} ${${KIT}_SRCS} ${Instantiator_SRCS})
-ENDMACRO(VTK_USE_INSTANTIATOR KIT CAPS_KIT)
-
-#
-# generate Tcl wrappers etc
-#
-# takes arguments:
-#   KIT e.g. Common IO
-#   DEPENDS e.g. vtkCommonTCL41
-#
-MACRO(VTK_USE_TCL KIT DEPEND)
-  IF (VTK_WRAP_TCL)
-    VTK_WRAP_TCL(vtk${KIT}TCL${VTK_VERSION} ${KIT}TCL_SRCS ${${KIT}_SRCS})
-    IF (APPLE)
-      VTK_ADD_LIBRARY(vtk${KIT}TCL${VTK_VERSION} SHARED ${${KIT}TCL_SRCS})
-    ELSE (APPLE)
-      VTK_ADD_LIBRARY(vtk${KIT}TCL${VTK_VERSION} ${${KIT}TCL_SRCS})
-    ENDIF (APPLE)
-    TARGET_LINK_LIBRARIES(vtk${KIT}TCL${VTK_VERSION} 
-       ${DEPEND} vtk${KIT}${VTK_VERSION} ${TCL_LIBRARY})
-    INSTALL(TARGETS vtk${KIT}TCL${VTK_VERSION}
-      EXPORT ${VTK_INSTALL_EXPORT_NAME}
-      RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries # .exe, .dll
-      LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries # .so, mod.dll
-      ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development      # .a, .lib
-    )
-  ENDIF (VTK_WRAP_TCL)
-ENDMACRO(VTK_USE_TCL)
-
-
-#
-# generate Python wrappers etc
-#
-# takes arguments:
-#   KIT e.g. Common IO
-#   DEPENDS e.g. vtkCommonTCL41
-#
-MACRO(VTK_USE_PYTHON KIT DEPEND)
-  IF (VTK_WRAP_PYTHON)
-    VTK_WRAP_PYTHON(vtk${KIT}Python${VTK_VERSION} 
-      ${KIT}Python_SRCS ${${KIT}_SRCS})
-    VTK_ADD_LIBRARY(vtk${KIT}Python${VTK_VERSION} MODULE ${${KIT}Python_SRCS})
-    IF (NOT APPLE)
-      TARGET_LINK_LIBRARIES (vtk${KIT}Python${VTK_VERSION} ${DEPEND})
-    ENDIF (NOT APPLE)
-    IF(WIN32)
-      TARGET_LINK_LIBRARIES (vtk${KIT}Python${VTK_VERSION}
-                             debug ${PYTHON_DEBUG_LIBRARY}
-                             optimized ${PYTHON_LIBRARY})
-    ENDIF(WIN32)
-    TARGET_LINK_LIBRARIES(vtk${KIT}Python${VTK_VERSION} 
-      vtk${KIT}${VTK_VERSION})
-    INSTALL(TARGETS vtk${KIT}Python${VTK_VERSION}
-      EXPORT ${VTK_INSTALL_EXPORT_NAME}
-      RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries # .exe, .dll
-      LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries # .so, mod.dll
-      ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development      # .a, .lib
-  ENDIF (VTK_WRAP_PYTHON)
-ENDMACRO(VTK_USE_PYTHON)
-
-
-#
-# generate Python wrappers etc
-#
-# takes arguments:
-#   KIT e.g. Common IO
-#   DEPENDS e.g. vtkCommonTCL41
-#
-MACRO(VTK_USE_JAVA KIT DEPEND)
-  IF (VTK_WRAP_JAVA)
-    VTK_WRAP_JAVA(vtk${KIT}Java${VTK_VERSION} ${KIT}Java_SRCS ${${KIT}_SRCS})
-    VTK_ADD_LIBRARY(vtk${KIT}Java${VTK_VERSION} SHARED ${${KIT}Java_SRCS})
-    TARGET_LINK_LIBRARIES (vtk${KIT}Java${VTK_VERSION} 
-       ${DEPEND} vtk${KIT}${VTK_VERSION})
-    INSTALL(TARGETS vtk${KIT}Java${VTK_VERSION}
-      EXPORT ${VTK_INSTALL_EXPORT_NAME}
-      RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries # .exe, .dll
-      LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries # .so, mod.dll
-      ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development      # .a, .lib
-  ENDIF (VTK_WRAP_JAVA)
-ENDMACRO(VTK_USE_JAVA)