diff --git a/Scripts/developer_scripts/check_library_uses_no_gpl_files b/Scripts/developer_scripts/check_library_uses_no_gpl_files
index 1d88879cfc0..32960caefda 100755
--- a/Scripts/developer_scripts/check_library_uses_no_gpl_files
+++ b/Scripts/developer_scripts/check_library_uses_no_gpl_files
@@ -70,7 +70,7 @@ rm -fr demo/[A-Z]*
 rm -fr examples/[A-Z]*
 # Somehow -DWITH_CGAL_Core=OFF is not taken into account, hence the CORE files
 # are listed in the exceptions file.
-cmake . -DBUILD_SHARED_LIBS=TRUE -DWITH_CGAL_Qt5=OFF -DWITH_CGAL_Core=OFF
+cmake .
 make | grep -C 10 "No such file" || true
 echo " done"
 echo
diff --git a/Scripts/developer_scripts/run_testsuite_with_ctest b/Scripts/developer_scripts/run_testsuite_with_ctest
index e576403c326..06ccd107d37 100644
--- a/Scripts/developer_scripts/run_testsuite_with_ctest
+++ b/Scripts/developer_scripts/run_testsuite_with_ctest
@@ -262,14 +262,14 @@ run_test_on_platform()
   if [ ! -f "${INIT_FILE}" ]; then
     echo "error NEED A INIT FILE !"
   fi
-  cmake ${INIT_FILE:+"-C${INIT_FILE}"} '${CMAKE_GENERATOR}' -DBUILD_TESTING=OFF -DWITH_tests=OFF -DWITH_CGAL_Qt5=OFF -DCGAL_HEADER_ONLY=ON $CGAL_DIR>installation.log 2>&1
+  cmake ${INIT_FILE:+"-C${INIT_FILE}"} '${CMAKE_GENERATOR}' -DBUILD_TESTING=OFF -DWITH_tests=OFF $CGAL_DIR>installation.log 2>&1
   rm CMakeCache.txt
   CMAKE_OPTS="-DCGAL_TEST_SUITE=ON -DCMAKE_VERBOSE_MAKEFILE=ON"
   if [ -n "${SCRIPTS_DIR}" ]; then
     CMAKE_OPTS="${CMAKE_OPTS} -DWITH_examples=ON -DWITH_demos=ON"
   fi
   if [ -z "${SHOW_PROGRESS}" ]; then
-    cmake ${INIT_FILE:+"-C${INIT_FILE}"} '${CMAKE_GENERATOR}' -DBUILD_TESTING=ON ${CMAKE_OPTS} $CGAL_DIR  >package_installation.log 2>&1 
+    cmake ${INIT_FILE:+"-C${INIT_FILE}"} '${CMAKE_GENERATOR}' -DBUILD_TESTING=ON ${CMAKE_OPTS} $CGAL_DIR  >package_installation.log 2>&1
   else
     cmake ${INIT_FILE:+"-C${INIT_FILE}"} '${CMAKE_GENERATOR}'  -DBUILD_TESTING=ON ${CMAKE_OPTS} $CGAL_DIR 2>&1 |tee package_installation.log
   fi
diff --git a/Scripts/scripts/cgal_create_CMakeLists b/Scripts/scripts/cgal_create_CMakeLists
index 0bb4db7f473..67db54e8d38 100755
--- a/Scripts/scripts/cgal_create_CMakeLists
+++ b/Scripts/scripts/cgal_create_CMakeLists
@@ -42,21 +42,19 @@
 
 create_cmake_script_with_options()
 {
-  qt4='n'
-
   # parse options file
   if [ -e "$OPTIONS_FILE" ]; then
 
     OLDIFS="$IFS"
     IFS=$'\n'
-    for LINE in `cat $OPTIONS_FILE`; do 
+    for LINE in `cat $OPTIONS_FILE`; do
 
       # CGAL components
       if [ -z "$CGAL_COMPONENTS_GIVEN" ]; then # read file only if not given!
         next_cgal_component=`echo $LINE | grep -v "#" | grep CGAL_COMPONENT`
         if [ ! -z "$next_cgal_component" ]; then
           next_cgal_component=${next_cgal_component/CGAL_COMPONENT /}
-          if [ -z "$CGAL_COMPONENTS" ]; then 
+          if [ -z "$CGAL_COMPONENTS" ]; then
             CGAL_COMPONENTS=$next_cgal_component
           else
             CGAL_COMPONENTS=$CGAL_COMPONENTS":"$next_cgal_component