diff --git a/src/demos/zdemo_calendar.prog.abap b/src/demos/zdemo_calendar.prog.abap
index 90450af..53df60e 100644
--- a/src/demos/zdemo_calendar.prog.abap
+++ b/src/demos/zdemo_calendar.prog.abap
@@ -23,7 +23,6 @@
 
 REPORT zdemo_calendar.
 
-TYPE-POOLS: abap.
 CONSTANTS: gc_save_file_name TYPE string VALUE 'Calendar.xlsx'.
 INCLUDE zdemo_excel_outputopt_incl.
 INCLUDE zdemo_calendar_classes.
@@ -34,7 +33,7 @@ PARAMETERS: p_from TYPE dfrom,
             p_to   TYPE dto.
 
 SELECTION-SCREEN BEGIN OF BLOCK orientation WITH FRAME TITLE orient.
-  PARAMETERS: p_portr TYPE flag RADIOBUTTON GROUP orie,
+PARAMETERS: p_portr TYPE flag RADIOBUTTON GROUP orie,
               p_lands TYPE flag RADIOBUTTON GROUP orie DEFAULT 'X'.
 SELECTION-SCREEN END OF BLOCK orientation.
 
diff --git a/src/demos/zdemo_excel11.prog.abap b/src/demos/zdemo_excel11.prog.abap
index 11459fb..52215d3 100644
--- a/src/demos/zdemo_excel11.prog.abap
+++ b/src/demos/zdemo_excel11.prog.abap
@@ -8,8 +8,6 @@
 
 REPORT zdemo_excel11.
 
-TYPE-POOLS: abap.
-
 DATA: central_search     TYPE bapibus1006_central_search,
       addressdata_search TYPE bapibus1006_addr_search,
       others_search      TYPE bapibus1006_other_data.
diff --git a/src/demos/zdemo_excel15.prog.abap b/src/demos/zdemo_excel15.prog.abap
index 0c16995..f5c0709 100644
--- a/src/demos/zdemo_excel15.prog.abap
+++ b/src/demos/zdemo_excel15.prog.abap
@@ -10,8 +10,6 @@
 
 REPORT zdemo_excel15.
 
-TYPE-POOLS: abap.
-
 TYPES:
   BEGIN OF t_demo_excel15,
     input TYPE string,
diff --git a/src/demos/zdemo_excel19.prog.abap b/src/demos/zdemo_excel19.prog.abap
index 34bd240..523c6ed 100644
--- a/src/demos/zdemo_excel19.prog.abap
+++ b/src/demos/zdemo_excel19.prog.abap
@@ -8,8 +8,6 @@
 
 REPORT zdemo_excel19.
 
-TYPE-POOLS: abap.
-
 DATA: lo_excel     TYPE REF TO zcl_excel,
       lo_worksheet TYPE REF TO zcl_excel_worksheet.
 
diff --git a/src/demos/zdemo_excel23.prog.abap b/src/demos/zdemo_excel23.prog.abap
index 5a09ff4..9716d62 100644
--- a/src/demos/zdemo_excel23.prog.abap
+++ b/src/demos/zdemo_excel23.prog.abap
@@ -8,8 +8,6 @@
 
 REPORT zdemo_excel23.
 
-TYPE-POOLS: abap.
-
 DATA: lo_excel     TYPE REF TO zcl_excel,
       lo_worksheet TYPE REF TO zcl_excel_worksheet,
       lo_hyperlink TYPE REF TO zcl_excel_hyperlink.
diff --git a/src/demos/zdemo_excel24.prog.abap b/src/demos/zdemo_excel24.prog.abap
index 44f81db..c82e2a0 100644
--- a/src/demos/zdemo_excel24.prog.abap
+++ b/src/demos/zdemo_excel24.prog.abap
@@ -8,8 +8,6 @@
 
 REPORT zdemo_excel24.
 
-TYPE-POOLS: abap.
-
 DATA: lo_excel     TYPE REF TO zcl_excel,
       lo_worksheet TYPE REF TO zcl_excel_worksheet,
       lo_column    TYPE REF TO zcl_excel_column,
