diff --git a/.gitignore b/.gitignore
index d340a393ec..13f8a23908 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,9 +10,6 @@ record-and-playback/.project
 .vagrant/*
 **/.settings/*
 */.gradle
-bbb-api-demo/bin*
-bbb-api-demo/.classpath
-bbb-api-demo/.project
 bigbluebutton-web/.settings*
 bigbluebutton-web/.classpath
 bigbluebutton-web/.project
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b4a8dec014..95d1459ef2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,11 +74,6 @@ bbb-config-build:
   script:
     - build/setup-inside-docker.sh bbb-config
 
-bbb-demo-build:
-  extends: .build_job
-  script:
-    - build/setup-inside-docker.sh bbb-demo
-
 bbb-etherpad-build:
   extends: .build_job
   script:
diff --git a/bigbluebutton-config/bin/bbb-conf b/bigbluebutton-config/bin/bbb-conf
index 853bdb4778..864e72c39b 100755
--- a/bigbluebutton-config/bin/bbb-conf
+++ b/bigbluebutton-config/bin/bbb-conf
@@ -380,7 +380,7 @@ start_bigbluebutton () {
 
         systemctl start $TOMCAT_SERVICE || {
             echo
-            echo "# Warning: $TOMCAT_SERVICE could not be started. Please, check BBB-LTI or BBB-Demo."
+            echo "# Warning: $TOMCAT_SERVICE could not be started. Please, check BBB-LTI."
             echo "#     Run the command:"
             echo "#       sudo journalctl -u $TOMCAT_SERVICE"
             echo "#     To better understand the ERROR"
diff --git a/bigbluebutton-web/.gitignore b/bigbluebutton-web/.gitignore
index 3b68951979..3faa6608b4 100755
--- a/bigbluebutton-web/.gitignore
+++ b/bigbluebutton-web/.gitignore
@@ -2,7 +2,6 @@
 *.war
 stacktrace.log
 lib
-web-app/demo/bbb_api_conf.jsp
 target/*
 bin/*
 plugins/*