diff --git a/src/git_platform/zcl_abapgit_pr_enumerator.clas.abap b/src/git_platform/zcl_abapgit_pr_enumerator.clas.abap
index dadea98c5..201cacb0a 100644
--- a/src/git_platform/zcl_abapgit_pr_enumerator.clas.abap
+++ b/src/git_platform/zcl_abapgit_pr_enumerator.clas.abap
@@ -62,7 +62,7 @@ CLASS zcl_abapgit_pr_enumerator IMPLEMENTATION.
     DATA lv_user TYPE string.
     DATA lv_repo TYPE string.
 
-    li_agent = zcl_abapgit_factory=>get_http_agent( ).
+    li_agent = zcl_abapgit_http_agent=>create( ).
 
     FIND ALL OCCURRENCES OF REGEX 'github\.com\/([^\/]+)\/([^\/]+)'
       IN iv_repo_url
diff --git a/src/objects/aff/zcl_abapgit_object_common_aff.clas.testclasses.abap b/src/objects/aff/zcl_abapgit_object_common_aff.clas.testclasses.abap
index 0d46738a8..fb8fefa33 100644
--- a/src/objects/aff/zcl_abapgit_object_common_aff.clas.testclasses.abap
+++ b/src/objects/aff/zcl_abapgit_object_common_aff.clas.testclasses.abap
@@ -228,39 +228,40 @@ CLASS ltcl_aff_settings_deserialize IMPLEMENTATION.
 
     TRY.
         lo_settings_deserialize = lo_cut->create_aff_setting_deserialize( ).
+
+        CALL METHOD lo_settings_deserialize->('IF_AFF_SETTINGS_DESERIALIZE~GET_ABAP_LANGUAGE_VERSION')
+          RECEIVING
+            result = lv_act_setting_abap_lv.
+        cl_abap_unit_assert=>assert_equals( msg = 'Unexpected ABAP language version in settings'
+                                            act = lv_act_setting_abap_lv
+                                            exp = iv_exp_setting_abap_lv ).
+
+        CALL METHOD lo_settings_deserialize->('IF_AFF_SETTINGS_DESERIALIZE~GET_VERSION')
+          RECEIVING
+            result = lv_act_setting_version.
+        cl_abap_unit_assert=>assert_equals( msg = 'Unexpected Version in settings'
+                                            act = lv_act_setting_version
+                                            exp = 'A' ).
+
+        CALL METHOD lo_settings_deserialize->('IF_AFF_SETTINGS_DESERIALIZE~GET_LANGUAGE')
+          RECEIVING
+            result = lv_act_setting_language.
+        cl_abap_unit_assert=>assert_equals( msg = 'Unexpected Language in settings'
+                                            act = lv_act_setting_language
+                                            exp = 'E' ).
+
+        CALL METHOD lo_settings_deserialize->('IF_AFF_SETTINGS_DESERIALIZE~GET_USER')
+          RECEIVING
+            result = lv_act_setting_user.
+        cl_abap_unit_assert=>assert_equals( msg = 'Unexpected User in settings'
+                                            act = lv_act_setting_user
+                                            exp = sy-uname ).
+
       CATCH cx_root.
         " System doesn't support AFF with ABAP language version
         RETURN.
     ENDTRY.
 
-    CALL METHOD lo_settings_deserialize->('IF_AFF_SETTINGS_DESERIALIZE~GET_ABAP_LANGUAGE_VERSION')
-      RECEIVING
-        result = lv_act_setting_abap_lv.
-    cl_abap_unit_assert=>assert_equals( msg = 'Unexpected ABAP language version in settings'
-                                        act = lv_act_setting_abap_lv
-                                        exp = iv_exp_setting_abap_lv ).
-
-    CALL METHOD lo_settings_deserialize->('IF_AFF_SETTINGS_DESERIALIZE~GET_VERSION')
-      RECEIVING
-        result = lv_act_setting_version.
-    cl_abap_unit_assert=>assert_equals( msg = 'Unexpected Version in settings'
-                                        act = lv_act_setting_version
-                                        exp = 'A' ).
-
-    CALL METHOD lo_settings_deserialize->('IF_AFF_SETTINGS_DESERIALIZE~GET_LANGUAGE')
-      RECEIVING
-        result = lv_act_setting_language.
-    cl_abap_unit_assert=>assert_equals( msg = 'Unexpected Language in settings'
-                                        act = lv_act_setting_language
-                                        exp = 'E' ).
-
-    CALL METHOD lo_settings_deserialize->('IF_AFF_SETTINGS_DESERIALIZE~GET_USER')
-      RECEIVING
-        result = lv_act_setting_user.
-    cl_abap_unit_assert=>assert_equals( msg = 'Unexpected User in settings'
-                                        act = lv_act_setting_user
-                                        exp = sy-uname ).
-
   ENDMETHOD.
 
   METHOD abap_language_version_standard.
