diff --git a/CMakeLists.txt b/CMakeLists.txt
index 040bc4ed6..3cb05c8e1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -233,7 +233,6 @@ install_file(${CMAKE_SOURCE_DIR}/LICENSE.TXT core)
 install_file(${CMAKE_SOURCE_DIR}/LICENSE-THIRDPARTY.TXT core)
 install_file(etc/lsyncd_example.conf core)
 install_manual(Documentation/maxscale.1 1 core)
-install_file(${CMAKE_SOURCE_DIR}/server/maxscale_binlogserver_template.cnf core)
 install_file(${CMAKE_SOURCE_DIR}/etc/logrotate.d/maxscale_logrotate core)
 
 # For devel package, these files are put to the base folder
diff --git a/server/maxscale.cnf.template b/server/maxscale.cnf.template
index f0e076781..16ed7e0c7 100644
--- a/server/maxscale.cnf.template
+++ b/server/maxscale.cnf.template
@@ -62,14 +62,6 @@ servers=server1
 user=myuser
 password=mypwd
 
-# This service enables the use of the MaxAdmin interface
-# MaxScale administration guide:
-# https://mariadb.com/kb/en/mariadb-maxscale-23-maxadmin-admin-interface/
-
-[MaxAdmin-Service]
-type=service
-router=cli
-
 # Listener definitions for the services
 #
 # These listeners represent the ports the
@@ -87,9 +79,3 @@ type=listener
 service=Read-Write-Service
 protocol=MariaDBClient
 port=4006
-
-[MaxAdmin-Listener]
-type=listener
-service=MaxAdmin-Service
-protocol=maxscaled
-socket=default