diff --git a/manifests/docker/compose_dariahrep.pp b/manifests/docker/compose_dariahrep.pp
index 411f8a1ab74c0a138fc96bcbd7589375c687b216..01412529c010479181745736e0977f755ca29cc5 100644
--- a/manifests/docker/compose_dariahrep.pp
+++ b/manifests/docker/compose_dariahrep.pp
@@ -65,7 +65,6 @@ class dhrep::docker::compose_dariahrep (
   include dhrep::services::fits
   include dhrep::services::publikator
   include dhrep::services::intern::elasticsearch
-  include dhrep::services::intern::wildfly
 
   $_crud_image_name = $::dhrep::services::crud::image_name
   $_crud_image_tag = $::dhrep::services::crud::image_tag
@@ -85,8 +84,6 @@ class dhrep::docker::compose_dariahrep (
   $_publikator_image_tag = $dhrep::services::publikator::image_tag
   $_elasticsearch_image_name = $::dhrep::services::intern::elasticsearch::docker_image_name
   $_elasticsearch_image_tag = $::dhrep::services::intern::elasticsearch::docker_image_tag
-  $_wildfly_image_name = $dhrep::services::intern::wildfly::image_name
-  $_wildfly_image_tag = $dhrep::services::intern::wildfly::image_tag
 
   include dhrep::docker
   file { '/opt/dariahrep':
@@ -116,11 +113,8 @@ class dhrep::docker::compose_dariahrep (
         elasticsearch_image        => "${_elasticsearch_image_name}:${_elasticsearch_image_tag}",
         elasticsearch_config       => $::dhrep::params::config['elasticsearch'],
         elasticsearch_cluster_name => $dhrep::services::intern::elasticsearch::cluster_name,
-        wildfly_image              => "${docker_image_registry}/${_wildfly_image_name}:${_wildfly_image_tag}",
-        wildfly_config             => $::dhrep::params::config['wildfly'],
         # flags for new release, such as es7, java17, and new messaging related changes!
         es_sieben_active           => $::dhrep::services::intern::elasticsearch::es_sieben_active,
-        new_messaging              => $::dhrep::services::intern::wildfly::new_messaging,
     }),
     notify  => Docker_compose['dariahrep'],
   }
@@ -170,11 +164,6 @@ class dhrep::docker::compose_dariahrep (
     image_tag => $_elasticsearch_image_tag,
     before    => Docker_compose['dariahrep'],
   }
-  dhrep::docker::image { "${docker_image_registry}/${_wildfly_image_name}":
-    ensure    => latest,
-    image_tag => $_wildfly_image_tag,
-    before    => Docker_compose['dariahrep'],
-  }
 
   docker_compose { 'dariahrep':
     ensure        => present,
diff --git a/manifests/docker/compose_textgrid.pp b/manifests/docker/compose_textgrid.pp
index fa1b6944a020f8af3c9e160b67d22f541316c090..634e5835e2688ed9ed83bffde217588eb9bc4f8d 100644
--- a/manifests/docker/compose_textgrid.pp
+++ b/manifests/docker/compose_textgrid.pp
@@ -69,7 +69,6 @@ class dhrep::docker::compose_textgrid (
   include dhrep::services::fits
   include dhrep::services::intern::elasticsearch
   include dhrep::services::intern::sesame
-  include dhrep::services::intern::wildfly
 
   $_crud_image_name = $::dhrep::services::crud::image_name
   $_crud_image_tag = $::dhrep::services::crud::image_tag
@@ -91,8 +90,6 @@ class dhrep::docker::compose_textgrid (
   $_elasticsearch_image_tag = $::dhrep::services::intern::elasticsearch::docker_image_tag
   $_rdf4j_image_name = $dhrep::services::intern::sesame::docker_image_name
   $_rdf4j_image_tag = $dhrep::services::intern::sesame::docker_image_tag
-  $_wildfly_image_name = $dhrep::services::intern::wildfly::image_name
-  $_wildfly_image_tag = $dhrep::services::intern::wildfly::image_tag
 
   include dhrep::docker
   file { '/opt/textgrid':
@@ -126,14 +123,11 @@ class dhrep::docker::compose_textgrid (
         elasticsearch_cluster_name => $dhrep::services::intern::elasticsearch::cluster_name,
         rdf4j_image                => "${docker_image_registry}/${_rdf4j_image_name}:${_rdf4j_image_tag}",
         rdf4j_config               => $::dhrep::params::config['tomcat_sesame'],
-        wildfly_image              => "${docker_image_registry}/${_wildfly_image_name}:${_wildfly_image_tag}",
-        wildfly_config             => $::dhrep::params::config['wildfly'],
         datadir                    => $::dhrep::services::intern::tgdatadirs::docker_data_location,
         public_hostname            => $::dhrep::public_hostname,
         es_workhorse_active        => ! $::dhrep::services::intern::elasticsearch::one_node_cluster,
         # flags for new release, such as es7, java17, and new messaging related changes!
         es_sieben_active           => $::dhrep::services::intern::elasticsearch::es_sieben_active,
-        new_messaging              => $::dhrep::services::intern::wildfly::new_messaging,
     }),
     notify  => Docker_compose['textgrid'],
   }
@@ -188,11 +182,6 @@ class dhrep::docker::compose_textgrid (
     image_tag => $_rdf4j_image_tag,
     before    => Docker_compose['textgrid'],
   }
-  dhrep::docker::image { "${docker_image_registry}/${_wildfly_image_name}":
-    ensure    => latest,
-    image_tag => $_wildfly_image_tag,
-    before    => Docker_compose['textgrid'],
-  }
 
   docker_compose { 'textgrid':
     ensure        => present,
diff --git a/manifests/init.pp b/manifests/init.pp
index caac8279f161d971cc224128dfb584a20da17d21..8fa4c5ebe7aa5c24e13ee85570f6d231d76bb6d8 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -151,9 +151,6 @@ class dhrep (
   class { 'dhrep::services::intern::messaging':
     scope => $scope,
   }
-  class { 'dhrep::services::intern::wildfly':
-    scope => $scope,
-  }
   class { 'dhrep::services::iiifmd':
     scope => $scope,
   }
@@ -191,14 +188,14 @@ class dhrep (
       publish_secret => $tgcrud_publish_secret,
       log_level      => $crud_log_level,
       require        => [Class['dhrep::services::intern::elasticsearch'], Class['dhrep::services::intern::sesame'],
-      Class['dhrep::services::intern::wildfly']],
+      Class['dhrep::services::intern::messaging']],
     }
     class { 'dhrep::services::crud_public':
       scope     => $scope,
       location  => $tgcrud_public_location,
       log_level => $crud_public_log_level,
       require   => [Class['dhrep::services::intern::elasticsearch'], Class['dhrep::services::intern::sesame'],
-      Class['dhrep::services::intern::wildfly'], Class['dhrep::services::fits']],
+      Class['dhrep::services::intern::messaging'], Class['dhrep::services::fits']],
     }
     class { 'dhrep::services::publish':
       scope        => $scope,
@@ -238,7 +235,7 @@ class dhrep (
       storage_host_public => $dhcrud_storage_host_public,
       pid_secret          => $dhcrud_pid_secret,
       log_level           => $crud_log_level,
-      require             => [Class['dhrep::services::intern::elasticsearch'], Class['dhrep::services::intern::wildfly'],  Class['dhrep::services::fits']],
+      require             => [Class['dhrep::services::intern::elasticsearch'], Class['dhrep::services::intern::messaging'], Class['dhrep::services::fits']],
     }
     class { 'dhrep::services::crud_public':
       scope               => $scope,
@@ -247,7 +244,7 @@ class dhrep (
       storage_host_public => $dhcrud_public_storage_host_public,
       pid_secret          => $dhcrud_pid_secret,
       log_level           => $crud_public_log_level,
-      require             => [Class['dhrep::services::intern::elasticsearch'], Class['dhrep::services::intern::wildfly']],
+      require             => [Class['dhrep::services::intern::elasticsearch'], Class['dhrep::services::intern::messaging']],
     }
     class { 'dhrep::services::publish':
       scope         => $scope,
diff --git a/manifests/params.pp b/manifests/params.pp
index 1e23573c3c82a2b6103814ec02ef2b1b3d4f9935..85c7ff4ebc98662a9ba0838bef526f28ac8e068d 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -227,8 +227,7 @@ class dhrep::params {
   ###
   # memory profiles: if no hiera entry is found, default to undef, so default
   # profile is used
-  # NOTE all tomcats except the crud, publish, and wildfly ones are using the
-  # servicetomcat's settings!
+  # NOTE all tomcats except crud and publish are using the servicetomcat's settings!
   ###
   case hiera('dhrep::mem_profile', undef) {
     'low': {
@@ -254,10 +253,6 @@ class dhrep::params {
           'xmx' => '64m',
           'xms' => '32m',
         },
-        'wildfly' => {
-          'xmx' => '128m',
-          'xms' => '64m',
-        },
         'iiifmd'  => {
           'xmx' => '64m',
           'xms' => '32m',
@@ -307,10 +302,6 @@ class dhrep::params {
           'xmx' => '1792m',
           'xms' => '1792m',
         },
-        'wildfly' => {
-          'xmx' => '256m',
-          'xms' => '256m',
-        },
         'iiifmd'  => {
           'xmx' => '512m',
           'xms' => '512m',
@@ -360,10 +351,6 @@ class dhrep::params {
           'xmx' => '256m',
           'xms' => '32m',
         },
-        'wildfly' => {
-          'xmx' => '256m',
-          'xms' => '32m',
-        },
         'iiifmd'  => {
           'xmx' => '128m',
           'xms' => '32m',
@@ -413,10 +400,6 @@ class dhrep::params {
           'xmx' => '256m',
           'xms' => '32m',
         },
-        'wildfly' => {
-          'xmx' => '384m',
-          'xms' => '32m',
-        },
         'iiifmd'  => {
           'xmx' => '512m',
           'xms' => '32m',
diff --git a/manifests/services/iiifmd.pp b/manifests/services/iiifmd.pp
index 55876b63885fd287bd561a24937301789ec4296c..a577c1330cbbca6b00da01d2a49d9a76043effec 100644
--- a/manifests/services/iiifmd.pp
+++ b/manifests/services/iiifmd.pp
@@ -16,24 +16,6 @@ class dhrep::services::iiifmd (
   $_confdir = $::dhrep::params::confdir
   $_vardir  = $::dhrep::params::vardir
   $_aptdir  = $::dhrep::params::aptdir
-  #$_catname = $::dhrep::params::config['tomcat_oaipmh']['catname']
-
-  ###
-  # update apt repo and install package
-  ###
-  #package { 'tg-iiif-metadata':
-  #  ensure  => $version,
-  #  require => [Exec['update_dariah_apt_repository'],Usertomcat::Instance[$_catname]],
-  #}
-
-  ###
-  # symlink war from deb package to tomcat webapps dir
-  ###
-  #file { "/home/${_catname}/${_catname}/webapps/iiifmd":
-  #  ensure  => 'link',
-  #  target  => "${_aptdir}/iiifmd",
-  #  require => [File["${_confdir}/iiifmd/iiifmd.properties"],Usertomcat::Instance[$_catname]],
-  #}
 
   ###
   # config
diff --git a/manifests/services/intern/wildfly.pp b/manifests/services/intern/wildfly.pp
index 23aa496ff335d76a84df39c765f1eaf99479fa10..f8fe468fe4fa0a20e868d27977e6fe34487ee1d0 100644
--- a/manifests/services/intern/wildfly.pp
+++ b/manifests/services/intern/wildfly.pp
@@ -27,135 +27,6 @@ class dhrep::services::intern::wildfly (
   $crud_pw       = 'secret',
   $image_name    = 'dariah-de/dariah-de-message-beans',
   $image_tag     = 'latest',
-  $new_messaging = false,
 ) inherits dhrep::params {
 
-  #$_vardir = $::dhrep::params::vardir
-  #$java_home = '/usr/lib/jvm/java-8-openjdk-amd64'
-
-  if ($new_messaging == false) {
-
-    ###
-    # set messaging topic to dh or tg crud
-    ###
-    if ($scope == 'textgrid') {
-      $crud_name  = 'tgcrud'
-      $crud_topic = 'tgcrudTopic'
-    } else {
-      $crud_name  = 'dhcrud'
-      $crud_topic = 'dhcrudTopic'
-    }
-
-    ###
-    # install wildfly
-    ###
-    #class { 'wildfly':
-    #  version        => '9.0.2',
-    #  install_source => 'http://download.jboss.org/wildfly/9.0.2.Final/wildfly-9.0.2.Final.tar.gz',
-    #  java_home      => $java_home,
-    #  dirname        => '/home/wildfly/wildfly',
-    #  mode           => 'standalone',
-    #  config         => 'standalone-full.xml',
-    #  java_xmx       => $xmx,
-    #  java_xms       => $xms,
-    #  java_opts      => '-Djava.net.preferIPv4Stack=true',
-    #  properties     => {
-    #    'jboss.management.http.port'  => '19990',
-    #    'jboss.management.https.port' => '19993',
-    #    'jboss.http.port'             => '18080',
-    #    'jboss.https.port'            => '18443',
-    #    'jboss.ajp.port'              => '18009',
-    #  },
-    #  # only required if not oracle jdk8...?
-    #  require        => Package['default-jre-headless'],
-    #  # should be initialised before tomcat_crud...
-    #  # TODO, how in docker?
-    #  before         => Docker_compose['textgrid'],
-    #  # before         => Service['tomcat-crud'],
-    #}
-    #-> wildfly::config::app_user { $crud_name:
-    #  password => $crud_pw,
-    #}
-    #-> wildfly::config::user_roles { $crud_name:
-    #  roles => 'guest',
-    #}
-    #-> wildfly::messaging::topic { $crud_topic:
-    #  entries => ["topic/${crud_name}","java:jboss/exported/jms/topic/${crud_name}"],
-      # TODO, how in docker?
-      #notify  => [Service['tomcat-crud'], Service['tomcat-publish']],
-    #}
-
-    ###
-    # update apt repo and install package
-    ###
-    #package { 'message-beans':
-    #  ensure  => latest,
-    #  require => [Exec['update_dariah_apt_repository'], Class['wildfly']],
-    #}
-
-    ###
-    # symlink war from deb war package to jboss deploy dir
-    ###
-    #file { '/home/wildfly/wildfly/standalone/deployments/message-beans.war':
-    #  ensure  => 'link',
-    #  target  => '/var/dhrep/webapps/message-beans/message-beans.war',
-    #  require => Package['message-beans'],
-    #}
-
-    ###
-    # telegraf for wildfly
-    ###
-    #require 'usertomcat::jolokia'
-    #file { '/home/wildfly/wildfly/standalone/deployments/jolokia.war':
-    #  source => '/var/cache/jolokia.war',
-    #}
-
-    telegraf::input { 'jolokia2_wildfly':
-      plugin_type => 'jolokia2_agent',
-      options     => [{
-          'urls'        => [ 'http://127.0.0.1:18080/jolokia/' ],
-          'name_prefix' => 'wildfly.',
-          'metric'      => [{
-              'name'     => 'process_cpu_load',
-              'mbean'    => 'java.lang:type=OperatingSystem',
-              'paths'    => [ 'ProcessCpuLoad' ],
-              'tag_keys' => ['name'],
-            },{
-              'name'     => 'heap_memory_usage',
-              'mbean'    => 'java.lang:type=Memory',
-              'paths'    => [ 'HeapMemoryUsage' ],
-              'tag_keys' => ['name'],
-          }],
-      }],
-    }
-
-    ###
-    # logrotate
-    ###
-    logrotate::rule { 'wildfly_logrotate':
-      path         => '/var/log/wildfly/console.log',
-      # require      => Class['wildfly'],
-      rotate       => 30,
-      rotate_every => 'day',
-      compress     => true,
-      copytruncate => true,
-      missingok    => true,
-      ifempty      => true,
-      dateext      => true,
-      dateformat   => '.%Y-%m-%d',
-    }
-
-    ###
-    # nrpe
-    ###
-    nrpe::command { 'check_wildfly_memory':
-      ensure  => present,
-      command => '/usr/lib/nagios/plugins/check_http -H localhost -p 18080 -u /jolokia/read/java.lang:type=Memory -s HeapMemoryUsage -s NonHeapMemoryUsage',
-    }
-    nrpe::command { 'check_wildfly_uptime':
-      ensure  => present,
-      command => '/usr/lib/nagios/plugins/check_http -H localhost -p 18080 -u /jolokia/read/java.lang:type=Runtime/Uptime -s Uptime',
-    }
-  }
-
 }
diff --git a/manifests/services/oaipmh.pp b/manifests/services/oaipmh.pp
index 17d7842845c35725d74ffa385034b21459e6d677..2ad118a2b6ea99b27905283a3270c1504b72c0ce 100644
--- a/manifests/services/oaipmh.pp
+++ b/manifests/services/oaipmh.pp
@@ -21,23 +21,6 @@ class dhrep::services::oaipmh (
 
   $templates = "dhrep/etc/dhrep/oaipmh/${scope}"
 
-  ###
-  # update apt repo and install package
-  ###
-  #package { $_name:
-  #  ensure  => $_version,
-  #  require => [Exec['update_dariah_apt_repository'], Usertomcat::Instance[$_catname]],
-  #}
-
-  ###
-  # symlink war from deb package to tomcat webapps dir
-  ###
-  #file { "/home/${_catname}/${_catname}/webapps/oaipmh":
-  #  ensure  => 'link',
-  #  target  => "${_aptdir}/oaipmh",
-  #  require => [File["${_confdir}/oaipmh/oaipmh.properties"], Usertomcat::Instance[$_catname]],
-  #}
-
   ###
   # config
   ###
diff --git a/manifests/services/pid.pp b/manifests/services/pid.pp
index 309c8d6ba64520b2f76455a768abdc67e26cb513..87f927ece1480ac24b1107422c77b2817f13e06b 100644
--- a/manifests/services/pid.pp
+++ b/manifests/services/pid.pp
@@ -37,23 +37,6 @@ class dhrep::services::pid (
 
   $templates = "dhrep/etc/dhrep/pid/${scope}"
 
-  ###
-  # update apt repo and install package
-  ###
-  #package { $_name:
-  #  ensure  => $_version,
-  #  require => [Exec['update_dariah_apt_repository'],Usertomcat::Instance[$_catname]],
-  #}
-
-  ###
-  # symlink war from deb package to tomcat webapps dir
-  ###
-  #file { "/home/${_catname}/${_catname}/webapps/${_short}":
-  #  ensure  => link,
-  #  target  => "${_aptdir}/pid",
-  #  require => [File["${_confdir}/${_short}/pid.properties"],Usertomcat::Instance[$_catname]],
-  #}
-
   ###
   # config
   ###
diff --git a/manifests/services/publikator.pp b/manifests/services/publikator.pp
index 23aaccbd111ba637862ab35b60b363e24cb94313..3974c57eaf96a75a562ceb331a2d20b71601ca86 100644
--- a/manifests/services/publikator.pp
+++ b/manifests/services/publikator.pp
@@ -61,23 +61,6 @@ class dhrep::services::publikator (
 
   $templates = "dhrep/etc/dhrep/publikator/${scope}"
 
-  ###
-  # update apt repo and install package
-  ###
-  #package { $_name:
-  #  ensure  => $_version,
-  #  require => [Exec['update_dariah_apt_repository'], Usertomcat::Instance[$_catname]],
-  #}
-
-  ###
-  # symlink war from deb package to tomcat webapps dir
-  ###
-  #file { "/home/${_catname}/${_catname}/webapps/publikator":
-  #  ensure  => 'link',
-  #  target  => "${_aptdir}/publikator",
-  #  #require => Usertomcat::Instance[$_catname],
-  #}
-
   ###
   # config
   ###
diff --git a/manifests/services/publish.pp b/manifests/services/publish.pp
index 316577006b6415f04ad89d6c235e2d18145ef521..a4daa257ee81f6a8e62a83c583adf39be473d5be 100644
--- a/manifests/services/publish.pp
+++ b/manifests/services/publish.pp
@@ -42,23 +42,6 @@ class dhrep::services::publish (
   $crud_port = $::dhrep::params::config['tomcat_crud']['http_port'];
   $pid_port  = $::dhrep::params::config['tomcat_pid']['http_port'];
 
-  ###
-  # update apt repo and install package
-  ###
-  #package { $_name:
-  #  ensure  => $_version,
-  #  require => [Exec['update_dariah_apt_repository'],Usertomcat::Instance[$_catname]],
-  #}
-
-  ###
-  # symlink war from deb package to tomcat webapps dir
-  ###
-  #file { "/home/${_user}/${_catname}/webapps/${_short}":
-  #  ensure  => 'link',
-  #  target  => "${_aptdir}/${_short}",
-  #  require => [File["${_confdir}/${_short}/beans.properties"],Usertomcat::Instance[$_catname]],
-  #}
-
   ###
   # config
   ###
diff --git a/manifests/tools/scripts.pp b/manifests/tools/scripts.pp
index 5c270064579b22d9a83e5360589dc6350662b7cb..7d3ebf25d2076577a8637c05200e812748b2595a 100644
--- a/manifests/tools/scripts.pp
+++ b/manifests/tools/scripts.pp
@@ -4,7 +4,6 @@
 #
 class dhrep::tools::scripts (
   $scope         = undef,
-  $new_messaging = false,
 ) inherits dhrep::params {
 
   $_optdir = $::dhrep::params::optdir
@@ -27,7 +26,6 @@ class dhrep::tools::scripts (
     owner   => 'root',
     group   => 'root',
     mode    => '0755',
-    #require => [File[$_optdir], Class['::dhrep::services::intern::wildfly'], Class['::dhrep::services::intern::elasticsearch']],
     require => File[$_optdir],
   }
 
diff --git a/templates/etc/dhrep/crud-public/dariah/crud.properties.erb b/templates/etc/dhrep/crud-public/dariah/crud.properties.erb
index b1e88db247e2563f0e8ab709a99feb833211eafb..797072920c642d2e4d4050d0367fe32a6d5a3064 100644
--- a/templates/etc/dhrep/crud-public/dariah/crud.properties.erb
+++ b/templates/etc/dhrep/crud-public/dariah/crud.properties.erb
@@ -152,12 +152,6 @@ PUBLISH_SECRET = *
 
 # Settings for the message producer.
 USE_MESSAGING = <%= @use_messaging %>
-# OLD SETTINGS! (prod and test)
-INITIAL_MESSAGING_CONTEXT_FACTORY = org.jboss.naming.remote.client.InitialContextFactory
-MESSAGING_PROVIDER_URL = http-remoting://wildfly:18080
-MESSAGING_SECURITY_PRINCIPAL = tgcrud
-MESSAGING_SECURITY_CREDENTIALS = secret
-# NEW SETTINGS! (dev)
 MESSAGING_SERVICE_URL = <%= @messaging_url %>
 MESSAGING_EVENT_NAME = dhcrud-events
 MESSAGING_USER = <%= @messaging_user %>
diff --git a/templates/etc/dhrep/crud-public/textgrid/crud.properties.erb b/templates/etc/dhrep/crud-public/textgrid/crud.properties.erb
index 7390fc41ef058ac1814107f40220894ddedbe494..03cf3bb46458c76cc221949027015202a590f73a 100644
--- a/templates/etc/dhrep/crud-public/textgrid/crud.properties.erb
+++ b/templates/etc/dhrep/crud-public/textgrid/crud.properties.erb
@@ -114,12 +114,6 @@ REINDEX_SECRET = <%= @reindex_secret %>
 
 # Settings for the message producer.
 USE_MESSAGING = <%= @use_messaging %>
-# OLD SETTINGS! (prod and test)
-INITIAL_MESSAGING_CONTEXT_FACTORY = org.jboss.naming.remote.client.InitialContextFactory
-MESSAGING_PROVIDER_URL = http-remoting://wildfly:18080
-MESSAGING_SECURITY_PRINCIPAL = tgcrud
-MESSAGING_SECURITY_CREDENTIALS = secret
-# NEW SETTINGS! (dev)
 MESSAGING_SERVICE_URL = <%= @messaging_url %>
 MESSAGING_EVENT_NAME = tgcrud-events
 MESSAGING_USER = <%= @messaging_user %>
diff --git a/templates/etc/dhrep/crud/dariah/crud.properties.erb b/templates/etc/dhrep/crud/dariah/crud.properties.erb
index e34620be8aaacd3ea78088c3e121944d687e5e6e..c0167775e4ec9c27b9ba9679b3b00211c5239d53 100644
--- a/templates/etc/dhrep/crud/dariah/crud.properties.erb
+++ b/templates/etc/dhrep/crud/dariah/crud.properties.erb
@@ -152,12 +152,6 @@ PUBLISH_SECRET = *
 
 # Settings for the message producer.
 USE_MESSAGING = <%= @use_messaging %>
-# OLD SETTINGS! (prod and test)
-INITIAL_MESSAGING_CONTEXT_FACTORY = org.jboss.naming.remote.client.InitialContextFactory
-MESSAGING_PROVIDER_URL = http-remoting://wildfly:18080
-MESSAGING_SECURITY_PRINCIPAL = tgcrud
-MESSAGING_SECURITY_CREDENTIALS = secret
-# NEW SETTINGS! (dev)
 MESSAGING_SERVICE_URL = <%= @messaging_url %>
 MESSAGING_EVENT_NAME = dhcrud-events
 MESSAGING_USER = <%= @messaging_user %>
diff --git a/templates/etc/dhrep/crud/textgrid/crud.properties.erb b/templates/etc/dhrep/crud/textgrid/crud.properties.erb
index 8bdf1884525e37d54433bf3897092d55ee6dc9f1..aacc082aee50427cd55c2b16ae8d42fe5eeab16f 100644
--- a/templates/etc/dhrep/crud/textgrid/crud.properties.erb
+++ b/templates/etc/dhrep/crud/textgrid/crud.properties.erb
@@ -114,12 +114,6 @@ REINDEX_SECRET = <%= @reindex_secret %>
 
 # Settings for the message producer.
 USE_MESSAGING = <%= @use_messaging %>
-# OLD SETTINGS! (prod and test)
-INITIAL_MESSAGING_CONTEXT_FACTORY = org.jboss.naming.remote.client.InitialContextFactory
-MESSAGING_PROVIDER_URL = http-remoting://wildfly:18080
-MESSAGING_SECURITY_PRINCIPAL = tgcrud
-MESSAGING_SECURITY_CREDENTIALS = secret
-# NEW SETTINGS! (dev)
 MESSAGING_SERVICE_URL = <%= @messaging_url %>
 MESSAGING_EVENT_NAME = tgcrud-events
 MESSAGING_USER = <%= @messaging_user %>
diff --git a/templates/opt/compose-dariahrep/docker-compose.yml.epp b/templates/opt/compose-dariahrep/docker-compose.yml.epp
index 692b39b294a7ee69e02371fbdea3bfd70300eeb7..0aed905bc513cccfa4ed0e7a783fce2d857aead7 100644
--- a/templates/opt/compose-dariahrep/docker-compose.yml.epp
+++ b/templates/opt/compose-dariahrep/docker-compose.yml.epp
@@ -22,12 +22,7 @@ services:
     networks:
       - dhrepnet1
     depends_on:
-<% if $new_messaging == true { -%>
       - message-consumer
-<% } -%>
-<% if $new_messaging == false { -%>
-      - wildfly
-<% } -%>
       - searchindex-main
 
   publish:
@@ -224,24 +219,6 @@ services:
     networks:
       - dhrepnet1
 
-<% if $new_messaging == false { -%>
-  # TODO: dhcrud is added as a management user to container, this differs from former puppet setup
-  wildfly:
-    image: <%= $wildfly_image %>
-    restart: always
-    environment:
-       - JAVA_OPTS=-Xmx<%= $wildfly_config['xmx'] %> -Xms<%= $wildfly_config['xms'] %> -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true -Djboss.modules.system.pkgs=org.jboss.byteman -Djava.awt.headless=true -Djboss.http.port=18080
-    ports:
-      - 18080:18080
-    volumes:
-      - wildfly_config:/opt/jboss/wildfly/standalone/configuration
-      - wildfly_data:/opt/jboss/wildfly/standalone/data
-      - etc_dir:/etc/dhrep
-      - digilib_prescales:/var/dhrep/digilib/prescale
-    networks:
-      - dhrepnet1
-<% } -%>
-<% if $new_messaging == true { -%>
   artemis:
     image: quay.io/artemiscloud/activemq-artemis-broker:0.1.2
     ports:
@@ -268,7 +245,6 @@ services:
       - digilib_prescales:/var/dhrep/digilib/prescale
     depends_on:
       - artemis
-<% } -%>
 
 volumes:
   elasticsearch-main-data:
@@ -295,8 +271,6 @@ volumes:
       type: none
       device: /var/dhrep/digilib/prescale
       o: bind
-  wildfly_config:
-  wildfly_data:
   crud_tmp:
 
 networks:
diff --git a/templates/opt/compose-textgrid/docker-compose.yml.epp b/templates/opt/compose-textgrid/docker-compose.yml.epp
index 7a5ebb37111be882392a83356c8666e04d1a33e4..c73fbbc71d7c7fb0c952999663c7c6b401939212 100644
--- a/templates/opt/compose-textgrid/docker-compose.yml.epp
+++ b/templates/opt/compose-textgrid/docker-compose.yml.epp
@@ -21,12 +21,7 @@ services:
     networks:
       - dhrepnet1
     depends_on:
-<% if $new_messaging == true { -%>
       - message-consumer
-<% } -%>
-<% if $new_messaging == false { -%>
-      - wildfly
-<% } -%>
       - searchindex-main
       - triplestore
 
@@ -283,25 +278,6 @@ services:
     networks:
       - dhrepnet1
 
-<% if $new_messaging == false { -%>
-  # TODO: tgcrud is added as a management user to container, this differs from former puppet setup
-  wildfly:
-    image: <%= $wildfly_image %>
-    restart: always
-    environment:
-       - JAVA_OPTS=-Xmx<%= $wildfly_config['xmx'] %> -Xms<%= $wildfly_config['xms'] %> -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true -Djboss.modules.system.pkgs=org.jboss.byteman -Djava.awt.headless=true -Djboss.http.port=18080
-    ports:
-      - 18080:18080
-    volumes:
-      - wildfly_config:/opt/jboss/wildfly/standalone/configuration
-      - wildfly_data:/opt/jboss/wildfly/standalone/data
-      - etc_dir:/etc/dhrep
-      - digilib_prescales:/var/dhrep/digilib/prescale
-      - data:/data
-    networks:
-      - dhrepnet1
-<% } -%>
-<% if $new_messaging == true { -%>
   artemis:
     image: quay.io/artemiscloud/activemq-artemis-broker:0.1.2
     ports:
@@ -329,7 +305,6 @@ services:
       - data:/data
     depends_on:
       - artemis
-<% } -%>
 
 volumes:
   elasticsearch-main-data:
@@ -366,8 +341,6 @@ volumes:
       device: <%= $datadir %>
       o: bind
   rdf4j_data:
-  wildfly_config:
-  wildfly_data:
 
 networks:
   dhrepnet1:
diff --git a/templates/opt/dhrep/dariah/check-services.sh.erb b/templates/opt/dhrep/dariah/check-services.sh.erb
index d70586e2728eb1e0ff5a2af92820e5f5a0197ac9..018972f5a6d8e02c8f9492edc3a1495c346fbc14 100644
--- a/templates/opt/dhrep/dariah/check-services.sh.erb
+++ b/templates/opt/dhrep/dariah/check-services.sh.erb
@@ -161,29 +161,6 @@ else
     ERRSTR=$ERRSTR" dhdigilib"
 fi
 
-<% if not @new_messaging -%>
-#
-# wildfly
-#
-FILE="wildfly"
-WILDFLY=$SERVER":18080/jolokia/read/java.lang:type=Runtime/Uptime"
-if $R; then echo "checking "$CSTR"wildfly"$CNRM" (may be obsolete)"$TRN $WILDFLY; fi
-curl -s $WILDFLY > $FILE
-URGL=`grep \"status\":200 $FILE`
-URGL=`echo ${URGL: -13:12}`
-if [ -s $FILE ] && [ "$URGL" = "\"status\":200"  ] ; then
-    if $R; then echo -n "    $OK ["$VSTR; fi
-    if $R; then echo -n $URGL; fi
-    rm $FILE
-    if $R; then echo $CNRM"]"; fi
-else
-    if $R; then echo "    $FAILED"; fi
-    rm $FILE
-    ERRORS=true
-    ERRSTR=$ERRSTR" dhwildfly"
-fi
-<% end -%>
-<% if @new_messaging -%>
 #
 # artemis
 #
@@ -223,7 +200,6 @@ else
     ERRORS=true
     ERRSTR=$ERRSTR" message-consumer"
 fi
-<% end -%>
 
 #
 # iiifmd
diff --git a/templates/opt/dhrep/textgrid/check-services.sh.erb b/templates/opt/dhrep/textgrid/check-services.sh.erb
index a773811fdc27696e6c48702dba36ca72bca55c47..20c5c218e20c0261867364eb5a73947c8b275bc9 100644
--- a/templates/opt/dhrep/textgrid/check-services.sh.erb
+++ b/templates/opt/dhrep/textgrid/check-services.sh.erb
@@ -228,29 +228,6 @@ else
     ERRSTR=$ERRSTR" tgdigilib"
 fi
 
-<% if not @new_messaging -%>
-#
-# wildfly
-#
-FILE="wildfly"
-WILDFLY=$SERVER":18080/jolokia/read/java.lang:type=Runtime/Uptime"
-if $R; then echo "checking "$CSTR"wildfly"$CNRM" (may be obsolete)"$TRN $WILDFLY; fi
-curl -s $WILDFLY > $FILE
-URGL=`grep \"status\":200 $FILE`
-URGL=`echo ${URGL: -13:12}`
-if [ -s $FILE ] && [ "$URGL" = "\"status\":200"  ] ; then
-    if $R; then echo -n "    $OK ["$VSTR; fi
-    if $R; then echo -n $URGL; fi
-    rm $FILE
-    if $R; then echo $CNRM"]"; fi
-else
-    if $R; then echo "    $FAILED"; fi
-    rm $FILE
-    ERRORS=true
-    ERRSTR=$ERRSTR" tgwildfly"
-fi
-<% end -%>
-<% if @new_messaging -%>
 #
 # artemis
 #
@@ -290,7 +267,6 @@ else
     ERRORS=true
     ERRSTR=$ERRSTR" message-consumer"
 fi
-<% end -%>
 
 #
 # iiifmd