diff --git a/src/#usi#exception_ddic/#usi#exception_ddic.pinf.xml b/src/#usi#exception_ddic/#usi#exception_ddic.pinf.xml
deleted file mode 100644
index 8bdcb91..0000000
--- a/src/#usi#exception_ddic/#usi#exception_ddic.pinf.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<abapGit version="v1.0.0" serializer="LCL_OBJECT_PINF" serializer_version="v1.0.0">
- <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
-  <asx:values>
-   <PINF>
-    <ATTRIBUTES>
-     <INTF_NAME>/USI/EXCEPTION_DDIC</INTF_NAME>
-     <DESCRIPT>Full access (Internal)</DESCRIPT>
-     <ACL_FLAG>X</ACL_FLAG>
-    </ATTRIBUTES>
-    <ELEMENTS>
-     <SCOMELDTLN>
-      <INTF_NAME>/USI/EXCEPTION_DDIC</INTF_NAME>
-      <ELEM_TYPE>DTEL</ELEM_TYPE>
-      <ELEM_KEY>/USI/EXCEPTION_CLASSNAME</ELEM_KEY>
-     </SCOMELDTLN>
-     <SCOMELDTLN>
-      <INTF_NAME>/USI/EXCEPTION_DDIC</INTF_NAME>
-      <ELEM_TYPE>DTEL</ELEM_TYPE>
-      <ELEM_KEY>/USI/EXCEPTION_TEXT_GETTER</ELEM_KEY>
-     </SCOMELDTLN>
-     <SCOMELDTLN>
-      <INTF_NAME>/USI/EXCEPTION_DDIC</INTF_NAME>
-      <ELEM_TYPE>TABL</ELEM_TYPE>
-      <ELEM_KEY>/USI/EXCEPT_TEXT</ELEM_KEY>
-     </SCOMELDTLN>
-    </ELEMENTS>
-   </PINF>
-  </asx:values>
- </asx:abap>
-</abapGit>
diff --git a/src/#usi#exception_ddic/package.devc.xml b/src/#usi#exception_ddic/package.devc.xml
index 9f822c0..f9bac4f 100644
--- a/src/#usi#exception_ddic/package.devc.xml
+++ b/src/#usi#exception_ddic/package.devc.xml
@@ -6,7 +6,6 @@
     <CTEXT>DDIC-Objects</CTEXT>
     <COMP_POSID>BC-ABA-LA</COMP_POSID>
     <COMPONENT>HLB0100065</COMPONENT>
-    <SRV_CHECK>X</SRV_CHECK>
    </DEVC>
   </asx:values>
  </asx:abap>
diff --git a/src/#usi#exception_demo/package.devc.xml b/src/#usi#exception_demo/package.devc.xml
index 6b85b5e..41db050 100644
--- a/src/#usi#exception_demo/package.devc.xml
+++ b/src/#usi#exception_demo/package.devc.xml
@@ -6,22 +6,7 @@
     <CTEXT>Demo package</CTEXT>
     <COMP_POSID>BC-ABA-LA</COMP_POSID>
     <COMPONENT>HLB0100065</COMPONENT>
-    <SRV_CHECK>X</SRV_CHECK>
    </DEVC>
-   <PERMISSION>
-    <SCOMPPDTLN>
-     <INTF_NAME>/USI/AUTH_MAIN_P</INTF_NAME>
-     <ERR_SEVER>NONE</ERR_SEVER>
-    </SCOMPPDTLN>
-    <SCOMPPDTLN>
-     <INTF_NAME>/USI/EXCEPTION_MAIN</INTF_NAME>
-     <ERR_SEVER>NONE</ERR_SEVER>
-    </SCOMPPDTLN>
-    <SCOMPPDTLN>
-     <INTF_NAME>/USI/EXCEPTION_TEXT_GETTER</INTF_NAME>
-     <ERR_SEVER>NONE</ERR_SEVER>
-    </SCOMPPDTLN>
-   </PERMISSION>
   </asx:values>
  </asx:abap>
 </abapGit>
