--- tuxcap/CMakeLists.txt
+++ tuxcap/CMakeLists.txt
@@ -3,9 +3,9 @@
 
 SET(CMAKE_MODULE_PATH "${libtuxcap_SOURCE_DIR}/tuxcap/CMakeModules" )
 
-SET(CMAKE_C_FLAGS_RELEASE "-DNDEBUG -O3")
+SET(CMAKE_C_FLAGS_RELEASE "-DNDEBUG")
 SET(CMAKE_C_FLAGS_DEBUG "-Wall -g -O0")
-SET(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O3")
+SET(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG")
 SET(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -O0")
 
 INCLUDE(FindImageMagick)
@@ -39,27 +39,13 @@
      MESSAGE("Python development libraries found, building TuxCap Python bindings and examples")   
      MESSAGE("Python libraries ${PYTHON_LIBRARIES} include path ${PYTHON_INCLUDE_PATH}")   
      SET(MY_LINK_LIBS    ${MY_LINK_LIBS} ${PYTHON_LIBRARIES})       
-     SET(MY_DIRS    ${MY_DIRS} pythondemo1 pythondemo2 pythondemo_template)                
+     SET(MY_DIRS    ${MY_DIRS} )
 ELSE (PYTHON_LIBRARIES)
      MESSAGE("No Python development libraries found, skipping building of TuxCap Python bindings")   
 ENDIF (PYTHON_LIBRARIES)
 
 SET (MY_DIRS ${MY_DIRS}
     lib
-    demo1
-    demo2 
-    demo3 
-    demo4 
-    demo5 
-    physicsdemo 
-    physicsdemo2 
-    physicsdemo3 
-    physicsdemo4
-    physicsdemo5 
-    physicsdemo6 
-    physicsdemo7 
-    particledemo
-    hungarr 
 )
 
 IF(AUDIERELIB_FOUND)