diff --git a/src/objects/zcl_abapgit_object_devc.clas.abap b/src/objects/zcl_abapgit_object_devc.clas.abap
index 797f18bc9..bcaf5b390 100644
--- a/src/objects/zcl_abapgit_object_devc.clas.abap
+++ b/src/objects/zcl_abapgit_object_devc.clas.abap
@@ -36,7 +36,7 @@ ENDCLASS.
 
 
 
-CLASS zcl_abapgit_object_devc IMPLEMENTATION.
+CLASS ZCL_ABAPGIT_OBJECT_DEVC IMPLEMENTATION.
 
 
   METHOD constructor.
@@ -392,14 +392,15 @@ CLASS zcl_abapgit_object_devc IMPLEMENTATION.
     " the hierarchy before.
     CLEAR ls_package_data-parentcl.
 
+* Fields not set:
+* korrflag
+* dlvunit
+* parentcl
     ls_data_sign-ctext            = abap_true.
-*    ls_data_sign-korrflag         = abap_true.
     ls_data_sign-as4user          = abap_true.
     ls_data_sign-pdevclass        = abap_true.
-*    ls_data_sign-dlvunit          = abap_true.
     ls_data_sign-comp_posid       = abap_true.
     ls_data_sign-component        = abap_true.
-*    ls_data_sign-parentcl         = abap_true. " No parent package change here
     ls_data_sign-perminher        = abap_true.
     ls_data_sign-intfprefx        = abap_true.
     ls_data_sign-packtype         = abap_true.
@@ -559,6 +560,11 @@ CLASS zcl_abapgit_object_devc IMPLEMENTATION.
   ENDMETHOD.
 
 
+  METHOD zif_abapgit_object~is_active.
+    rv_active = is_active( ).
+  ENDMETHOD.
+
+
   METHOD zif_abapgit_object~is_locked.
 
     DATA: lv_object TYPE eqegraarg.
@@ -704,9 +710,4 @@ CLASS zcl_abapgit_object_devc IMPLEMENTATION.
       io_xml->add( iv_name = 'PERMISSION' ig_data = lt_usage_data ).
     ENDIF.
   ENDMETHOD.
-
-
-  METHOD zif_abapgit_object~is_active.
-    rv_active = is_active( ).
-  ENDMETHOD.
 ENDCLASS.
diff --git a/src/objects/zcl_abapgit_object_enhs_badi_d.clas.abap b/src/objects/zcl_abapgit_object_enhs_badi_d.clas.abap
index 0798e3270..e8d3e501c 100644
--- a/src/objects/zcl_abapgit_object_enhs_badi_d.clas.abap
+++ b/src/objects/zcl_abapgit_object_enhs_badi_d.clas.abap
@@ -3,9 +3,14 @@ CLASS zcl_abapgit_object_enhs_badi_d DEFINITION PUBLIC.
   PUBLIC SECTION.
     INTERFACES: zif_abapgit_object_enhs.
 
+  PROTECTED SECTION.
+  PRIVATE SECTION.
 ENDCLASS.
 
-CLASS zcl_abapgit_object_enhs_badi_d IMPLEMENTATION.
+
+
+CLASS ZCL_ABAPGIT_OBJECT_ENHS_BADI_D IMPLEMENTATION.
+
 
   METHOD zif_abapgit_object_enhs~deserialize.
 
@@ -13,7 +18,6 @@ CLASS zcl_abapgit_object_enhs_badi_d IMPLEMENTATION.
           lt_enh_badi        TYPE enh_badi_data_it,
           lo_badidef_tool    TYPE REF TO cl_enh_tool_badi_def,
           lv_enh_shorttext   TYPE string,
-*          lv_package         LIKE iv_package,
           li_enh_object      TYPE REF TO if_enh_object,
           li_enh_object_docu TYPE REF TO if_enh_object_docu,
           lv_text            TYPE string,
@@ -30,8 +34,6 @@ CLASS zcl_abapgit_object_enhs_badi_d IMPLEMENTATION.
     io_xml->read( EXPORTING iv_name = 'SHORTTEXT'
                   CHANGING  cg_data = lv_enh_shorttext ).
 
-*    lv_package = iv_package.
-
     li_enh_object ?= ii_enh_spot_tool.
     li_enh_object_docu ?= ii_enh_spot_tool.
 
@@ -55,6 +57,7 @@ CLASS zcl_abapgit_object_enhs_badi_d IMPLEMENTATION.
 
   ENDMETHOD.
 
