diff --git a/.gitmodules b/.gitmodules
index 47766d1cf..e69de29bb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +0,0 @@
-[submodule "demos"]
-	path = demos
-	url = https://github.com/tpaviot/pythonocc-demos
-	branch = master
diff --git a/.travis.yml b/.travis.yml
index 2e6e9cf0f..31be8c6a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -74,7 +74,6 @@ matrix:
 # analytic's repository. Follows an approach described by Dan Blanchard:
 # https://gist.github.com/dan-blanchard/7045057
 before_install:
-  - git submodule update --init --remote --recursive
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then
       export CXX=g++-7;
       export CC=gcc-7;
diff --git a/appveyor.yml b/appveyor.yml
index 81787f5b9..a71988a8d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -74,8 +74,6 @@ platform:
     - x64
 
 install:
-    # fetch git submodules, to update the demos/ folder
-    - cmd: git submodule update --init --remote --recursive
     # Set the CONDA_NPY, although it has no impact on the actual build. We need this because of a test within conda-build.
     - cmd: set CONDA_NPY=19
     # Remove cygwin (and therefore the git that comes with it).
diff --git a/ci/conda/run_test.bat b/ci/conda/run_test.bat
index fb55fd7d9..c52b6be62 100644
--- a/ci/conda/run_test.bat
+++ b/ci/conda/run_test.bat
@@ -1,8 +1,3 @@
 cd ..\work\test
 python run_tests.py
-python run_examples_as_tests.py
 python core_webgl_unittest.py
-python core_display_pyqt4_unittest.py
-python core_display_pyqt5_unittest.py
-python core_display_pyside_unittest.py
-python core_display_wx_unittest.py
diff --git a/ci/conda/run_test.sh b/ci/conda/run_test.sh
index 8aed0b6d3..85df2fb02 100644
--- a/ci/conda/run_test.sh
+++ b/ci/conda/run_test.sh
@@ -1,16 +1,3 @@
 cd ../work/test
 python run_tests.py
 python core_webgl_unittest.py
-if [ $(uname) == Linux ]; then
-    # start xvfb
-    export DISPLAY=:99.0
-    sh -e /etc/init.d/xvfb start
-    sleep 3 # give xvfb some time to start
-    # run example as tests
-    python run_examples_as_tests.py
-    # then run GUI tests
-    python core_display_pyqt4_unittest.py
-    python core_display_pyqt5_unittest.py
-    python core_display_pyside_unittest.py
-    python core_display_wx_unittest.py
-fi
diff --git a/demos b/demos
deleted file mode 160000
index 02ad16678..000000000
--- a/demos
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 02ad16678a01f2047d110331f77c8ceabd34bfb3