diff --git a/src/demos/zdemo_excel3.prog.abap b/src/demos/zdemo_excel3.prog.abap
index 29ba65c..0cf5560 100644
--- a/src/demos/zdemo_excel3.prog.abap
+++ b/src/demos/zdemo_excel3.prog.abap
@@ -8,8 +8,6 @@
 
 REPORT zdemo_excel3.
 
-TYPE-POOLS: abap.
-
 DATA: lo_excel     TYPE REF TO zcl_excel,
       lo_worksheet TYPE REF TO zcl_excel_worksheet,
       lo_column    TYPE REF TO zcl_excel_column.
diff --git a/src/demos/zdemo_excel33.prog.abap b/src/demos/zdemo_excel33.prog.abap
index fe85bdc..29a8970 100644
--- a/src/demos/zdemo_excel33.prog.abap
+++ b/src/demos/zdemo_excel33.prog.abap
@@ -8,8 +8,6 @@
 
 REPORT zdemo_excel33.
 
-TYPE-POOLS: abap.
-
 DATA: lo_excel      TYPE REF TO zcl_excel,
       lo_worksheet  TYPE REF TO zcl_excel_worksheet,
       lo_converter  TYPE REF TO zcl_excel_converter,
diff --git a/src/demos/zdemo_excel37.prog.abap b/src/demos/zdemo_excel37.prog.abap
index 172c0ee..b9eaf81 100644
--- a/src/demos/zdemo_excel37.prog.abap
+++ b/src/demos/zdemo_excel37.prog.abap
@@ -1,7 +1,5 @@
 REPORT zdemo_excel37.
 
-TYPE-POOLS: vrm.
-
 DATA: excel                 TYPE REF TO zcl_excel,
       reader                TYPE REF TO zif_excel_reader,
       go_error              TYPE REF TO cx_root,
diff --git a/src/demos/zdemo_excel42.prog.abap b/src/demos/zdemo_excel42.prog.abap
index 7482a6c..ebfaada 100644
--- a/src/demos/zdemo_excel42.prog.abap
+++ b/src/demos/zdemo_excel42.prog.abap
@@ -7,7 +7,6 @@
 *&---------------------------------------------------------------------*
 
 REPORT zdemo_excel42.
-TYPE-POOLS: vrm.
 
 DATA: lo_excel      TYPE REF TO zcl_excel,
       lo_worksheet  TYPE REF TO zcl_excel_worksheet,
diff --git a/src/not_cloud/zcl_excel_ole.clas.locals_def.abap b/src/not_cloud/zcl_excel_ole.clas.locals_def.abap
index 9e50658..8a58c35 100644
--- a/src/not_cloud/zcl_excel_ole.clas.locals_def.abap
+++ b/src/not_cloud/zcl_excel_ole.clas.locals_def.abap
@@ -1,8 +1,7 @@
 *"* use this source file for any type of declarations (class
 *"* definitions, interfaces or type declarations) you need for
 *"* components in the private section
-TYPE-POOLS: sydes.
-TYPE-POOLS: slis.
+
 *--------------------------------------------------------------------*
 * CLASS c_oi_proxy_error
 *--------------------------------------------------------------------*
diff --git a/src/zcl_excel_autofilter.clas.abap b/src/zcl_excel_autofilter.clas.abap
index b382fbb..a0ed31f 100644
--- a/src/zcl_excel_autofilter.clas.abap
+++ b/src/zcl_excel_autofilter.clas.abap
@@ -49,7 +49,6 @@ CLASS zcl_excel_autofilter DEFINITION
     METHODS get_values
       RETURNING
         VALUE(rt_filter) TYPE zexcel_t_autofilter_values .
-    TYPE-POOLS abap .
     METHODS is_row_hidden
       IMPORTING
         !iv_row             TYPE zexcel_cell_row
diff --git a/src/zcl_excel_autofilters.clas.abap b/src/zcl_excel_autofilters.clas.abap
index fcd523f..8127dd1 100644
--- a/src/zcl_excel_autofilters.clas.abap
+++ b/src/zcl_excel_autofilters.clas.abap
@@ -6,7 +6,6 @@ CLASS zcl_excel_autofilters DEFINITION
   PUBLIC SECTION.
 *"* public components of class ZCL_EXCEL_AUTOFILTERS
 *"* do not include other source files here!!!