diff --git a/src/zcl_abapgit_factory.clas.abap b/src/zcl_abapgit_factory.clas.abap
index edab35a26..2742ffb9c 100644
--- a/src/zcl_abapgit_factory.clas.abap
+++ b/src/zcl_abapgit_factory.clas.abap
@@ -18,18 +18,13 @@ CLASS zcl_abapgit_factory DEFINITION
         VALUE(ri_cts_api) TYPE REF TO zif_abapgit_cts_api .
     CLASS-METHODS get_default_transport
       RETURNING
-        VALUE(ri_default_transport) TYPE REF TO zif_abapgit_default_transport
-      RAISING
-        zcx_abapgit_exception.
+        VALUE(ri_default_transport) TYPE REF TO zif_abapgit_default_transport.
     CLASS-METHODS get_environment
       RETURNING
         VALUE(ri_environment) TYPE REF TO zif_abapgit_environment .
     CLASS-METHODS get_longtexts
       RETURNING
         VALUE(ri_longtexts) TYPE REF TO zif_abapgit_longtexts .
-    CLASS-METHODS get_http_agent
-      RETURNING
-        VALUE(ri_http_agent) TYPE REF TO zif_abapgit_http_agent .
     CLASS-METHODS get_lxe_texts
       RETURNING
         VALUE(ri_lxe_texts) TYPE REF TO zif_abapgit_lxe_texts .
@@ -59,7 +54,6 @@ CLASS zcl_abapgit_factory DEFINITION
     CLASS-DATA gi_cts_api TYPE REF TO zif_abapgit_cts_api .
     CLASS-DATA gi_environment TYPE REF TO zif_abapgit_environment .
     CLASS-DATA gi_longtext TYPE REF TO zif_abapgit_longtexts .
-    CLASS-DATA gi_http_agent TYPE REF TO zif_abapgit_http_agent .
     CLASS-DATA gi_lxe_texts TYPE REF TO zif_abapgit_lxe_texts .
     CLASS-DATA gi_sap_namespace TYPE REF TO zif_abapgit_sap_namespace .
     CLASS-DATA gi_sap_report TYPE REF TO zif_abapgit_sap_report.
@@ -111,17 +105,6 @@ CLASS zcl_abapgit_factory IMPLEMENTATION.
   ENDMETHOD.
 
 
-  METHOD get_http_agent.
-
-    IF gi_http_agent IS INITIAL.
-      gi_http_agent = zcl_abapgit_http_agent=>create( ).
-    ENDIF.
-
-    ri_http_agent = gi_http_agent.
-
-  ENDMETHOD.
-
-
   METHOD get_longtexts.
 
     IF gi_longtext IS NOT BOUND.
diff --git a/src/zcl_abapgit_injector.clas.abap b/src/zcl_abapgit_injector.clas.abap
index 2261c7d8c..127b7718b 100644
--- a/src/zcl_abapgit_injector.clas.abap
+++ b/src/zcl_abapgit_injector.clas.abap
@@ -21,9 +21,6 @@ CLASS zcl_abapgit_injector DEFINITION
     CLASS-METHODS set_longtexts
       IMPORTING
         !ii_longtexts TYPE REF TO zif_abapgit_longtexts .
-    CLASS-METHODS set_http_agent
-      IMPORTING
-        !ii_http_agent TYPE REF TO zif_abapgit_http_agent .
     CLASS-METHODS set_lxe_texts
       IMPORTING
         !ii_lxe_texts TYPE REF TO zif_abapgit_lxe_texts .
@@ -68,11 +65,6 @@ CLASS zcl_abapgit_injector IMPLEMENTATION.
   ENDMETHOD.
 
 
-  METHOD set_http_agent.
-    zcl_abapgit_factory=>gi_http_agent = ii_http_agent.
-  ENDMETHOD.
-
-
   METHOD set_longtexts.
     zcl_abapgit_factory=>gi_longtext = ii_longtexts.
   ENDMETHOD.
diff --git a/test/src/zcl_abapgit_gitea.clas.abap b/test/src/zcl_abapgit_gitea.clas.abap
index 70725b0a4..52296b6e6 100644
--- a/test/src/zcl_abapgit_gitea.clas.abap
+++ b/test/src/zcl_abapgit_gitea.clas.abap
@@ -23,7 +23,7 @@ CLASS zcl_abapgit_gitea IMPLEMENTATION.
     DATA lv_url      TYPE string.
 
 
-    li_agent = zcl_abapgit_factory=>get_http_agent( ).
+    li_agent = zcl_abapgit_http_agent=>create( ).
 
     li_agent->global_headers( )->set(
       iv_key = 'Accept'