diff --git a/src/zabapgit.prog.abap b/src/zabapgit.prog.abap
index a3518a9e6..492b3f044 100644
--- a/src/zabapgit.prog.abap
+++ b/src/zabapgit.prog.abap
@@ -32,25 +32,11 @@ SELECTION-SCREEN END OF SCREEN 1001.
INCLUDE zabapgit_password_dialog. " !!! Contains SELECTION SCREEN
-INCLUDE zabapgit_macros.
-INCLUDE zabapgit_zlib.
-INCLUDE zabapgit_html.
-INCLUDE zabapgit_xml.
-
INCLUDE zabapgit_app. " Some deferred definitions here
-INCLUDE zabapgit_persistence_old.
-INCLUDE zabapgit_dot_abapgit.
-INCLUDE zabapgit_persistence.
-INCLUDE zabapgit_sap_package.
-INCLUDE zabapgit_folder_logic.
-INCLUDE zabapgit_requirements.
INCLUDE zabapgit_authorizations.
INCLUDE zabapgit_exit.
INCLUDE zabapgit_proxy.
-INCLUDE zabapgit_tag.
-INCLUDE zabapgit_stage.
-INCLUDE zabapgit_git_helpers.
INCLUDE zabapgit_repo.
INCLUDE zabapgit_news.
INCLUDE zabapgit_stage_logic.
diff --git a/src/zabapgit_dot_abapgit.prog.abap b/src/zabapgit_dot_abapgit.prog.abap
deleted file mode 100644
index b8a52252b..000000000
--- a/src/zabapgit_dot_abapgit.prog.abap
+++ /dev/null
@@ -1,5 +0,0 @@
-*&---------------------------------------------------------------------*
-*& Include ZABAPGIT_DOT_ABAPGIT
-*&---------------------------------------------------------------------*
-
-* todo, include to be deleted
diff --git a/src/zabapgit_dot_abapgit.prog.xml b/src/zabapgit_dot_abapgit.prog.xml
deleted file mode 100644
index 2bb3d0990..000000000
--- a/src/zabapgit_dot_abapgit.prog.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
- ZABAPGIT_DOT_ABAPGIT
- A
- X
- I
- E
- X
-
-
- -
- R
- Include ZABAPGIT_DOT_ABAPGIT
- 28
-
-
-
-
-
diff --git a/src/zabapgit_folder_logic.prog.abap b/src/zabapgit_folder_logic.prog.abap
deleted file mode 100644
index b31c7dea2..000000000
--- a/src/zabapgit_folder_logic.prog.abap
+++ /dev/null
@@ -1,5 +0,0 @@
-*&---------------------------------------------------------------------*
-*& Include ZABAPGIT_FOLDER_LOGIC
-*&---------------------------------------------------------------------*
-
-* todo, include to be deleted
diff --git a/src/zabapgit_folder_logic.prog.xml b/src/zabapgit_folder_logic.prog.xml
deleted file mode 100644
index 2106cc765..000000000
--- a/src/zabapgit_folder_logic.prog.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
- ZABAPGIT_FOLDER_LOGIC
- A
- X
- I
- E
- X
-
-
- -
- R
- Include ZABAPGIT_FOLDER_LOGIC
- 29
-
-
-
-
-
diff --git a/src/zabapgit_git_helpers.prog.abap b/src/zabapgit_git_helpers.prog.abap
deleted file mode 100644
index 70867a118..000000000
--- a/src/zabapgit_git_helpers.prog.abap
+++ /dev/null
@@ -1,5 +0,0 @@
-*&---------------------------------------------------------------------*
-*& Include ZABAPGIT_GIT_HELPERS
-*&---------------------------------------------------------------------*
-
-* todo, to be deleted later
diff --git a/src/zabapgit_git_helpers.prog.xml b/src/zabapgit_git_helpers.prog.xml
deleted file mode 100644
index 1f1c5039f..000000000
--- a/src/zabapgit_git_helpers.prog.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
- ZABAPGIT_GIT_HELPERS
- A
- X
- I
- E
- X
-
-
- -
- R
- Include ZABAPGIT_GIT_HELPERS
- 28
-
-
-
-
-
diff --git a/src/zabapgit_gui_pages.prog.abap b/src/zabapgit_gui_pages.prog.abap
index b1e5182cc..294f5f1cd 100644
--- a/src/zabapgit_gui_pages.prog.abap
+++ b/src/zabapgit_gui_pages.prog.abap
@@ -9,9 +9,7 @@ INCLUDE zabapgit_html_chunks.
INCLUDE zabapgit_page.
* Utils and helpers
-INCLUDE zabapgit_html_action_utils.
INCLUDE zabapgit_repo_browser_util.
-INCLUDE zabapgit_syntax_highlighter.
* Components and templates
INCLUDE zabapgit_view_repo.
diff --git a/src/zabapgit_html.prog.abap b/src/zabapgit_html.prog.abap
deleted file mode 100644
index f689a8c5a..000000000
--- a/src/zabapgit_html.prog.abap
+++ /dev/null
@@ -1,5 +0,0 @@
-*&---------------------------------------------------------------------*
-*& Include ZABAPGIT_HTML
-*&---------------------------------------------------------------------*
-
-* todo, include to be deleted later
diff --git a/src/zabapgit_html.prog.xml b/src/zabapgit_html.prog.xml
deleted file mode 100644
index 722e3f464..000000000
--- a/src/zabapgit_html.prog.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
- ZABAPGIT_HTML
- A
- X
- I
- E
- X
-
-
- -
- R
- Include ZABAPGIT_HTML
- 21
-
-
-
-
-
diff --git a/src/zabapgit_html_action_utils.prog.abap b/src/zabapgit_html_action_utils.prog.abap
deleted file mode 100644
index e7c757335..000000000
--- a/src/zabapgit_html_action_utils.prog.abap
+++ /dev/null
@@ -1,5 +0,0 @@
-*&---------------------------------------------------------------------*
-*& Include ZABAPGIT_HTML_ACTION_UTILS
-*&---------------------------------------------------------------------*
-
-* todo, include to be deleted
diff --git a/src/zabapgit_html_action_utils.prog.xml b/src/zabapgit_html_action_utils.prog.xml
deleted file mode 100644
index 83227eaaa..000000000
--- a/src/zabapgit_html_action_utils.prog.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
- ZABAPGIT_HTML_ACTION_UTILS
- A
- X
- I
- E
- X
-
-
- -
- R
- Include ZABAPGIT_HTML_ACTION_UTILS
- 34
-
-
-
-
-
diff --git a/src/zabapgit_macros.prog.abap b/src/zabapgit_macros.prog.abap
deleted file mode 100644
index 4c2b39109..000000000
--- a/src/zabapgit_macros.prog.abap
+++ /dev/null
@@ -1,5 +0,0 @@
-*&---------------------------------------------------------------------*
-*& Include ZABAPGIT_MACROS
-*&---------------------------------------------------------------------*
-
-* todo, include to be deleted
diff --git a/src/zabapgit_macros.prog.xml b/src/zabapgit_macros.prog.xml
deleted file mode 100644
index 0859bb7e0..000000000
--- a/src/zabapgit_macros.prog.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
- ZABAPGIT_MACROS
- A
- X
- I
- E
- X
-
-
- -
- R
- Include ZABAPGIT_MACROS
- 23
-
-
-
-
-
diff --git a/src/zabapgit_persistence.prog.abap b/src/zabapgit_persistence.prog.abap
deleted file mode 100644
index d5186b828..000000000
--- a/src/zabapgit_persistence.prog.abap
+++ /dev/null
@@ -1,5 +0,0 @@
-*&---------------------------------------------------------------------*
-*& Include ZABAPGIT_PERSISTENCE
-*&---------------------------------------------------------------------*
-
-* todo, include to be deleted
diff --git a/src/zabapgit_persistence.prog.xml b/src/zabapgit_persistence.prog.xml
deleted file mode 100644
index 9f6f980ea..000000000
--- a/src/zabapgit_persistence.prog.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
- ZABAPGIT_PERSISTENCE
- A
- X
- I
- E
- X
-
-
- -
- R
- Include ZABAPGIT_PERSISTENCE
- 28
-
-
-
-
-
diff --git a/src/zabapgit_persistence_old.prog.abap b/src/zabapgit_persistence_old.prog.abap
deleted file mode 100644
index 5b02505be..000000000
--- a/src/zabapgit_persistence_old.prog.abap
+++ /dev/null
@@ -1,5 +0,0 @@
-*&---------------------------------------------------------------------*
-*& Include ZABAPGIT_PERSISTENCE_OLD
-*&---------------------------------------------------------------------*
-
-* empty
diff --git a/src/zabapgit_persistence_old.prog.xml b/src/zabapgit_persistence_old.prog.xml
deleted file mode 100644
index 670887559..000000000
--- a/src/zabapgit_persistence_old.prog.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
- ZABAPGIT_PERSISTENCE_OLD
- A
- X
- I
- E
- X
-
-
- -
- R
- Include ZABAPGIT_PERSISTENCE_OLD
- 32
-
-
-
-
-
diff --git a/src/zabapgit_requirements.prog.abap b/src/zabapgit_requirements.prog.abap
deleted file mode 100644
index 550fc0502..000000000
--- a/src/zabapgit_requirements.prog.abap
+++ /dev/null
@@ -1,5 +0,0 @@
-*&---------------------------------------------------------------------*
-*& Include zabapgit_requirements
-*&---------------------------------------------------------------------*
-
-* todo, include will be deleted later
diff --git a/src/zabapgit_requirements.prog.xml b/src/zabapgit_requirements.prog.xml
deleted file mode 100644
index 6b4225a08..000000000
--- a/src/zabapgit_requirements.prog.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
- ZABAPGIT_REQUIREMENTS
- A
- X
- S
- D$
- I
- X
- D$S
- X
-
-
- -
- R
- ZABAPGIT_REQUIREMENTS
- 21
-
-
-
-
-
diff --git a/src/zabapgit_sap_package.prog.abap b/src/zabapgit_sap_package.prog.abap
deleted file mode 100644
index be66cbe23..000000000
--- a/src/zabapgit_sap_package.prog.abap
+++ /dev/null
@@ -1,5 +0,0 @@
-*&---------------------------------------------------------------------*
-*& Include ZABAPGIT_SAP_PACKAGE
-*&---------------------------------------------------------------------*
-
-* todo, include to be deleted
diff --git a/src/zabapgit_sap_package.prog.xml b/src/zabapgit_sap_package.prog.xml
deleted file mode 100644
index 4cb21c124..000000000
--- a/src/zabapgit_sap_package.prog.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
- ZABAPGIT_SAP_PACKAGE
- A
- X
- I
- E
- X
-
-
- -
- R
- Include ZABAPGIT_SAP_PACKAGE
- 28
-
-
-
-
-
diff --git a/src/zabapgit_stage.prog.abap b/src/zabapgit_stage.prog.abap
deleted file mode 100644
index 41c8521be..000000000
--- a/src/zabapgit_stage.prog.abap
+++ /dev/null
@@ -1,5 +0,0 @@
-*&---------------------------------------------------------------------*
-*& Include ZABAPGIT_STAGE
-*&---------------------------------------------------------------------*
-
-* todo, include to be deleted
diff --git a/src/zabapgit_stage.prog.xml b/src/zabapgit_stage.prog.xml
deleted file mode 100644
index 454bc358e..000000000
--- a/src/zabapgit_stage.prog.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
- ZABAPGIT_STAGE
- A
- X
- I
- E
- X
-
-
- -
- R
- Include ZABAPGIT_STAGE
- 22
-
-
-
-
-
diff --git a/src/zabapgit_syntax_highlighter.prog.abap b/src/zabapgit_syntax_highlighter.prog.abap
deleted file mode 100644
index 5e6f8f6e2..000000000
--- a/src/zabapgit_syntax_highlighter.prog.abap
+++ /dev/null
@@ -1,5 +0,0 @@
-*&---------------------------------------------------------------------*
-*& Include ZABAPGIT_SYNTAX_HIGHLIGHTER
-*&---------------------------------------------------------------------*
-
-* todo, include to be deleted
diff --git a/src/zabapgit_syntax_highlighter.prog.xml b/src/zabapgit_syntax_highlighter.prog.xml
deleted file mode 100644
index 4f1a01c95..000000000
--- a/src/zabapgit_syntax_highlighter.prog.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
- ZABAPGIT_SYNTAX_HIGHLIGHTER
- A
- X
- I
- E
- X
-
-
- -
- R
- Include ZABAPGIT_SYNTAX_HIGHLIGHTER
- 35
-
-
-
-
-
diff --git a/src/zabapgit_tag.prog.abap b/src/zabapgit_tag.prog.abap
deleted file mode 100644
index ad2bd946e..000000000
--- a/src/zabapgit_tag.prog.abap
+++ /dev/null
@@ -1,3 +0,0 @@
-*&---------------------------------------------------------------------*
-*& Include zabapgit_tag
-*&---------------------------------------------------------------------*
diff --git a/src/zabapgit_tag.prog.xml b/src/zabapgit_tag.prog.xml
deleted file mode 100644
index 90d032d12..000000000
--- a/src/zabapgit_tag.prog.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
- ZABAPGIT_TAG
- A
- X
- S
- D$
- I
- X
- D$S
- X
-
-
- -
- R
- ZABAPGIT_TAG
- 12
-
-
-
-
-
diff --git a/src/zabapgit_xml.prog.abap b/src/zabapgit_xml.prog.abap
deleted file mode 100644
index 5510ae742..000000000
--- a/src/zabapgit_xml.prog.abap
+++ /dev/null
@@ -1,5 +0,0 @@
-*&---------------------------------------------------------------------*
-*& Include ZABAPGIT_XML
-*&---------------------------------------------------------------------*
-
-* todo, include will be deleted later
diff --git a/src/zabapgit_xml.prog.xml b/src/zabapgit_xml.prog.xml
deleted file mode 100644
index 1d7df9bac..000000000
--- a/src/zabapgit_xml.prog.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
- ZABAPGIT_XML
- A
- X
- I
- E
- X
-
-
- -
- R
- Include ZABAPGIT_XML
- 20
-
-
-
-
-
diff --git a/src/zabapgit_zlib.prog.abap b/src/zabapgit_zlib.prog.abap
deleted file mode 100644
index ccb81049d..000000000
--- a/src/zabapgit_zlib.prog.abap
+++ /dev/null
@@ -1,5 +0,0 @@
-*&---------------------------------------------------------------------*
-*& Include ZABAPGIT_ZLIB
-*&---------------------------------------------------------------------*
-
-* todo, lets wait deleting the includes? and delete multiple at a time?
diff --git a/src/zabapgit_zlib.prog.xml b/src/zabapgit_zlib.prog.xml
deleted file mode 100644
index fe4ce5f27..000000000
--- a/src/zabapgit_zlib.prog.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
- ZABAPGIT_ZLIB
- A
- X
- I
- E
- X
-
-
- -
- R
- Include ZABAPGIT_ZLIB
- 21
-
-
-
-
-