-    TYPE-POOLS abap .
 
     CONSTANTS c_autofilter TYPE string VALUE '_xlnm._FilterDatabase'. "#EC NOTEXT
 
diff --git a/src/zcl_excel_column.clas.abap b/src/zcl_excel_column.clas.abap
index ebf80eb..1f18d49 100644
--- a/src/zcl_excel_column.clas.abap
+++ b/src/zcl_excel_column.clas.abap
@@ -6,7 +6,6 @@ CLASS zcl_excel_column DEFINITION
 *"* public components of class ZCL_EXCEL_COLUMN
 *"* do not include other source files here!!!
   PUBLIC SECTION.
-    TYPE-POOLS abap .
 
     METHODS constructor
       IMPORTING
diff --git a/src/zcl_excel_comment.clas.abap b/src/zcl_excel_comment.clas.abap
index d698bec..d25310e 100644
--- a/src/zcl_excel_comment.clas.abap
+++ b/src/zcl_excel_comment.clas.abap
@@ -4,7 +4,6 @@ CLASS zcl_excel_comment DEFINITION
   CREATE PUBLIC .
 
   PUBLIC SECTION.
-    TYPE-POOLS abap .
 
     METHODS constructor .
     METHODS get_name
diff --git a/src/zcl_excel_common.clas.abap b/src/zcl_excel_common.clas.abap
index c5d3e37..67bb55d 100644
--- a/src/zcl_excel_common.clas.abap
+++ b/src/zcl_excel_common.clas.abap
@@ -133,7 +133,6 @@ CLASS zcl_excel_common DEFINITION
         !ip_value       TYPE t
       RETURNING
         VALUE(ep_value) TYPE zexcel_cell_value .
-    TYPE-POOLS abap .
     TYPES: t_char10 TYPE c LENGTH 10.
     TYPES: t_char255 TYPE c LENGTH 255.
     CLASS-METHODS split_file
diff --git a/src/zcl_excel_converter.clas.abap b/src/zcl_excel_converter.clas.abap
index a462297..3d986aa 100644
--- a/src/zcl_excel_converter.clas.abap
+++ b/src/zcl_excel_converter.clas.abap
@@ -5,7 +5,6 @@ CLASS zcl_excel_converter DEFINITION
 *"* public components of class ZCL_EXCEL_CONVERTER
 *"* do not include other source files here!!!
   PUBLIC SECTION.
-    TYPE-POOLS abap .
 
     CLASS-METHODS class_constructor .
     METHODS ask_option
diff --git a/src/zcl_excel_converter_alv.clas.abap b/src/zcl_excel_converter_alv.clas.abap
index 48ed4cf..39e9365 100644
--- a/src/zcl_excel_converter_alv.clas.abap
+++ b/src/zcl_excel_converter_alv.clas.abap
@@ -6,8 +6,6 @@ CLASS zcl_excel_converter_alv DEFINITION
 *"* public components of class ZCL_EXCEL_CONVERTER_ALV
 *"* do not include other source files here!!!
   PUBLIC SECTION.
-    TYPE-POOLS abap .
-    TYPE-POOLS kkblo .
 
     INTERFACES zif_excel_converter
       ALL METHODS ABSTRACT .
diff --git a/src/zcl_excel_data_validation.clas.abap b/src/zcl_excel_data_validation.clas.abap
index 1d0a171..d826a54 100644
--- a/src/zcl_excel_data_validation.clas.abap
+++ b/src/zcl_excel_data_validation.clas.abap
@@ -6,7 +6,6 @@ CLASS zcl_excel_data_validation DEFINITION
   PUBLIC SECTION.
 *"* public components of class ZCL_EXCEL_DATA_VALIDATION
 *"* do not include other source files here!!!
-    TYPE-POOLS abap .
 
     DATA errorstyle TYPE zexcel_data_val_error_style .
     DATA operator TYPE zexcel_data_val_operator .
diff --git a/src/zcl_excel_data_validations.clas.abap b/src/zcl_excel_data_validations.clas.abap
index d3e99ea..2afd865 100644
--- a/src/zcl_excel_data_validations.clas.abap
+++ b/src/zcl_excel_data_validations.clas.abap
@@ -6,7 +6,6 @@ CLASS zcl_excel_data_validations DEFINITION
 *"* public components of class ZCL_EXCEL_DATA_VALIDATIONS
 *"* do not include other source files here!!!
   PUBLIC SECTION.