diff --git a/src/#usi#exception_main/#usi#exception_main.pinf.xml b/src/#usi#exception_main/#usi#exception_main.pinf.xml
deleted file mode 100644
index 7591504..0000000
--- a/src/#usi#exception_main/#usi#exception_main.pinf.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<abapGit version="v1.0.0" serializer="LCL_OBJECT_PINF" serializer_version="v1.0.0">
- <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
-  <asx:values>
-   <PINF>
-    <ATTRIBUTES>
-     <INTF_NAME>/USI/EXCEPTION_MAIN</INTF_NAME>
-     <DESCRIPT>Full access (Internal)</DESCRIPT>
-     <ACL_FLAG>X</ACL_FLAG>
-    </ATTRIBUTES>
-    <ELEMENTS>
-     <SCOMELDTLN>
-      <INTF_NAME>/USI/EXCEPTION_MAIN</INTF_NAME>
-      <ELEM_TYPE>CLAS</ELEM_TYPE>
-      <ELEM_KEY>/USI/CX_EXCEPTION</ELEM_KEY>
-     </SCOMELDTLN>
-     <SCOMELDTLN>
-      <INTF_NAME>/USI/EXCEPTION_MAIN</INTF_NAME>
-      <ELEM_TYPE>MSAG</ELEM_TYPE>
-      <ELEM_KEY>/USI/EXCEPTION</ELEM_KEY>
-     </SCOMELDTLN>
-    </ELEMENTS>
-   </PINF>
-  </asx:values>
- </asx:abap>
-</abapGit>
diff --git a/src/#usi#exception_main/#usi#exception_main_reuse.pinf.xml b/src/#usi#exception_main/#usi#exception_main_reuse.pinf.xml
deleted file mode 100644
index 9e4e11d..0000000
--- a/src/#usi#exception_main/#usi#exception_main_reuse.pinf.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<abapGit version="v1.0.0" serializer="LCL_OBJECT_PINF" serializer_version="v1.0.0">
- <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
-  <asx:values>
-   <PINF>
-    <ATTRIBUTES>
-     <INTF_NAME>/USI/EXCEPTION_MAIN_REUSE</INTF_NAME>
-     <DESCRIPT>Public components for external reuse</DESCRIPT>
-     <ACL_FLAG>X</ACL_FLAG>
-    </ATTRIBUTES>
-    <ELEMENTS>
-     <SCOMELDTLN>
-      <INTF_NAME>/USI/EXCEPTION_MAIN_REUSE</INTF_NAME>
-      <ELEM_TYPE>CLAS</ELEM_TYPE>
-      <ELEM_KEY>/USI/CX_EXCEPTION</ELEM_KEY>
-     </SCOMELDTLN>
-     <SCOMELDTLN>
-      <INTF_NAME>/USI/EXCEPTION_MAIN_REUSE</INTF_NAME>
-      <ELEM_TYPE>INTF</ELEM_TYPE>
-      <ELEM_KEY>/USI/IF_EXCEPTION_DETAILS</ELEM_KEY>
-     </SCOMELDTLN>
-    </ELEMENTS>
-   </PINF>
-  </asx:values>
- </asx:abap>
-</abapGit>
diff --git a/src/#usi#exception_main/package.devc.xml b/src/#usi#exception_main/package.devc.xml
index 1e2808f..b343206 100644
--- a/src/#usi#exception_main/package.devc.xml
+++ b/src/#usi#exception_main/package.devc.xml
@@ -6,14 +6,7 @@
     <CTEXT>Exception handling</CTEXT>
     <COMP_POSID>BC-ABA-LA</COMP_POSID>
     <COMPONENT>HLB0100065</COMPONENT>
-    <SRV_CHECK>X</SRV_CHECK>
    </DEVC>
