diff --git a/abaplint.json b/abaplint.json
index 2c9e71e..3d76aa9 100644
--- a/abaplint.json
+++ b/abaplint.json
@@ -162,6 +162,7 @@
     },
     "line_only_punc": false,
     "obsolete_statement": {
+      "refresh": true,
       "move": true
     },
     "start_at_tab": false,
@@ -177,7 +178,6 @@
     "method_parameter_names": false,
     "inline_data_old_versions": true,
     "local_variable_names": false,
-    "class_attribute_names": false,
-    "commented_code": true
+    "class_attribute_names": false
   }
 }
diff --git a/src/not_cloud/zcl_excel_converter.clas.abap b/src/not_cloud/zcl_excel_converter.clas.abap
index 3d986aa..b751dc0 100644
--- a/src/not_cloud/zcl_excel_converter.clas.abap
+++ b/src/not_cloud/zcl_excel_converter.clas.abap
@@ -925,7 +925,7 @@ CLASS zcl_excel_converter IMPLEMENTATION.
         RAISE EXCEPTION TYPE zcx_excel.
       ENDIF.
     ELSE.
-      REFRESH wt_fieldcatalog.
+      CLEAR wt_fieldcatalog.
       GET REFERENCE OF it_table INTO wo_table.
     ENDIF.
   ENDMETHOD.
@@ -1338,8 +1338,8 @@ CLASS zcl_excel_converter IMPLEMENTATION.
 
     ASSIGN wo_data->* TO <fs_tab> .
 
-    REFRESH: wt_sort_values,
-             wt_subtotal_rows.
+    CLEAR: wt_sort_values,
+           wt_subtotal_rows.
 
     DESCRIBE TABLE wt_fieldcatalog LINES l_cells.
     DESCRIBE TABLE <fs_tab> LINES l_count.
diff --git a/src/not_cloud/zcl_excel_converter_alv.clas.abap b/src/not_cloud/zcl_excel_converter_alv.clas.abap
index 39e9365..c44a423 100644
--- a/src/not_cloud/zcl_excel_converter_alv.clas.abap
+++ b/src/not_cloud/zcl_excel_converter_alv.clas.abap
@@ -408,7 +408,7 @@ CLASS zcl_excel_converter_alv IMPLEMENTATION.
                    <fs_trange> TYPE STANDARD TABLE.
 
     IF ws_option-filter = abap_false.
-      REFRESH et_filter.
+      CLEAR et_filter.
       RETURN.
     ENDIF.
 
@@ -423,7 +423,7 @@ CLASS zcl_excel_converter_alv IMPLEMENTATION.
         ASSIGN COMPONENT ls_filt-fieldname OF STRUCTURE <fs_stab> TO <fs>.
         IF sy-subrc = 0.
           IF l_line = 1.
-            REFRESH lt_components_tab.
+            CLEAR lt_components_tab.
             ls_components-name   = 'SIGN'.
             lo_addit            ?= cl_abap_typedescr=>describe_by_data( ls_filt-sign ).
             ls_components-type   = lo_addit           .
@@ -455,7 +455,7 @@ CLASS zcl_excel_converter_alv IMPLEMENTATION.
             ASSIGN lo_trange->* TO <fs_trange>.
             ASSIGN lo_srange->* TO <fs_srange>.
           ENDIF.
-          REFRESH <fs_trange>.
+          CLEAR <fs_trange>.
           ASSIGN COMPONENT 'SIGN'   OF STRUCTURE  <fs_srange> TO <fs1>.
           <fs1> = ls_filt-sign.
           ASSIGN COMPONENT 'OPTION' OF STRUCTURE  <fs_srange> TO <fs1>.
@@ -478,7 +478,7 @@ CLASS zcl_excel_converter_alv IMPLEMENTATION.
       ENDLOOP.
       IF ws_option-filter = abap_undefined.
         <fs_tab> = <fs_ltab>.
-        REFRESH <fs_ltab>.
+        CLEAR <fs_ltab>.
       ENDIF.
     ENDLOOP.
 
diff --git a/src/not_cloud/zcl_excel_converter_result_wd.clas.abap b/src/not_cloud/zcl_excel_converter_result_wd.clas.abap
index c7a475c..16b94ec 100644
--- a/src/not_cloud/zcl_excel_converter_result_wd.clas.abap
+++ b/src/not_cloud/zcl_excel_converter_result_wd.clas.abap
@@ -88,7 +88,7 @@ CLASS zcl_excel_converter_result_wd IMPLEMENTATION.
                    <fs_filter> TYPE salv_wd_s_filter_rule_ref.
 
     LOOP AT  wt_fields ASSIGNING <fs_fields>.
-      REFRESH lt_filters.
+      CLEAR lt_filters.
       lt_filters    = <fs_fields>-r_field->if_salv_wd_filter~get_filter_rules( ) .
       LOOP AT lt_filters ASSIGNING <fs_filter>.
         ls_filt-fieldname = <fs_fields>-fieldname.
