diff --git a/src/02/z2ui5_cl_http_handler.clas.abap b/src/02/z2ui5_cl_http_handler.clas.abap
index 54101f5b..31a573a7 100644
--- a/src/02/z2ui5_cl_http_handler.clas.abap
+++ b/src/02/z2ui5_cl_http_handler.clas.abap
@@ -184,27 +184,17 @@ CLASS z2ui5_cl_http_handler IMPLEMENTATION.
 
     "transform cookie to header based contextid handling
     IF attributes-stateful-switched = abap_true.
-*      server->set_session_stateful( stateful = attributes-stateful-active ).
       mo_server->set_session_stateful( attributes-stateful-active  ).
       IF mo_server->get_header_field( 'sap-contextid-accept' ) = 'header'.
-*        server->response->get_cookie(
-*          EXPORTING
-*            name  = 'sap-contextid'
-*          IMPORTING
-*            value = DATA(lv_contextid) ).
         DATA(lv_contextid) = mo_server->get_response_cookie( 'sap-contextid' ).
         IF lv_contextid IS NOT INITIAL.
-*          server->response->delete_cookie( 'sap-contextid' ).
           mo_server->delete_response_cookie( 'sap-contextid' ).
-*          server->response->set_header_field( name = 'sap-contextid' value = lv_contextid ).
           mo_server->set_header_field( n = 'sap-contextid' v = lv_contextid ).
         ENDIF.
       ENDIF.
     ELSE.
-*      lv_contextid = server->request->get_header_field( 'sap-contextid' ).
       lv_contextid = mo_server->get_header_field( 'sap-contextid' ).
       IF lv_contextid IS NOT INITIAL.
-*        server->response->set_header_field( name = 'sap-contextid' value = lv_contextid ).
         mo_server->set_header_field( n = 'sap-contextid' v = lv_contextid ).
       ENDIF.
     ENDIF.