diff --git a/Configuration/ExtensionBuilder/settings.yaml b/Configuration/ExtensionBuilder/settings.yaml
deleted file mode 100644
index 3b52d12..0000000
--- a/Configuration/ExtensionBuilder/settings.yaml
+++ /dev/null
@@ -1,101 +0,0 @@
-#
-# Extension Builder settings for extension events
-# generated 2019-04-01T14:33:00Z
-#
-# See http://www.yaml.org/spec/1.2/spec.html
-#
-
----
-
-###########    Overwrite settings  ###########
-#
-# These settings only apply, if the roundtrip feature of the extension builder
-# is enabled in the extension manager
-#
-# Usage:
-# nesting reflects the file structure
-# a setting applies to a file or recursive to all files and subfolders
-#
-# merge:
-#   means for classes: All properties ,methods and method bodies
-#   of the existing class will be modified according to the new settings
-#   but not overwritten
-#
-#   for locallang xlf files: Existing keys and labels are always
-#   preserved (renaming a property or DomainObject will result in new keys and new labels)
-#
-#   for other files: You will find a Split token at the end of the file
-#   see: \EBT\ExtensionBuilder\Service\RoundTrip::SPLIT_TOKEN
-#
-#   After this token you can write whatever you want and it will be appended
-#   everytime the code is generated
-#
-# keep:
-#   files are never overwritten
-#   These settings may break the functionality of the extension builder!
-#   Handle with care!
-#
-#
-
-############  extension settings  ##############
-
-overwriteSettings:
-  Classes:
-    Controller: merge
-    Domain:
-      Model: merge
-      Repository: merge
-
-  Configuration:
-    #TCA merge not possible - use overrides directory
-    #TypoScript: keep
-
-  Resources:
-    Private:
-      #Language: merge
-      #Templates: keep
-
-  user_extension.svg: keep
-
-#  ext_localconf.php: merge
-
-#  ext_tables.php: merge
-
-#  ext_tables.sql: merge
-
-## use static date attribute in xliff files ##
-#staticDateInXliffFiles: 2019-04-01T14:33:00Z
-
-## skip docComment (license header) ##
-#skipDocComment
-
-## list of error codes for warnings that should be ignored ##
-#ignoreWarnings:
-  #503
-
-######### settings for classBuilder #############################
-#
-# here you may define default parent classes for your classes
-# these settings only apply for new generated classes
-# you may also just change the parent class in the generated class file.
-# It will be kept on next code generation, if the overwrite settings
-# are configured to merge it
-#
-#################################################################
-
-classBuilder:
-
-  Controller:
-    parentClass: \TYPO3\CMS\Extbase\Mvc\Controller\ActionController
-
-  Model:
-    AbstractEntity:
-      parentClass: \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
-
-    AbstractValueObject:
-      parentClass: \TYPO3\CMS\Extbase\DomainObject\AbstractValueObject
-
-  Repository:
-    parentClass: \TYPO3\CMS\Extbase\Persistence\Repository
-
-  setDefaultValuesForClassProperties: true
\ No newline at end of file
diff --git a/Configuration/FlexForms/Pi1.xml b/Configuration/FlexForms/Pi1.xml
deleted file mode 100644
index 2b7084d..0000000
--- a/Configuration/FlexForms/Pi1.xml
+++ /dev/null
@@ -1,402 +0,0 @@
-<T3DataStructure>
-    <sheets>
-        <sDEF>
-            <ROOT>
-                <TCEforms>
-                    <sheetTitle>Options</sheetTitle>
-                </TCEforms>
-                <type>array</type>
-                <el>
-                    <switchableControllerActions>
-                        <TCEforms>
-                            <label>Controller action</label>
-                            <onChange>reload</onChange>
-                            <config>
-                                <type>select</type>
-                                <items>
-                                    <numIndex index="0">
-                                        <numIndex index="0">Event List</numIndex>
-                                        <numIndex index="1">Event->list</numIndex>
-                                    </numIndex>
-                                    <numIndex index="1">
-                                        <numIndex index="0">Event Teaser</numIndex>
-                                        <numIndex index="1">Event->teaser</numIndex>
-                                    </numIndex>
-                                    <numIndex index="2">
-                                        <numIndex index="0">Event Show</numIndex>
-                                        <numIndex index="1">Event->show</numIndex>
-                                    </numIndex>
-                                    <numIndex index="3">
-                                        <numIndex index="0">Date List</numIndex>
-                                        <numIndex index="1">Date->list</numIndex>
-                                    </numIndex>
-                                    <!--
-                                    <numIndex index="4">
-                                        <numIndex index="0">Date Teaser</numIndex>
-                                        <numIndex index="1">Date->teaser</numIndex>
-                                    </numIndex>
-                                    -->
-                                    <numIndex index="5">
-                                        <numIndex index="0">Date Show</numIndex>
-                                        <numIndex index="1">Date->show</numIndex>
-                                    </numIndex>
-
-                                    <numIndex index="6">
-                                        <numIndex index="0">Event Search</numIndex>
-                                        <numIndex index="1">Event->search</numIndex>
-                                    </numIndex>
-
-                                    <numIndex index="6">
-                                        <numIndex index="0">Date Search</numIndex>
-                                        <numIndex index="1">Date->search</numIndex>
-                                    </numIndex>
-
-                                </items>
-                            </config>
-                        </TCEforms>
-                    </switchableControllerActions>
-
-                    <settings.sortByEvent>
-                        <TCEforms>
-                            <exclude>1</exclude>
-                            <label>Sort By</label>
-                            <displayCond>FIELD:switchableControllerActions:=:Event->list</displayCond>
-                            <config>
-                                <type>select</type>
-                                <items type="array">
-                                    <numIndex index="0" type="array">
-                                        <numIndex index="0">Title</numIndex>
-                                        <numIndex index="1">title</numIndex>
-                                    </numIndex>
-                                    <numIndex index="1" type="array">
-                                        <numIndex index="0">Region</numIndex>
-                                        <numIndex index="1">region</numIndex>
-                                    </numIndex>
-                                </items>
-                            </config>
-                        </TCEforms>
-                    </settings.sortByEvent>
-
-                    <settings.sortByDate>
-                        <TCEforms>
-                            <exclude>1</exclude>
-                            <label>Sort By</label>
-                            <displayCond>
-                                <OR>
-                                    <numIndex index="0">FIELD:switchableControllerActions:=:Date->list</numIndex>
-                                    <numIndex index="1">FIELD:switchableControllerActions:=:Date->search</numIndex>
-                                </OR>
-                            </displayCond>
-                            <config>
-                                <type>select</type>
-                                <items type="array">
-                                    <numIndex index="0" type="array">
-                                        <numIndex index="0">Start</numIndex>
-                                        <numIndex index="1">start</numIndex>
-                                    </numIndex>
-                                    <numIndex index="1" type="array">
-                                        <numIndex index="0">End</numIndex>
-                                        <numIndex index="1">end</numIndex>
-                                    </numIndex>
-                                </items>
-                            </config>
-                        </TCEforms>
-                    </settings.sortByDate>
-
-                    <settings.sortOrder>
-                        <TCEforms>
-                            <exclude>1</exclude>
-                            <label>Sort Order</label>
-                            <displayCond>
-                                <OR>
-                                    <numIndex index="0">FIELD:switchableControllerActions:=:Event->list</numIndex>
-                                    <numIndex index="1">FIELD:switchableControllerActions:=:Date->list</numIndex>
-                                    <numIndex index="2">FIELD:switchableControllerActions:=:Date->search</numIndex>
-                                </OR>
-                            </displayCond>
-                            <config>
-                                <type>select</type>
-                                <items type="array">
-                                    <numIndex index="0" type="array">
-                                        <numIndex index="0">
-                                            Ascending
-                                        </numIndex>
-                                        <numIndex index="1">ASC</numIndex>
-                                    </numIndex>
-                                    <numIndex index="1" type="array">
-                                        <numIndex index="0">
-                                            Descending
-                                        </numIndex>
-                                        <numIndex index="1">DESC</numIndex>
-                                    </numIndex>
-                                </items>
-                                <default>ASC</default>
-                            </config>
-                        </TCEforms>
-                    </settings.sortOrder>
-
-                    <settings.limit>
-                        <TCEforms>
-                            <exclude>1</exclude>
-                            <label>Max Items</label>
-                            <displayCond>
-                                <OR>
-                                    <numIndex index="0">FIELD:switchableControllerActions:=:Event->list</numIndex>
-                                    <numIndex index="1">FIELD:switchableControllerActions:=:Date->list</numIndex>
-                                    <numIndex index="2">FIELD:switchableControllerActions:=:Date->search</numIndex>
-                                </OR>
-                            </displayCond>
-                            <config>
-                                <type>input</type>
-                                <size>10</size>
-                                <max>30</max>
-                                <eval>trim</eval>
-                            </config>
-                        </TCEforms>
-                    </settings.limit>
-
-                    <settings.highlight>
-                        <TCEforms>
-                            <exclude>1</exclude>
-                            <label>Highlights only</label>
-                            <displayCond>
-                                <OR>
-                                    <numIndex index="0">FIELD:switchableControllerActions:=:Event->list</numIndex>
-                                    <numIndex index="1">FIELD:switchableControllerActions:=:Date->list</numIndex>
-                                </OR>
-                            </displayCond>
-                            <config>
-                                <type>check</type>
-                                <default>0</default>
-                            </config>
-                        </TCEforms>
-                    </settings.highlight>
-
-                    <settings.todayOnly>
-                        <TCEforms>
-                            <exclude>1</exclude>
-                            <label>Today only</label>
-                            <displayCond>
-                                <OR>
-                                    <numIndex index="0">FIELD:switchableControllerActions:=:Event->list</numIndex>
-                                    <numIndex index="1">FIELD:switchableControllerActions:=:Date->list</numIndex>
-                                </OR>
-                            </displayCond>
-                            <config>
-                                <type>check</type>
-                                <default>0</default>
-                            </config>
-                        </TCEforms>
-                    </settings.todayOnly>
-
-                    <settings.pagination>
-                        <TCEforms>
-                            <exclude>1</exclude>
-                            <label>Show pagination</label>
-                            <displayCond>
-                                <OR>
-                                    <numIndex index="0">FIELD:switchableControllerActions:=:Event->list</numIndex>
-                                    <numIndex index="1">FIELD:switchableControllerActions:=:Date->list</numIndex>
-                                </OR>
-                            </displayCond>
-                            <config>
-                                <type>check</type>
-                                <default>0</default>
-                            </config>
-                        </TCEforms>
-                    </settings.pagination>
-
-                    <settings.showPID>
-                        <TCEforms>
-                            <exclude>1</exclude>
-                            <label>Detail page</label>
-                            <displayCond>
-                                <OR>
-                                    <numIndex index="0">FIELD:switchableControllerActions:=:Event->list</numIndex>
-                                    <numIndex index="1">FIELD:switchableControllerActions:=:Event->teaser</numIndex>
-                                    <numIndex index="2">FIELD:switchableControllerActions:=:Event->search</numIndex>
-                                    <numIndex index="3">FIELD:switchableControllerActions:=:Date->list</numIndex>
-                                    <numIndex index="4">FIELD:switchableControllerActions:=:Date->teaser</numIndex>
-                                    <numIndex index="5">FIELD:switchableControllerActions:=:Date->search</numIndex>
-                                </OR>
-                            </displayCond>
-                            <config>
-                                <type>group</type>
-                                <internal_type>db</internal_type>
-                                <allowed>pages</allowed>
-                                <size>1</size>
-                                <maxitems>1</maxitems>
-                                <minitems>0</minitems>
-                                <show_thumbs>1</show_thumbs>
-                            </config>
-                        </TCEforms>
-                    </settings.showPID>
-
-                    <settings.eventUids>
-                        <TCEforms>
-                            <label>
-                                Event
-                            </label>
-                            <displayCond>
-                                <OR>
-                                    <numIndex index="0">FIELD:switchableControllerActions:=:Event->teaser</numIndex>
-                                    <numIndex index="1">FIELD:switchableControllerActions:=:Date->teaser</numIndex>
-                                </OR>
-                            </displayCond>
-                            <config>
-                                <type>select</type>
-                                <foreign_table>tx_events_domain_model_event</foreign_table>
-                                <foreign_table_where>AND tx_events_domain_model_event.deleted = 0 AND tx_events_domain_model_event.hidden = 0</foreign_table_where>
-                                <size>3</size>
-                                <enableMultiSelectFilterTextfield>1</enableMultiSelectFilterTextfield>
-                                <minitems>0</minitems>
-                                <maxitems>99</maxitems>
-                            </config>
-                        </TCEforms>
-                    </settings.eventUids>
-                </el>
-            </ROOT>
-        </sDEF>
-        <sTemplate>
-            <ROOT>
-                <TCEforms>
-                    <sheetTitle>Template</sheetTitle>
-                </TCEforms>
-                <type>array</type>
-                <el>
-                    <settings.template>
-                        <exclude>1</exclude>
-                        <label>Layout option</label>
-                        <displayCond>
-                            <OR>
-                                <numIndex index="0">FIELD:sDEF.switchableControllerActions:=:Event->list</numIndex>
-                                <numIndex index="1">FIELD:sDEF.switchableControllerActions:=:Date->list</numIndex>
-                            </OR>
-                        </displayCond>
-                        <config>
-                            <type>select</type>
-                            <items type="array">
-                                <numIndex index="0" type="array">
-                                    <numIndex index="0">Default</numIndex>
-                                    <numIndex index="1">default</numIndex>
-                                </numIndex>
-                                <numIndex index="1" type="array">
-                                    <numIndex index="0">Costum</numIndex>
-                                    <numIndex index="1">costum</numIndex>
-                                </numIndex>
-                                <numIndex index="2" type="array">
-                                    <numIndex index="0">Table</numIndex>
-                                    <numIndex index="1">table</numIndex>
-                                </numIndex>
-                                <numIndex index="3" type="array">
-                                    <numIndex index="0">Grid</numIndex>
-                                    <numIndex index="1">grid</numIndex>
-                                </numIndex>
-                            </items>
-                            <default>default</default>
-                        </config>
-                    </settings.template>
-                </el>
-            </ROOT>
-        </sTemplate>
-        <sConstrains>
-            <ROOT>
-                <TCEforms>
-                    <sheetTitle>Regions &amp; Categories</sheetTitle>
-                </TCEforms>
-                <type>array</type>
-                <el>
-                    <settings.region>
-                        <TCEforms>
-                            <label>Region</label>
-                            <displayCond>
-                                <OR>
-                                    <numIndex index="0">FIELD:sDEF.switchableControllerActions:=:Event->list</numIndex>
-                                    <numIndex index="1">FIELD:sDEF.switchableControllerActions:=:Date->list</numIndex>
-                                </OR>
-                            </displayCond>
-                            <config>
-                                <type>select</type>
-                                <foreign_table>tx_events_domain_model_region</foreign_table>
-                                <foreign_table_where>AND tx_events_domain_model_region.deleted = 0 AND tx_events_domain_model_region.hidden = 0</foreign_table_where>
-                                <size>3</size>
-                                <minitems>0</minitems>
-                                <maxitems>2</maxitems>
-                            </config>
-                        </TCEforms>
-                    </settings.region>
-
-                    <settings.categoryCombination>
-                        <TCEforms>
-                            <exclude>1</exclude>
-                            <label>Combination</label>
-                            <displayCond>
-                                <OR>
-                                    <numIndex index="0">FIELD:sDEF.switchableControllerActions:=:Event->list</numIndex>
-                                    <numIndex index="1">FIELD:sDEF.switchableControllerActions:=:Date->list</numIndex>
-                                </OR>
-                            </displayCond>
-                            <config>
-                                <type>select</type>
-                                <items type="array">
-                                    <numIndex index="0" type="array">
-                                        <numIndex index="0">And</numIndex>
-                                        <numIndex index="1">0</numIndex>
-                                    </numIndex>
-                                    <numIndex index="1" type="array">
-                                        <numIndex index="0">Or</numIndex>
-                                        <numIndex index="1">1</numIndex>
-                                    </numIndex>
-                                </items>
-                                <default>0</default>
-                            </config>
-                        </TCEforms>
-                    </settings.categoryCombination>
-
-                    <settings.categories>
-                        <TCEforms>
-                            <exclude>1</exclude>
-                            <label>
-                                Category
-                            </label>
-                            <displayCond>
-                                <OR>
-                                    <numIndex index="0">FIELD:sDEF.switchableControllerActions:=:Event->list</numIndex>
-                                    <numIndex index="1">FIELD:sDEF.switchableControllerActions:=:Date->list</numIndex>
-                                </OR>
-                            </displayCond>
-                            <config>
-                                <type>select</type>
-                                <autoSizeMax>20</autoSizeMax>
-                                <foreign_table>sys_category</foreign_table>
-                                <foreign_table_where> AND sys_category.sys_language_uid IN (-1, 0) ORDER BY sys_category.title ASC</foreign_table_where>
-                                <maxitems>1</maxitems>
-                                <renderMode>tree</renderMode>
-                                <size>8</size>
-                                <treeConfig>
-                                    <appearance>
-                                        <expandAll>1</expandAll>
-                                        <showHeader>1</showHeader>
-                                    </appearance>
-                                    <parentField>parent</parentField>
-                                </treeConfig>
-                            </config>
-                        </TCEforms>
-                    </settings.categories>
-
-                    <settings.includeSubcategories>
-                        <TCEforms>
-                            <exclude>1</exclude>
-                            <label>Include Subcategories</label>
-                            <displayCond>FIELD:sDEF.switchableControllerActions:=:Event->list</displayCond>
-                            <config>
-                                <type>check</type>
-                                <default>0</default>
-                            </config>
-                        </TCEforms>
-                    </settings.includeSubcategories>
-                </el>
-            </ROOT>
-        </sConstrains>
-    </sheets>
-</T3DataStructure>
\ No newline at end of file
diff --git a/ext_emconf.php b/ext_emconf.php
index c209312..bc04122 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -1,16 +1,6 @@
 <?php
 
