diff --git a/src/03/z2ui5_cl_cc_focus.clas.abap b/src/03/z2ui5_cl_cc_focus.clas.abap
index 26401d4d..ae5efd8a 100644
--- a/src/03/z2ui5_cl_cc_focus.clas.abap
+++ b/src/03/z2ui5_cl_cc_focus.clas.abap
@@ -5,8 +5,6 @@ CLASS z2ui5_cl_cc_focus DEFINITION
 
   PUBLIC SECTION.
 
-    INTERFACES z2ui5_if_cc.
-
     METHODS constructor
       IMPORTING
         view TYPE REF TO z2ui5_cl_xml_view optional.
@@ -109,9 +107,4 @@ CLASS Z2UI5_CL_CC_FOCUS IMPLEMENTATION.
     result = mo_view->_generic( ns = `html` name = `script` )->_cc_plain_xml( get_js( ) )->get_parent( ).
 
   ENDMETHOD.
-
-
-  METHOD z2ui5_if_cc~get_js.
-    result = get_js( ).
-  ENDMETHOD.
 ENDCLASS.
diff --git a/src/03/z2ui5_cl_cc_timer.clas.abap b/src/03/z2ui5_cl_cc_timer.clas.abap
index 211ed6fb..c937747f 100644
--- a/src/03/z2ui5_cl_cc_timer.clas.abap
+++ b/src/03/z2ui5_cl_cc_timer.clas.abap
@@ -4,7 +4,6 @@ CLASS z2ui5_cl_cc_timer DEFINITION
   CREATE PUBLIC .
 
   PUBLIC SECTION.
-    INTERFACES z2ui5_if_cc.
 
     METHODS constructor
       IMPORTING
@@ -105,8 +104,4 @@ CLASS z2ui5_cl_cc_timer IMPLEMENTATION.
 
   ENDMETHOD.
 
-  METHOD z2ui5_if_cc~get_js.
-    get_js( ).
-  ENDMETHOD.
-
 ENDCLASS.
diff --git a/src/03/z2ui5_cl_cc_title.clas.abap b/src/03/z2ui5_cl_cc_title.clas.abap
index 2c8bb41d..6b3a4b40 100644
--- a/src/03/z2ui5_cl_cc_title.clas.abap
+++ b/src/03/z2ui5_cl_cc_title.clas.abap
@@ -5,8 +5,6 @@ CLASS z2ui5_cl_cc_title DEFINITION
 
   PUBLIC SECTION.
 
-    INTERFACES z2ui5_if_cc.
-
     METHODS constructor
       IMPORTING
         view TYPE REF TO z2ui5_cl_xml_view optional.
@@ -94,8 +92,4 @@ CLASS Z2UI5_CL_CC_TITLE IMPLEMENTATION.
 
   ENDMETHOD.
 
-
-  METHOD z2ui5_if_cc~get_js.
-    result = get_js( ).
-  ENDMETHOD.
 ENDCLASS.
diff --git a/src/03/z2ui5_if_cc.intf.abap b/src/03/z2ui5_if_cc.intf.abap
deleted file mode 100644
index 3506f146..00000000
--- a/src/03/z2ui5_if_cc.intf.abap
+++ /dev/null
@@ -1,10 +0,0 @@
-INTERFACE z2ui5_if_cc
-  PUBLIC .
-
-  TYPES ty_t_cc TYPE STANDARD TABLE OF REF TO z2ui5_if_cc WITH DEFAULT KEY.
-
-  METHODS get_js
-    RETURNING
-      VALUE(result) TYPE string.
-
-ENDINTERFACE.
diff --git a/src/03/z2ui5_if_cc.intf.xml b/src/03/z2ui5_if_cc.intf.xml
deleted file mode 100644
index 1fa1c930..00000000
--- a/src/03/z2ui5_if_cc.intf.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<abapGit version="v1.0.0" serializer="LCL_OBJECT_INTF" serializer_version="v1.0.0">
- <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
-  <asx:values>
-   <VSEOINTERF>
-    <CLSNAME>Z2UI5_IF_CC</CLSNAME>
-    <LANGU>E</LANGU>
-    <DESCRIPT>Custom Control</DESCRIPT>
-    <EXPOSURE>2</EXPOSURE>
-    <STATE>1</STATE>
-    <UNICODE>X</UNICODE>
-   </VSEOINTERF>
-  </asx:values>
- </asx:abap>
-</abapGit>
diff --git a/src/z2ui5_cl_fw_http_handler.clas.abap b/src/z2ui5_cl_fw_http_handler.clas.abap
index 9060d98c..61b76e0a 100644
--- a/src/z2ui5_cl_fw_http_handler.clas.abap
+++ b/src/z2ui5_cl_fw_http_handler.clas.abap
@@ -17,7 +17,6 @@ CLASS z2ui5_cl_fw_http_handler DEFINITION
         check_logging             TYPE abap_bool                        OPTIONAL
         custom_js                 TYPE string                           OPTIONAL
         custom_js_oneventfrontend TYPE string                           OPTIONAL
