diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
deleted file mode 100644
index ece6f871ba..0000000000
--- a/CMake/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-project(test)
-
-cmake_minimum_required(VERSION 2.8)
-include(mitkMacroGetLinuxDistribution.cmake) 
-GetLinuxDistribution("bla" "bla2")
\ No newline at end of file
diff --git a/CMake/mitkMacroGetLinuxDistribution.cmake b/CMake/mitkMacroGetLinuxDistribution.cmake
index a8ef973de3..b79ff1745b 100755
--- a/CMake/mitkMacroGetLinuxDistribution.cmake
+++ b/CMake/mitkMacroGetLinuxDistribution.cmake
@@ -1,42 +1,39 @@
 macro(GetLinuxDistribution)
 
-message("determin linux distribution")
 execute_process(COMMAND lsb_release -a OUTPUT_VARIABLE _out ERROR_VARIABLE _err RESULT_VARIABLE _result)
 
 string(COMPARE EQUAL "${_out}" "" _ok)
 
 if(_ok)
   string(REGEX REPLACE "\n" ";" _out ${_err})
 else()
   string(REGEX REPLACE "\n" ";" _out ${_out})
 endif()
 
 foreach(_i ${_out})
 
   if("${_i}" MATCHES "^[Rr][Ee][Ll][Ee][Aa][Ss][Ee].*")
     string(REGEX REPLACE ":" ";" _i ${_i})
     list(GET _i -1 _i)
     string(STRIP ${_i} _release)
-    message("release: ${_release}")
   endif()
 
   if("${_i}" MATCHES "^[Dd][Ii][Ss][Tt][Rr][Ii][Bb][Uu][Tt][Oo][Rr].*")
     string(REGEX REPLACE ":" ";" _i ${_i})
     list(GET _i -1 _i)
     string(STRIP ${_i} _distrib)
-    message("distibutor: ${_distrib}")
   endif()
 
 endforeach(_i)
 
 string(COMPARE EQUAL "${_distrib}" "" _ok1)
 string(COMPARE EQUAL "${_release}" "" _ok2)
 
 if(${_ok1} OR ${_ok2})
   message(SEND_ERROR "could not determine linux release!")
 endif()
 
 SET(LINUX_DISTRIBUTION ${_distrib})
 SET(LINUX_RELEASE ${_release})
 
 endmacro()
diff --git a/CMakeExternals/OpenCV.cmake b/CMakeExternals/OpenCV.cmake
index 6266976926..f547d8f579 100644
--- a/CMakeExternals/OpenCV.cmake
+++ b/CMakeExternals/OpenCV.cmake
@@ -1,107 +1,105 @@
 #-----------------------------------------------------------------------------
 # OpenCV
 #-----------------------------------------------------------------------------
 
 IF(MITK_USE_OpenCV)
 if (UNIX)
 
   include(${MITK_SOURCE_DIR}/CMake/mitkMacroGetLinuxDistribution.cmake)
   GetLinuxDistribution()
 
   if("${LINUX_DISTRIBUTION}" MATCHES "^[Uu][Bb][Uu][Nn][Tt][Uu].*" AND "${LINUX_RELEASE}" MATCHES "11.04")
-
-    message("using system opencv")
     set(OpenCV_DIR "/usr/share/opencv/")
   else()
 
     # Sanity checks
     IF(DEFINED OpenCV_DIR AND NOT EXISTS ${OpenCV_DIR})
       MESSAGE(FATAL_ERROR "OpenCV_DIR variable is defined but corresponds to non-existing directory")
     ENDIF()
 
     SET(proj OpenCV)
     SET(proj_DEPENDENCIES)
     SET(OpenCV_DEPENDS ${proj})
 
     IF(NOT DEFINED OpenCV_DIR)
 
       OPTION(OpenCV_BUILD_NEW_PYTHON_SUPPORT "Build OpenCV Python wrappers" OFF)
       MARK_AS_ADVANCED(OpenCV_BUILD_NEW_PYTHON_SUPPORT)
 
       IF(WIN32)
 	SET(opencv_url http://mitk.org/download/thirdparty/OpenCV-2.2.0-win.tar.bz2)
       ELSE()
 	SET(opencv_url http://mitk.org/download/thirdparty/OpenCV-2.2.0.tar.bz2)
       ENDIF()
 
       ExternalProject_Add(${proj}
 	URL ${opencv_url}
 	BINARY_DIR ${proj}-build
 	INSTALL_COMMAND ""
 	CMAKE_GENERATOR ${gen}
 	CMAKE_ARGS
 	  ${ep_common_args}
 	  -DBUILD_TESTS:BOOL=OFF
 	  -DBUILD_EXAMPLES:BOOL=OFF
 	  -DBUILD_DOXYGEN_DOCS:BOOL=OFF
 	  -DBUILD_NEW_PYTHON_SUPPORT:BOOL=${OpenCV_BUILD_NEW_PYTHON_SUPPORT}
 	DEPENDS ${proj_DEPENDENCIES}
 	)
 
       SET(OpenCV_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build)
 
     ELSE()
 
       mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}")
 
     ENDIF()
 
   endif()
 
 else()
 
   # Sanity checks
   IF(DEFINED OpenCV_DIR AND NOT EXISTS ${OpenCV_DIR})
     MESSAGE(FATAL_ERROR "OpenCV_DIR variable is defined but corresponds to non-existing directory")
   ENDIF()
 
   SET(proj OpenCV)
   SET(proj_DEPENDENCIES)
   SET(OpenCV_DEPENDS ${proj})
 
   IF(NOT DEFINED OpenCV_DIR)
 
     OPTION(OpenCV_BUILD_NEW_PYTHON_SUPPORT "Build OpenCV Python wrappers" OFF)
     MARK_AS_ADVANCED(OpenCV_BUILD_NEW_PYTHON_SUPPORT)
 
     IF(WIN32)
       SET(opencv_url http://mitk.org/download/thirdparty/OpenCV-2.2.0-win.tar.bz2)
     ELSE()
       SET(opencv_url http://mitk.org/download/thirdparty/OpenCV-2.2.0.tar.bz2)
     ENDIF()
 
     ExternalProject_Add(${proj}
       URL ${opencv_url}
       BINARY_DIR ${proj}-build
       INSTALL_COMMAND ""
       CMAKE_GENERATOR ${gen}
       CMAKE_ARGS
 	${ep_common_args}
 	-DBUILD_TESTS:BOOL=OFF
 	-DBUILD_EXAMPLES:BOOL=OFF
 	-DBUILD_DOXYGEN_DOCS:BOOL=OFF
 	-DBUILD_NEW_PYTHON_SUPPORT:BOOL=${OpenCV_BUILD_NEW_PYTHON_SUPPORT}
       DEPENDS ${proj_DEPENDENCIES}
       )
 
     SET(OpenCV_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build)
 
   ELSE()
 
     mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}")
 
   ENDIF()
 
 endif()
 
 endif()
\ No newline at end of file