-    TYPE-POOLS abap .
 
     METHODS add
       IMPORTING
diff --git a/src/zcl_excel_drawing.clas.abap b/src/zcl_excel_drawing.clas.abap
index 1c579e4..bdf21e4 100644
--- a/src/zcl_excel_drawing.clas.abap
+++ b/src/zcl_excel_drawing.clas.abap
@@ -12,7 +12,6 @@ CLASS zcl_excel_drawing DEFINITION
 *"* do not include other source files here!!!
 *"* protected components of class ZCL_EXCEL_DRAWING
 *"* do not include other source files here!!!
-    TYPE-POOLS abap .
 
     CONSTANTS c_graph_pie TYPE zexcel_graph_type VALUE 1.   "#EC NOTEXT
     CONSTANTS c_graph_line TYPE zexcel_graph_type VALUE 2.  "#EC NOTEXT
diff --git a/src/zcl_excel_hyperlink.clas.abap b/src/zcl_excel_hyperlink.clas.abap
index d4f3f8b..0346557 100644
--- a/src/zcl_excel_hyperlink.clas.abap
+++ b/src/zcl_excel_hyperlink.clas.abap
@@ -6,7 +6,6 @@ CLASS zcl_excel_hyperlink DEFINITION
 *"* public components of class ZCL_EXCEL_HYPERLINK
 *"* do not include other source files here!!!
   PUBLIC SECTION.
-    TYPE-POOLS abap .
 
     CLASS-METHODS create_external_link
       IMPORTING
diff --git a/src/zcl_excel_legacy_palette.clas.abap b/src/zcl_excel_legacy_palette.clas.abap
index 4931604..c9afcde 100644
--- a/src/zcl_excel_legacy_palette.clas.abap
+++ b/src/zcl_excel_legacy_palette.clas.abap
@@ -5,7 +5,6 @@ CLASS zcl_excel_legacy_palette DEFINITION
   PUBLIC SECTION.
 *"* public components of class ZCL_EXCEL_LEGACY_PALETTE
 *"* do not include other source files here!!!
-    TYPE-POOLS abap .
 
     METHODS constructor .
     METHODS is_modified
diff --git a/src/zcl_excel_reader_2007.clas.abap b/src/zcl_excel_reader_2007.clas.abap
index 0906a43..9af4962 100644
--- a/src/zcl_excel_reader_2007.clas.abap
+++ b/src/zcl_excel_reader_2007.clas.abap
@@ -5,7 +5,6 @@ CLASS zcl_excel_reader_2007 DEFINITION
   PUBLIC SECTION.
 *"* public components of class ZCL_EXCEL_READER_2007
 *"* do not include other source files here!!!
-    TYPE-POOLS ixml .
 
     INTERFACES zif_excel_reader .
 
diff --git a/src/zcl_excel_row.clas.abap b/src/zcl_excel_row.clas.abap
index af655b6..6f7606f 100644
--- a/src/zcl_excel_row.clas.abap
+++ b/src/zcl_excel_row.clas.abap
@@ -6,7 +6,6 @@ CLASS zcl_excel_row DEFINITION
 *"* public components of class ZCL_EXCEL_ROW
 *"* do not include other source files here!!!
   PUBLIC SECTION.
-    TYPE-POOLS abap .
 
     METHODS constructor
       IMPORTING
diff --git a/src/zcl_excel_security.clas.abap b/src/zcl_excel_security.clas.abap
index 1d6997d..4823d2a 100644
--- a/src/zcl_excel_security.clas.abap
+++ b/src/zcl_excel_security.clas.abap
@@ -6,7 +6,6 @@ CLASS zcl_excel_security DEFINITION
 *"* public components of class ZCL_EXCEL_SECURITY
 *"* do not include other source files here!!!
   PUBLIC SECTION.
-    TYPE-POOLS abap .
 
     DATA lockrevision TYPE flag .
     DATA lockstructure TYPE flag .
