diff --git a/lib/LibItsSecurity_Templates.ttcn b/lib/LibItsSecurity_Templates.ttcn
index 1d642b22593c3ca9f9a5dba282646722271e8c03..a8807a3853f51031126becbd0949f3d430ead598 100644
--- a/lib/LibItsSecurity_Templates.ttcn
+++ b/lib/LibItsSecurity_Templates.ttcn
@@ -1014,49 +1014,7 @@ module LibItsSecurity_Templates {
             inlineP2pcdRequest   := *,
             requestedCertificate := *
         } // End of template mw_headerInfo_gn
-        
-        template (omit) HeaderInfo m_headerInfo_inner_pki_request(
-                                                                  in template (value) Psid p_psid := c_its_aid_SCR,
-                                                                  in template (value) Time64 p_generationTime
-                                                                  ) modifies m_ieee1609Dot2_headerInfo := {
-            generationTime       := p_generationTime
-        };
-        
-        template (omit) HeaderInfo m_headerInfo_inner_pki_response(
-                                                                   in template (value) Psid p_psid := c_its_aid_SCR,
-                                                                   in template (value) Time64 p_generationTime
-                                                                   ) modifies m_ieee1609Dot2_headerInfo := {
-            generationTime       := p_generationTime
-        };
-        
-        template (omit) HeaderInfo m_headerInfo_inner_pki_ctl_response(
-                                                                       in template (value) Psid p_psid := c_its_aid_CPOC,
-                                                                       in template (value) Time64 p_generationTime
-                                                                       ) modifies m_ieee1609Dot2_headerInfo := {
-            generationTime       := p_generationTime
-        };
-
-        template (omit) HeaderInfo m_headerInfo_inner_pki_crl_response(
-                                                                       in template (value) Psid p_psid := c_its_aid_CRL,
-                                                                       in template (value) Time64 p_generationTime
-                                                                       ) modifies m_ieee1609Dot2_headerInfo := {
-            generationTime       := p_generationTime
-        };
-
-        template (present) HeaderInfo mw_headerInfo_inner_pki_request(
-                                                                      template (present) Psid p_psid := c_its_aid_SCR,
-                                                                      template (present) Time64 p_generationTime := ?
-                                                                      ) modifies mw_headerInfo_gn := {};
-        
-        template HeaderInfo mw_headerInfo_inner_pki_response(
-                                                             template (present) Psid p_psid := c_its_aid_SCR,
-                                                             template Time64 p_generationTime := *
-                                                             ) modifies mw_ieee1609Dot2_headerInfo := {
-          generationTime       := p_generationTime,
-          expiryTime           := omit,
-          generationLocation   := omit
-        }
-        
+                
     } // End of group headerFields
     
     group signatures {
diff --git a/lib/asn1 b/lib/asn1
index 4f4087b965700c5fc83845dd9088ab7d1435eee0..9bb3364996dac10b37e5fff6992112aa33001a0b 160000
--- a/lib/asn1
+++ b/lib/asn1
@@ -1 +1 @@
-Subproject commit 4f4087b965700c5fc83845dd9088ab7d1435eee0
+Subproject commit 9bb3364996dac10b37e5fff6992112aa33001a0b