+
   METHOD zif_abapgit_object_enhs~serialize.
 
     DATA: lv_spot_name       TYPE enhspotname,
@@ -87,5 +90,4 @@ CLASS zcl_abapgit_object_enhs_badi_d IMPLEMENTATION.
                  iv_name = 'BADI_DATA' ).
 
   ENDMETHOD.
-
 ENDCLASS.
diff --git a/src/objects/zcl_abapgit_object_ensc.clas.abap b/src/objects/zcl_abapgit_object_ensc.clas.abap
index 527f25ebf..e8ed23e07 100644
--- a/src/objects/zcl_abapgit_object_ensc.clas.abap
+++ b/src/objects/zcl_abapgit_object_ensc.clas.abap
@@ -3,6 +3,8 @@ CLASS zcl_abapgit_object_ensc DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje
     INTERFACES zif_abapgit_object.
     ALIASES mo_files FOR zif_abapgit_object~mo_files.
 
+  PROTECTED SECTION.
+  PRIVATE SECTION.
 ENDCLASS.
 
 
@@ -187,8 +189,6 @@ CLASS ZCL_ABAPGIT_OBJECT_ENSC IMPLEMENTATION.
         lo_spot_ref ?= li_spot_ref.
 
         lv_enh_shtext = li_spot_ref->if_enh_object_docu~get_shorttext( ).
-        "find parent = composite enhancement (ENSC)
-*        lv_parent = cl_r3standard_persistence=>enh_find_parent_composite( lv_spot_name ).
         "find subsequent enhancement spots
         lt_enh_spots = lo_spot_ref->if_enh_spot_composite~get_enh_spot_childs( ).
         "find subsequent composite enhancement spots
diff --git a/src/objects/zcl_abapgit_object_form.clas.abap b/src/objects/zcl_abapgit_object_form.clas.abap
index 24d16a53c..b0470f2f5 100644
--- a/src/objects/zcl_abapgit_object_form.clas.abap
+++ b/src/objects/zcl_abapgit_object_form.clas.abap
@@ -414,7 +414,6 @@ CLASS ZCL_ABAPGIT_OBJECT_FORM IMPLEMENTATION.
     DATA: ls_form_data              TYPE tys_form_data.
     DATA: lt_text_header            TYPE tyt_text_header.
     DATA: lt_lines                  TYPE tyt_lines.
-*    DATA: lo_xml                    TYPE REF TO zcl_abapgit_xml_output.
     DATA: lv_form_found             TYPE flag.
     FIELD-SYMBOLS: <ls_text_header> LIKE LINE OF lt_text_header.
 
@@ -423,7 +422,6 @@ CLASS ZCL_ABAPGIT_OBJECT_FORM IMPLEMENTATION.
     LOOP AT lt_text_header ASSIGNING <ls_text_header>.
       CLEAR lt_lines.
       CLEAR ls_form_data.