-/**************************************************************
- * Extension Manager/Repository config file for ext: "events"
- *
- * Auto generated by Extension Builder 2019-04-03
- *
- * Manual updates:
- * Only the data in the array - anything else is removed by next write.
- * "version" and "dependencies" must not be touched!
- ***************************************************************/
-
-$EM_CONF[$_EXTKEY] = [
+$EM_CONF['events'] = [
     'title' => 'Events',
     'description' => 'Extension to manage events',
     'category' => 'plugin',
diff --git a/ext_localconf.php b/ext_localconf.php
index fec78e1..6899368 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -38,27 +38,6 @@ call_user_func(
             \TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider::class,
             ['source' => 'EXT:events/Resources/Public/Icons/Extension.svg']
         );
-
-        /*
-        // wizards
-        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig(
-            'mod {
-                wizards.newContentElement.wizardItems.plugins {
-                    elements {
-                        events {
-                            iconIdentifier = events-plugin
-                            title = LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events.name
-                            description = LLL:EXT:events/Resources/Private/Language/locallang_db.xlf:tx_events.description
-                            tt_content_defValues {
-                                CType = list
-                                list_type = events_pi1
-                            }
-                        }
-                    }
-                    show = *
-                }
-            }'
-        );
-        */
     }
+
 );