-        t_load_cc                 TYPE z2ui5_if_cc=>ty_t_cc             OPTIONAL
           PREFERRED PARAMETER t_config
       RETURNING
         VALUE(r_result)           TYPE string.
@@ -46,16 +45,17 @@ CLASS z2ui5_cl_fw_http_handler IMPLEMENTATION.
           (  n = `data-sap-ui-compatVersion` v = `edge` ) ).
     ENDIF.
 
-    DATA(lt_load_cc) = t_load_cc.
-    IF t_load_cc IS INITIAL.
-      INSERT NEW z2ui5_cl_cc_timer( ) INTO TABLE lt_load_cc.
-      INSERT NEW z2ui5_cl_cc_focus( ) INTO TABLE lt_load_cc.
-      INSERT NEW z2ui5_cl_cc_title( ) INTO TABLE lt_load_cc.
-    ENDIF.
-    DATA(lv_cc) = ``.
-    LOOP AT lt_load_cc INTO DATA(li_cc).
-      lv_cc = lv_cc && li_cc->get_js( ) && |\n|.
-    ENDLOOP.
+*    DATA(lt_load_cc) = t_load_cc.
+*    IF t_load_cc IS INITIAL.
+    data(lv_add_js) =
+        z2ui5_cl_cc_timer=>get_js( ) &&
+        z2ui5_cl_cc_focus=>get_js( ) &&
+        z2ui5_cl_cc_title=>get_js( ) &&
+        custom_js.
+*    DATA(lv_cc) = ``.
+*    LOOP AT lt_load_cc INTO DATA(li_cc).
+*      lv_cc = lv_cc && li_cc->get_js( ) && |\n|.
+*    ENDLOOP.
 
 
     IF content_security_policy IS NOT SUPPLIED.
@@ -562,10 +562,11 @@ CLASS z2ui5_cl_fw_http_handler IMPLEMENTATION.
                            `sap.z2ui5.Helper.DateAbapTimestampToDate = (sTimestamp => new sap.gantt.misc.Format.abapTimestampToDate(sTimestamp));` && |\n| &&
                            `sap.z2ui5.Helper.DateAbapDateToDateObject = (d => new Date(d.slice(0,4), (d[4]+d[5])-1, d[6]+d[7]));` && |\n| &&
                            `sap.z2ui5.Helper.DateAbapDateTimeToDateObject = ((d,t = '000000') => new Date(d.slice(0,4), (d[4]+d[5])-1, d[6]+d[7],t.slice(0,2),t.slice(2,4),t.slice(4,6)));` && |\n| &&
-                           custom_js && |\n|  &&
-                           z2ui5_cl_cc_timer=>get_js( ) && |\n|  &&
+*                           custom_js && |\n|  &&
+*                           z2ui5_cl_cc_timer=>get_js( ) && |\n|  &&
 *                           VALUE string( FOR z2ui5_cl_cc_timer=>get_js( ) && |\n|  &&
-                           lv_cc && |\n|  &&
+*                           lv_cc && |\n|  &&
+                           lv_add_js && |\n| &&
                            ` });` && |\n| &&
                            `</script>` && |\n| &&
                            `<abc/></body></html>`.