diff --git a/CMakeLists.txt b/CMakeLists.txt
index 390d4572988a22e05d707111b3ecb7636aa3f11a..81a3e78efbcc8cb875a00173a48838f9c7d82154 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,6 @@ find_package("ArmarXCore" REQUIRED
     PATHS "$ENV{HOME}/armarx/Core/build"
 )
 
-include(${ArmarXCore_CMAKE_DIR}/ArmarXProject.cmake)
 include(${ArmarXCore_USE_FILE})
 
 armarx_project("RobotAPI")
diff --git a/scenarios/WeissHapticSensorsUnitTest/startScenario.sh b/scenarios/WeissHapticSensorsUnitTest/startScenario.sh
deleted file mode 100755
index 3cae8d5150708a0164ee9e161c747e726e42118c..0000000000000000000000000000000000000000
--- a/scenarios/WeissHapticSensorsUnitTest/startScenario.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-export SCRIPT_PATH=/localhome/vmmaster/armarx/Core/build/bin
-# Components
-$SCRIPT_PATH/startApplication.sh /localhome/vmmaster/armarx/RobotAPI/build/bin/WeissHapticSensorsUnitAppRun --Ice.Config=config/WeissHapticSensorsUnitApp.cfg &
-
-$SCRIPT_PATH/startApplication.sh /localhome/vmmaster/armarx/RobotAPI/build/bin/WeissHapticSensorAppRun --Ice.Config=config/WeissHapticSensorApp.cfg &
-
diff --git a/scenarios/WeissHapticSensorsUnitTest/stopScenario.sh b/scenarios/WeissHapticSensorsUnitTest/stopScenario.sh
deleted file mode 100755
index 99e852378bc989e2878c4f529f74dbfd45e30b6c..0000000000000000000000000000000000000000
--- a/scenarios/WeissHapticSensorsUnitTest/stopScenario.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-if test -z "$1"
-then
-    KILL_SIGNAL=2
-else
-    KILL_SIGNAL=$1
-fi
-
-skill ()
-{
-    EXECUTABLE_STR=`ps aux | grep "$1 \-\-Ice.Default" | grep -v grep | awk '{print $2}'`
-    if [ ${#EXECUTABLE_STR} == 0 ]
-    then
-        echo skipping $1
-    else
-        echo killing $1
-        kill -s $2 ${EXECUTABLE_STR}
-    fi
-}
-
-echo SENDING ${KILL_SIGNAL} TO ALL PROCESSES
-
-skill WeissHapticSensorsUnitAppRun ${KILL_SIGNAL}
-
-skill WeissHapticSensorAppRun ${KILL_SIGNAL}
-