diff --git a/CMake/compilerflags/Intel.cmake b/CMake/compilerflags/Intel.cmake
index 63616a38a528517aca646d1f55fe9b81db66cae8..4f4c7bb3ed2dad45a6f91e644fa0d74e5b4d98be 100644
--- a/CMake/compilerflags/Intel.cmake
+++ b/CMake/compilerflags/Intel.cmake
@@ -31,3 +31,7 @@ LIST(APPEND CAB_COMPILER_ADDTIONAL_CXX_COMPILER_FLAGS "-std=c++11")
 
 list(APPEND VF_LINK_OPTIONS -parallel)
 list(APPEND VF_LINK_OPTIONS -irc)
+
+
+# LIST(APPEND VF_COMPILER_DEFINITION MPICH_IGNORE_CXX_SEEK)
+# LIST(APPEND VF_COMPILER_DEFINITION MPICH_SKIP_MPICXX)
diff --git a/cpu.cmake b/cpu.cmake
index e48644e4f2492a8346e740aad310ebe8420d444c..0f8c9a5ac6e3d98a29049be69390b4a1ca365c4f 100644
--- a/cpu.cmake
+++ b/cpu.cmake
@@ -28,7 +28,6 @@ SET(USE_METIS ON CACHE BOOL "include METIS library support")
 SET(USE_MPI ON CACHE BOOL "include MPI library support")
 SET(USE_VTK OFF CACHE BOOL "include VTK library support")
 SET(USE_CATALYST OFF CACHE BOOL "include Paraview Catalyst support")
-#SET(USE_PYTHON OFF CACHE BOOL "include Python scripting support")
 
 SET(USE_HLRN_LUSTRE OFF CACHE BOOL "include HLRN Lustre support")
 SET(USE_DEM_COUPLING OFF CACHE BOOL "PE plugin")
@@ -41,7 +40,6 @@ ENDIF()
 
 #VTK
 IF(${USE_VTK})
-    #find_package(VTK 6.1 NO_MODULE)
     FIND_PACKAGE(VTK REQUIRED)
     INCLUDE_DIRECTORIES(${VTK_INCLUDE_DIRS})
 ENDIF()
@@ -78,20 +76,6 @@ IF(${CMAKE_SYSTEM_PROCESSOR} MATCHES "ia64")
 ENDIF()
 
 
-# IF(${USE_PYTHON})
-# FIND_PACKAGE(PythonLibs)
-# INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR})
-# LIST(APPEND VF_COMPILER_DEFINITION VF_PYTHON)
-# LIST(APPEND VF_COMPILER_DEFINITION BOOST_PYTHON_STATIC_LIB)
-# add_subdirectory(python)
-# ENDIF()
-
-# IF(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
-# LIST(APPEND VF_COMPILER_DEFINITION MPICH_IGNORE_CXX_SEEK)
-# LIST(APPEND VF_COMPILER_DEFINITION MPICH_SKIP_MPICXX)
-# ENDIF()
-
-
 add_subdirectory(${VF_THIRD_DIR}/MuParser)
 
 add_subdirectory(src/cpu/VirtualFluidsCore)
diff --git a/src/cpu/VirtualFluidsCore/CMakeLists.txt b/src/cpu/VirtualFluidsCore/CMakeLists.txt
index b6327ceea55917e01c0853413183298de73c7ca7..13fea30bbda58f102768c85d22cdaf0b55a6b199 100644
--- a/src/cpu/VirtualFluidsCore/CMakeLists.txt
+++ b/src/cpu/VirtualFluidsCore/CMakeLists.txt
@@ -17,12 +17,6 @@ IF(${USE_CATALYST})
 ENDIF()
 
 
-IF(${USE_PYTHON})
-   SET(LINK_LIBRARY optimized ${PYTHON_LIBRARY} debug ${PYTHON_LIBRARY})
-   SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} ${LINK_LIBRARY})
-ENDIF()
-
-
 IF(${USE_DEM_COUPLING})
    INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../DemCoupling/DemCoupling.cmake)
 ENDIF()