-   <PERMISSION>
-    <SCOMPPDTLN>
-     <INTF_NAME>/USI/EXCEPTION_TEXT_GETTER</INTF_NAME>
-     <ERR_SEVER>NONE</ERR_SEVER>
-    </SCOMPPDTLN>
-   </PERMISSION>
   </asx:values>
  </asx:abap>
 </abapGit>
diff --git a/src/#usi#exception_reuse.pinf.xml b/src/#usi#exception_reuse.pinf.xml
deleted file mode 100644
index c314c58..0000000
--- a/src/#usi#exception_reuse.pinf.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<abapGit version="v1.0.0" serializer="LCL_OBJECT_PINF" serializer_version="v1.0.0">
- <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
-  <asx:values>
-   <PINF>
-    <ATTRIBUTES>
-     <INTF_NAME>/USI/EXCEPTION_REUSE</INTF_NAME>
-     <DESCRIPT>Public components for external reuse</DESCRIPT>
-    </ATTRIBUTES>
-    <ELEMENTS>
-     <SCOMELDTLN>
-      <INTF_NAME>/USI/EXCEPTION_REUSE</INTF_NAME>
-      <ELEM_TYPE>PINF</ELEM_TYPE>
-      <ELEM_KEY>/USI/EXCEPTION_MAIN_REUSE</ELEM_KEY>
-     </SCOMELDTLN>
-     <SCOMELDTLN>
-      <INTF_NAME>/USI/EXCEPTION_REUSE</INTF_NAME>
-      <ELEM_TYPE>PINF</ELEM_TYPE>
-      <ELEM_KEY>/USI/EXCEPTION_TEXT_GET_REUSE</ELEM_KEY>
-     </SCOMELDTLN>
-    </ELEMENTS>
-   </PINF>
-  </asx:values>
- </asx:abap>
-</abapGit>
diff --git a/src/#usi#exception_text_getter/#usi#exception_text_get_reuse.pinf.xml b/src/#usi#exception_text_getter/#usi#exception_text_get_reuse.pinf.xml
deleted file mode 100644
index a148f25..0000000
--- a/src/#usi#exception_text_getter/#usi#exception_text_get_reuse.pinf.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<abapGit version="v1.0.0" serializer="LCL_OBJECT_PINF" serializer_version="v1.0.0">
- <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
-  <asx:values>
-   <PINF>
-    <ATTRIBUTES>
-     <INTF_NAME>/USI/EXCEPTION_TEXT_GET_REUSE</INTF_NAME>
-     <DESCRIPT>Public components for external reuse</DESCRIPT>
-     <ACL_FLAG>X</ACL_FLAG>
-    </ATTRIBUTES>
-    <ELEMENTS>
-     <SCOMELDTLN>
-      <INTF_NAME>/USI/EXCEPTION_TEXT_GET_REUSE</INTF_NAME>
-      <ELEM_TYPE>CLAS</ELEM_TYPE>
-      <ELEM_KEY>/USI/CL_EXCEPTION_TEXT_GETTER</ELEM_KEY>
-     </SCOMELDTLN>
-     <SCOMELDTLN>
-      <INTF_NAME>/USI/EXCEPTION_TEXT_GET_REUSE</INTF_NAME>
-      <ELEM_TYPE>INTF</ELEM_TYPE>
-      <ELEM_KEY>/USI/IF_EXCEPTION_TEXT_GETTER</ELEM_KEY>
-     </SCOMELDTLN>
-    </ELEMENTS>
-   </PINF>
-  </asx:values>
- </asx:abap>
-</abapGit>
diff --git a/src/#usi#exception_text_getter/#usi#exception_text_getter.pinf.xml b/src/#usi#exception_text_getter/#usi#exception_text_getter.pinf.xml
deleted file mode 100644
index 54c3e7c..0000000
--- a/src/#usi#exception_text_getter/#usi#exception_text_getter.pinf.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<abapGit version="v1.0.0" serializer="LCL_OBJECT_PINF" serializer_version="v1.0.0">
- <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
-  <asx:values>
-   <PINF>
-    <ATTRIBUTES>
-     <INTF_NAME>/USI/EXCEPTION_TEXT_GETTER</INTF_NAME>
-     <DESCRIPT>Full access (Internal)</DESCRIPT>
-     <ACL_FLAG>X</ACL_FLAG>
-    </ATTRIBUTES>
-    <ELEMENTS>
-     <SCOMELDTLN>
-      <INTF_NAME>/USI/EXCEPTION_TEXT_GETTER</INTF_NAME>
-      <ELEM_TYPE>CLAS</ELEM_TYPE>
-      <ELEM_KEY>/USI/CL_EXCEPTION_TEXT_GETTER</ELEM_KEY>
-     </SCOMELDTLN>
-     <SCOMELDTLN>
-      <INTF_NAME>/USI/EXCEPTION_TEXT_GETTER</INTF_NAME>
-      <ELEM_TYPE>INTF</ELEM_TYPE>
-      <ELEM_KEY>/USI/IF_EXCEPTION_TEXT_GETTER</ELEM_KEY>
-     </SCOMELDTLN>
-    </ELEMENTS>
-   </PINF>
-  </asx:values>
- </asx:abap>
-</abapGit>
diff --git a/src/#usi#exception_text_getter/package.devc.xml b/src/#usi#exception_text_getter/package.devc.xml
index fd15584..3c4fbe9 100644
--- a/src/#usi#exception_text_getter/package.devc.xml
+++ b/src/#usi#exception_text_getter/package.devc.xml
@@ -6,26 +6,7 @@
     <CTEXT>Exception text getter</CTEXT>
     <COMP_POSID>BC-ABA-LA</COMP_POSID>
     <COMPONENT>HLB0100065</COMPONENT>