diff --git a/src/zcl_excel_sheet_setup.clas.abap b/src/zcl_excel_sheet_setup.clas.abap
index 1cf7014..86fedd6 100644
--- a/src/zcl_excel_sheet_setup.clas.abap
+++ b/src/zcl_excel_sheet_setup.clas.abap
@@ -6,7 +6,6 @@ CLASS zcl_excel_sheet_setup DEFINITION
   PUBLIC SECTION.
 *"* public components of class ZCL_EXCEL_SHEET_SETUP
 *"* do not include other source files here!!!
-    TYPE-POOLS abap .
 
     DATA black_and_white TYPE flag .
     DATA cell_comments TYPE stringval .
diff --git a/src/zcl_excel_style_alignment.clas.abap b/src/zcl_excel_style_alignment.clas.abap
index 94e39ed..b0a3624 100644
--- a/src/zcl_excel_style_alignment.clas.abap
+++ b/src/zcl_excel_style_alignment.clas.abap
@@ -6,7 +6,6 @@ CLASS zcl_excel_style_alignment DEFINITION
 *"* public components of class ZCL_EXCEL_STYLE_ALIGNMENT
 *"* do not include other source files here!!!
   PUBLIC SECTION.
-    TYPE-POOLS abap .
 
     CONSTANTS c_horizontal_general TYPE zexcel_alignment VALUE 'general'. "#EC NOTEXT
     CONSTANTS c_horizontal_left TYPE zexcel_alignment VALUE 'left'. "#EC NOTEXT
diff --git a/src/zcl_excel_style_fill.clas.abap b/src/zcl_excel_style_fill.clas.abap
index 39c9edc..f20b06d 100644
--- a/src/zcl_excel_style_fill.clas.abap
+++ b/src/zcl_excel_style_fill.clas.abap
@@ -4,7 +4,6 @@ CLASS zcl_excel_style_fill DEFINITION
   CREATE PUBLIC .
 
   PUBLIC SECTION.
-    TYPE-POOLS abap .
 
 *"* public components of class ZCL_EXCEL_STYLE_FILL
 *"* do not include other source files here!!!
diff --git a/src/zcl_excel_style_font.clas.abap b/src/zcl_excel_style_font.clas.abap
index a094389..f5e8827 100644
--- a/src/zcl_excel_style_font.clas.abap
+++ b/src/zcl_excel_style_font.clas.abap
@@ -6,7 +6,6 @@ CLASS zcl_excel_style_font DEFINITION
   PUBLIC SECTION.
 *"* public components of class ZCL_EXCEL_STYLE_FONT
 *"* do not include other source files here!!!
-    TYPE-POOLS abap .
 
     DATA bold TYPE flag .
     DATA color TYPE zexcel_s_style_color .
diff --git a/src/zcl_excel_table.clas.abap b/src/zcl_excel_table.clas.abap
index bfadc9a..6887e3f 100644
--- a/src/zcl_excel_table.clas.abap
+++ b/src/zcl_excel_table.clas.abap
@@ -6,7 +6,6 @@ CLASS zcl_excel_table DEFINITION
 *"* public components of class ZCL_EXCEL_TABLE
 *"* do not include other source files here!!!
   PUBLIC SECTION.
-    TYPE-POOLS abap .
 
     CONSTANTS builtinstyle_dark1 TYPE zexcel_table_style VALUE 'TableStyleDark1'. "#EC NOTEXT
     CONSTANTS builtinstyle_dark2 TYPE zexcel_table_style VALUE 'TableStyleDark2'. "#EC NOTEXT
diff --git a/src/zcl_excel_worksheet.clas.abap b/src/zcl_excel_worksheet.clas.abap
index 58a48fa..d6907ff 100644
--- a/src/zcl_excel_worksheet.clas.abap
+++ b/src/zcl_excel_worksheet.clas.abap
@@ -9,9 +9,6 @@ CLASS zcl_excel_worksheet DEFINITION
 *"* do not include other source files here!!!
 *"* protected components of class ZCL_EXCEL_WORKSHEET
 *"* do not include other source files here!!!
-    TYPE-POOLS abap .
-    TYPE-POOLS slis .
-    TYPE-POOLS soi .
 
     INTERFACES zif_excel_sheet_printsettings .
     INTERFACES zif_excel_sheet_properties .