diff --git a/Code/Mantid/Build/CMake/DetermineVisItArchitecture.cmake b/Code/Mantid/Build/CMake/DetermineVisItArchitecture.cmake
deleted file mode 100644
index e62930efb7ad3e6c1f6a2dfe818f663b4e67a853..0000000000000000000000000000000000000000
--- a/Code/Mantid/Build/CMake/DetermineVisItArchitecture.cmake
+++ /dev/null
@@ -1,87 +0,0 @@
-#*****************************************************************************
-#
-# Copyright (c) 2000 - 2010, Lawrence Livermore National Security, LLC
-# Produced at the Lawrence Livermore National Laboratory
-# LLNL-CODE-400142
-# All rights reserved.
-#
-# This file is part of VisIt. For details, see https://visit.llnl.gov/. The
-# full copyright notice is contained in the file COPYRIGHT located at the root
-# of the VisIt distribution or at http://www.llnl.gov/visit/copyright.html.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# - Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the disclaimer below.
-# - Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the disclaimer (as noted below) in the
-# documentation and/or other materials provided with the distribution.
-# - Neither the name of the LLNS/LLNL nor the names of its contributors may
-# be used to endorse or promote products derived from this software without
-# specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL LAWRENCE LIVERMORE NATIONAL SECURITY,
-# LLC, THE U.S. DEPARTMENT OF ENERGY OR CONTRIBUTORS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-# DAMAGE.
-#
-# Modifications:
-# Eric Brugger, Thu Feb 25 16:06:22 PST 2010
-# I enclosed all variables that were used in tests involving STREQUAL
-# in ${} and enclosed all literal strings that were used in tests
-# involving STREQUAL in double quotes so that it would create the
-# correct architecture string on AIX.
-#
-# I modified the architecture string it generates on AIX to be either
-# ibm-aix-pwr or ibm-aix-pwr64.
-#
-#****************************************************************************/
-
-MACRO(DETERMINE_VISIT_ARCHITECTURE ARCH)
- IF(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
- IF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc")
- SET(${ARCH} linux-ppc)
- ELSEIF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64")
- SET(${ARCH} linux-ppc64)
- ELSEIF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
- SET(${ARCH} linux-x86_64)
- ELSEIF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ia64")
- SET(${ARCH} linux-ia64)
- ELSE(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc")
- SET(${ARCH} linux-intel)
- ENDIF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc")
- ELSEIF(${CMAKE_SYSTEM_NAME} STREQUAL "AIX")
- IF($ENV{OBJECT_MODE} STREQUAL "32")
- SET(${ARCH} "ibm-aix-pwr")
- ELSE($ENV{OBJECT_MODE} STREQUAL "32")
- SET(${ARCH} "ibm-aix-pwr64")
- ENDIF($ENV{OBJECT_MODE} STREQUAL "32")
- ELSEIF(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
- IF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386")
- SET(${ARCH} darwin-i386)
- ELSE(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386")
- SET(${ARCH} darwin-ppc)
- ENDIF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386")
- ELSEIF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
- SET(${ARCH} "freebsd-${CMAKE_SYSTEM_VERSION}")
- ELSEIF(${CMAKE_SYSTEM_NAME} STREQUAL "IRIX")
- SET(${ARCH} sgi-irix6-mips2)
- ELSEIF(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
- SET(${ARCH} "sun4-${CMAKE_SYSTEM_VERSION}-sparc")
- ELSEIF(${CMAKE_SYSTEM_NAME} STREQUAL "Tru64")
- SET(${ARCH} dec-osf1-alpha)
- ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
- # Unhandled case. Make up a string.
- SET(VISITARCHTMP "${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
- STRING(TOLOWER ${VISITARCHTMP} ${ARCH})
- ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-ENDMACRO(DETERMINE_VISIT_ARCHITECTURE ARCH)
diff --git a/Code/Mantid/Build/CMake/FindVisIt.cmake b/Code/Mantid/Build/CMake/FindVisIt.cmake
deleted file mode 100644
index 22ec35acea2ab3148aef4e4c04ae05a59d3c5075..0000000000000000000000000000000000000000
--- a/Code/Mantid/Build/CMake/FindVisIt.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-# - Find VisIt
-# Find the VisIt libraries
-#
-# This module defined the following variables:
-# VISIT_FOUND
-# VISIT_INCLUDE_DIR
-# VISIT_LIBRARY_DIR
-# VISIT_BINARY_DIR
-# VISIT_ARCHIVE_DIR
-# VISIT_PLUGIN_DIR
-
-include ( DetermineVisItArchitecture )
-determine_visit_architecture ( VISIT_ARCH )
-
-find_path( VISIT_ROOT include/PluginVsInstall.cmake PATHS
- /usr/visit/current/${VISIT_ARCH} /usr/local/visit/current/${VISIT_ARCH}
- DOC "The VisIt include directory root"
-)
-
-set ( VISIT_INCLUDE_DIR "${VISIT_ROOT}/include" )
-set ( VISIT_LIBRARY_DIR "${VISIT_ROOT}/lib" )
-set ( VISIT_BINARY_DIR "${VISIT_ROOT}/bin" )
-set ( VISIT_ARCHIVE_DIR "${VISIT_ROOT}/bin" )
-set ( VISIT_PLUGIN_DIR "$ENV{HOME}/.visit/${VISIT_ARCH}/plugins" )
-
-# handle the QUIETLY and REQUIRED arguments and set VISIT_FOUND to TRUE if
-# all listed variables are TRUE
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(VisIt DEFAULT_MSG VISIT_ROOT VISIT_PLUGIN_DIR)
-
-mark_as_advanced ( VISIT_INCLUDE_DIR VISIT_LIBRARY_DIR VISIT_BINARY_DIR
- VISIT_ARCHIVE_DIR VISIT_PLUGIN_DIR )
diff --git a/Code/Mantid/Vates/CMakeLists.txt b/Code/Mantid/Vates/CMakeLists.txt
index 0fee6a551e35d897d7f87e4e7eb52034f38146f4..f788cd88188b3ef59c9aacb337a1f59cc942e05b 100644
--- a/Code/Mantid/Vates/CMakeLists.txt
+++ b/Code/Mantid/Vates/CMakeLists.txt
@@ -3,29 +3,11 @@ cmake_minimum_required ( VERSION 2.6 )
# Define the project name
project ( Vates )
-# Check for VisIt
-find_package ( VisIt )
-
include ( CommonVatesSetup )
#Select either building Paraview plugins or VisIT plugins.
set(USE_PARAVIEW ON CACHE BOOL "Create paraview plugins. ")
-#Select either building Paraview plugins or VisIT plugins.
-set(USE_VISIT OFF CACHE BOOL "Create visit plugins.")
-
-if ( VISIT_FOUND AND USE_VISIT)
-
- add_subdirectory ( VatesAPI )
-
- # Perform common setup
- add_subdirectory ( VisitPlugins )
- add_subdirectory ( VisitDataBases )
-
-else ( VISIT_FOUND AND USE_VISIT )
- message ( STATUS "Vates-VisIt plugins and widgets will not be built." )
-endif ( VISIT_FOUND AND USE_VISIT )
-
# Paraview dependencies built if Paraview is found
find_package( ParaView )
if (ParaView_FOUND AND USE_PARAVIEW)