-*      FREE lo_xml.
 
       _read_form( EXPORTING is_text_header = <ls_text_header>
                   IMPORTING ev_form_found = lv_form_found
diff --git a/src/objects/zcl_abapgit_object_wdyn.clas.abap b/src/objects/zcl_abapgit_object_wdyn.clas.abap
index 10e9557e3..9e7d27b1b 100644
--- a/src/objects/zcl_abapgit_object_wdyn.clas.abap
+++ b/src/objects/zcl_abapgit_object_wdyn.clas.abap
@@ -4,6 +4,7 @@ CLASS zcl_abapgit_object_wdyn DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje
     INTERFACES zif_abapgit_object.
     ALIASES mo_files FOR zif_abapgit_object~mo_files.
 
+  PROTECTED SECTION.
   PRIVATE SECTION.
 
     DATA:
@@ -68,7 +69,7 @@ ENDCLASS.
 
 
 
-CLASS zcl_abapgit_object_wdyn IMPLEMENTATION.
+CLASS ZCL_ABAPGIT_OBJECT_WDYN IMPLEMENTATION.
 
 
   METHOD add_fm_exception.
@@ -748,8 +749,6 @@ CLASS zcl_abapgit_object_wdyn IMPLEMENTATION.
     io_xml->read( EXPORTING iv_name  = 'SOURCES'
                   CHANGING cg_data = mt_sources ).
 
-*    tadir_insert( iv_package ).
-
     ls_component-comp_metadata-definition-author = sy-uname.
     ls_component-comp_metadata-definition-createdon = sy-datum.
     recover_definition( is_definition = ls_component-comp_metadata
@@ -795,6 +794,16 @@ CLASS zcl_abapgit_object_wdyn IMPLEMENTATION.
   ENDMETHOD.
 
 
+  METHOD zif_abapgit_object~is_active.
+    rv_active = is_active( ).
+  ENDMETHOD.
+
+
+  METHOD zif_abapgit_object~is_locked.
+    rv_is_locked = abap_false.
+  ENDMETHOD.
+
+
   METHOD zif_abapgit_object~jump.
 
     CALL FUNCTION 'RS_TOOL_ACCESS'
@@ -822,13 +831,4 @@ CLASS zcl_abapgit_object_wdyn IMPLEMENTATION.
                  iv_name = 'SOURCES' ).
 
   ENDMETHOD.
-
-  METHOD zif_abapgit_object~is_locked.
-    rv_is_locked = abap_false.
-  ENDMETHOD.
-
-
-  METHOD zif_abapgit_object~is_active.
-    rv_active = is_active( ).
-  ENDMETHOD.
 ENDCLASS.
diff --git a/src/objects/zcl_abapgit_object_webi.clas.abap b/src/objects/zcl_abapgit_object_webi.clas.abap
index b2848516f..9d6abfa38 100644
--- a/src/objects/zcl_abapgit_object_webi.clas.abap
+++ b/src/objects/zcl_abapgit_object_webi.clas.abap
@@ -3,6 +3,7 @@ CLASS zcl_abapgit_object_webi DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje
   PUBLIC SECTION.
     INTERFACES zif_abapgit_object.
 
+  PROTECTED SECTION.
   PRIVATE SECTION.
     TYPES: BEGIN OF ty_webi,
              veptext         TYPE veptext,
@@ -48,7 +49,7 @@ ENDCLASS.
 
 
 
-CLASS zcl_abapgit_object_webi IMPLEMENTATION.
+CLASS ZCL_ABAPGIT_OBJECT_WEBI IMPLEMENTATION.
 
 
   METHOD handle_endpoint.
@@ -160,7 +161,6 @@ CLASS zcl_abapgit_object_webi IMPLEMENTATION.
           WHERE function = <ls_function>-function.
         li_fault = li_function->create_fault( <ls_fault>-fault ).
         li_fault->set_name_mapped_to( <ls_fault>-mappedname ).
-*        li_fault->set_description( <ls_fault>-description_id ).
         li_fault->set_detail( <ls_fault>-detail ).
       ENDLOOP.
 
@@ -381,6 +381,16 @@ CLASS zcl_abapgit_object_webi IMPLEMENTATION.
   ENDMETHOD.
 
 
+  METHOD zif_abapgit_object~is_active.
+    rv_active = is_active( ).
+  ENDMETHOD.
+
+
+  METHOD zif_abapgit_object~is_locked.
+    rv_is_locked = abap_false.
+  ENDMETHOD.
+
+
   METHOD zif_abapgit_object~jump.
 
     CALL FUNCTION 'RS_TOOL_ACCESS'
@@ -464,14 +474,4 @@ CLASS zcl_abapgit_object_webi IMPLEMENTATION.
                  ig_data = ls_webi ).
 
   ENDMETHOD.
-
-  METHOD zif_abapgit_object~is_locked.
-    rv_is_locked = abap_false.
-  ENDMETHOD.
-
-
-  METHOD zif_abapgit_object~is_active.
-    rv_active = is_active( ).
-  ENDMETHOD.
 ENDCLASS.
-
diff --git a/src/objects/zcl_abapgit_objects_activation.clas.abap b/src/objects/zcl_abapgit_objects_activation.clas.abap
index de39e5c2e..0d9ea18d0 100644
--- a/src/objects/zcl_abapgit_objects_activation.clas.abap
+++ b/src/objects/zcl_abapgit_objects_activation.clas.abap
@@ -227,11 +227,6 @@ CLASS ZCL_ABAPGIT_OBJECTS_ACTIVATION IMPLEMENTATION.
           zcx_abapgit_exception=>raise( 'Error from RS_INACTIVE_OBJECTS_IN_OBJECT' ).
         ENDIF.
 
-*        IF iv_type = 'CLAS'.
-*          fix_class_methods( EXPORTING iv_obj_name = lv_obj_name
-*                             CHANGING ct_objects = lt_objects ).
-*        ENDIF.
-
         LOOP AT lt_objects ASSIGNING <ls_object>.
           <ls_object>-delet_flag = iv_delete.
         ENDLOOP.