diff --git a/src/not_cloud/zcl_excel_converter_salv_table.clas.abap b/src/not_cloud/zcl_excel_converter_salv_table.clas.abap
index 8f25663..cbc5433 100644
--- a/src/not_cloud/zcl_excel_converter_salv_table.clas.abap
+++ b/src/not_cloud/zcl_excel_converter_salv_table.clas.abap
@@ -63,9 +63,7 @@ CLASS zcl_excel_converter_salv_table IMPLEMENTATION.
     lo_display              = io_salv->get_display_settings( ) .
     lo_functional           = io_salv->get_functional_settings( ) .
 
-    REFRESH: wt_fcat,
-             wt_sort,
-             wt_filt.
+    CLEAR: wt_fcat, wt_sort, wt_filt.
 
     lv_intercept_data_active = is_intercept_data_active( ).
 
diff --git a/src/not_cloud/zcl_excel_ole.clas.abap b/src/not_cloud/zcl_excel_ole.clas.abap
index 0c1a7b3..f32c37e 100644
--- a/src/not_cloud/zcl_excel_ole.clas.abap
+++ b/src/not_cloud/zcl_excel_ole.clas.abap
@@ -878,8 +878,8 @@ CLASS zcl_excel_ole IMPLEMENTATION.
 * SESSION 4: WRITE TO EXCEL
 *--------------------------------------------------------------------*
 
-    CLEAR: wa_tcurx.
-    REFRESH: lt_tcurx.
+    CLEAR wa_tcurx.
+    CLEAR lt_tcurx.
 
 *   if spreadsheet dun have proxy yet
 
@@ -1094,9 +1094,7 @@ CLASS zcl_excel_ole IMPLEMENTATION.
         contents = contents
         no_flush = no_flush.
 
-    REFRESH:
-       ranges,
-       contents.
+    CLEAR: ranges, contents.
 
     rows = rowmax + li_commentary_rows + 1.
 
@@ -1948,7 +1946,7 @@ CLASS zcl_excel_ole IMPLEMENTATION.
         EXPORTING
           formattable = lt_format
           no_flush    = no_flush.
-      REFRESH: lt_format.
+      CLEAR lt_format.
     ENDIF.
 *--------------------------------------------------------------------*
     CALL METHOD lo_spreadsheet->screen_update
diff --git a/src/zcl_excel_common.clas.abap b/src/zcl_excel_common.clas.abap
index 16fecb5..440c725 100644
--- a/src/zcl_excel_common.clas.abap
+++ b/src/zcl_excel_common.clas.abap
@@ -1562,8 +1562,6 @@ CLASS zcl_excel_common IMPLEMENTATION.
           lt_components TYPE abap_component_tab,
           ls_components TYPE abap_componentdescr.
 
-    REFRESH rt_components.
-
     lo_struct ?= is_component-type.
     lt_components = lo_struct->get_components( ).
 
diff --git a/src/zcl_excel_fill_template.clas.abap b/src/zcl_excel_fill_template.clas.abap
index 6f8fff2..e4e1701 100644
--- a/src/zcl_excel_fill_template.clas.abap
+++ b/src/zcl_excel_fill_template.clas.abap
@@ -312,8 +312,7 @@ CLASS zcl_excel_fill_template IMPLEMENTATION.
 *      replace variables of current range with data
       LOOP AT ct_cells ASSIGNING <ls_cell>.
 
-
-        REFRESH lt_matches.
+        CLEAR lt_matches.
 
         lv_cell_value = <ls_cell>-cell_value.
 
@@ -388,7 +387,7 @@ CLASS zcl_excel_fill_template IMPLEMENTATION.
         cv_diff         = lv_initial_diff  ).
 
 
-    REFRESH  lo_worksheet->sheet_content.
+    CLEAR lo_worksheet->sheet_content.
 
     LOOP AT lt_sheet_cells ASSIGNING <ls_sheet_cell>.
       INSERT <ls_sheet_cell> INTO TABLE lo_worksheet->sheet_content.
diff --git a/src/zcl_excel_worksheet.clas.abap b/src/zcl_excel_worksheet.clas.abap
index 8bc12e4..b0f5373 100644
--- a/src/zcl_excel_worksheet.clas.abap
+++ b/src/zcl_excel_worksheet.clas.abap
@@ -2669,7 +2669,7 @@ CLASS zcl_excel_worksheet IMPLEMENTATION.
 *--------------------------------------------------------------------*
 *now we are ready for handle the table data
 *--------------------------------------------------------------------*
-            REFRESH et_table.
+            CLEAR et_table.
 *--------------------------------------------------------------------*
 * Handle each Row until end on right side
 *--------------------------------------------------------------------*
diff --git a/src/zcl_excel_writer_csv.clas.abap b/src/zcl_excel_writer_csv.clas.abap
index 4c28c72..5c1bd82 100644
--- a/src/zcl_excel_writer_csv.clas.abap
+++ b/src/zcl_excel_writer_csv.clas.abap
@@ -93,7 +93,6 @@ CLASS zcl_excel_writer_csv IMPLEMENTATION.
     FIELD-SYMBOLS: <fs_sheet_content> TYPE zexcel_s_cell_data.
 
 * --- Retrieve supported cell format
-    REFRESH lt_format.
     SELECT * INTO CORRESPONDING FIELDS OF TABLE lt_format
       FROM seocompodf
      WHERE clsname  = 'ZCL_EXCEL_STYLE_NUMBER_FORMAT'