-    <SRV_CHECK>X</SRV_CHECK>
    </DEVC>
-   <PERMISSION>
-    <SCOMPPDTLN>
-     <INTF_NAME>/USI/EXCEPTION_DDIC</INTF_NAME>
-     <ERR_SEVER>NONE</ERR_SEVER>
-    </SCOMPPDTLN>
-    <SCOMPPDTLN>
-     <INTF_NAME>/USI/EXCEPTION_MAIN</INTF_NAME>
-     <ERR_SEVER>NONE</ERR_SEVER>
-    </SCOMPPDTLN>
-    <SCOMPPDTLN>
-     <INTF_NAME>/USI/EXCEPTION_MAIN_REUSE</INTF_NAME>
-     <ERR_SEVER>NONE</ERR_SEVER>
-    </SCOMPPDTLN>
-    <SCOMPPDTLN>
-     <INTF_NAME>SCOS_PIF</INTF_NAME>
-     <ERR_SEVER>NONE</ERR_SEVER>
-    </SCOMPPDTLN>
-   </PERMISSION>
   </asx:values>
  </asx:abap>
 </abapGit>
diff --git a/src/package.devc.xml b/src/package.devc.xml
index 58dd2c5..ec8dcd9 100644
--- a/src/package.devc.xml
+++ b/src/package.devc.xml
@@ -8,18 +8,7 @@
     <COMPONENT>HLB0100065</COMPONENT>
     <RESTRICTED>X</RESTRICTED>
     <MAINPACK>X</MAINPACK>
-    <SRV_CHECK>X</SRV_CHECK>
    </DEVC>
-   <PERMISSION>
-    <SCOMPPDTLN>
-     <INTF_NAME>/USI/AUTH_MAIN_P</INTF_NAME>
-     <ERR_SEVER>NONE</ERR_SEVER>
-    </SCOMPPDTLN>
-    <SCOMPPDTLN>
-     <INTF_NAME>SCOS_PIF</INTF_NAME>
-     <ERR_SEVER>NONE</ERR_SEVER>
-    </SCOMPPDTLN>
-   </PERMISSION>
   </asx:values>
  </asx:abap>
 </abapGit>