diff --git a/src/Workshop/DemoBundle/Element/ClickButtonTriggered.php b/src/Workshop/DemoBundle/Element/ClickButtonTriggered.php
index 5c591a0..c89ec9c 100644
--- a/src/Workshop/DemoBundle/Element/ClickButtonTriggered.php
+++ b/src/Workshop/DemoBundle/Element/ClickButtonTriggered.php
@@ -11,7 +11,7 @@
 
 use Workshop\DemoBundle\Element\Type\ClickAdminType;
 
-#[AutoconfigureTag('mapbender.element.click_button_triggered')]
+#[AutoconfigureTag('mapbender.element')]
 class ClickButtonTriggered extends AbstractElementService
 {
     private TranslatorInterface $translator;
@@ -63,7 +63,6 @@ public function getRequiredAssets(Element $element)
             'css' => array(),
             'trans' => array(
                 'mb.workshop.click.help',
-                'mb.workshop.click.test',
             ),
         );
     }
diff --git a/src/Workshop/DemoBundle/Resources/views/Element/click.html.twig b/src/Workshop/DemoBundle/Resources/views/Element/click.html.twig
deleted file mode 100644
index f3c9e03..0000000
--- a/src/Workshop/DemoBundle/Resources/views/Element/click.html.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="input">
-    <textarea class="form-control">Guten Tag Klicken Sie bitte in die Karte.:</textarea>
-</div>
diff --git a/src/Workshop/DemoBundle/Resources/views/Element/mapklick.html.twig b/src/Workshop/DemoBundle/Resources/views/Element/mapklick.html.twig
deleted file mode 100644
index e5d1f67..0000000
--- a/src/Workshop/DemoBundle/Resources/views/Element/mapklick.html.twig
+++ /dev/null
@@ -1 +0,0 @@
-{%- include '@MapbenderCore/Element/control_button.html.twig' with {icon: icon | default('iconGps')} -%}
diff --git a/src/Workshop/DemoBundle/WorkshopDemoBundle.php b/src/Workshop/DemoBundle/WorkshopDemoBundle.php
index fd14191..6a1e576 100644
--- a/src/Workshop/DemoBundle/WorkshopDemoBundle.php
+++ b/src/Workshop/DemoBundle/WorkshopDemoBundle.php
@@ -36,11 +36,8 @@ public function build(ContainerBuilder $container)
         parent::build($container);
         $configLocator = new FileLocator(__DIR__ . '/Resources/config');
         $xmlLoader = new XmlFileLoader($container, $configLocator);
-        $xmlLoader->load('elements.xml');
-        //$xmlLoader->load('services.xml');        
         //$xmlLoader->load('templates.xml');
         // Auto-rebuild on config change
-        $container->addResource(new FileResource($xmlLoader->getLocator()->locate('elements.xml')));
         //$container->addResource(new FileResource($xmlLoader->getLocator()->locate('services.xml')));
         //$container->addResource(new FileResource($xmlLoader->getLocator()->locate('templates.xml')));
     }