diff --git a/lib/EAPBase/include/Module.h b/lib/EAPBase/include/Module.h
index cad0291..6641cf2 100644
--- a/lib/EAPBase/include/Module.h
+++ b/lib/EAPBase/include/Module.h
@@ -32,7 +32,7 @@ namespace eap
     ///
     /// A group of methods all EAP peers must or should implement.
     ///
-    template <class _Tmeth, class _Tcred, class _Tint, class _Tintres> class peer;
+    template <class _Tcred, class _Tint, class _Tintres> class peer;
 }
 
 #pragma once
@@ -652,15 +652,10 @@ namespace eap
     };
 
 
-    template <class _Tmeth, class _Tcred, class _Tint, class _Tintres>
+    template <class _Tcred, class _Tint, class _Tintres>
     class peer : public module
     {
     public:
-        ///
-        /// Method configuration data type
-        ///
-        typedef _Tmeth config_method_type;
-
         ///
         /// Credentials data type
         ///
diff --git a/lib/EAPBase/include/Session.h b/lib/EAPBase/include/Session.h
index 513a7de..f5c883c 100644
--- a/lib/EAPBase/include/Session.h
+++ b/lib/EAPBase/include/Session.h
@@ -23,7 +23,7 @@ namespace eap
     ///
     /// EAP session
     ///
-    template <class _Tmeth, class _Tcred, class _Tint, class _Tintres> class session;
+    template <class _Tcred, class _Tint, class _Tintres> class session;
 }
 
 #pragma once
@@ -42,15 +42,10 @@ extern "C" {
 
 namespace eap
 {
-    template <class _Tmeth, class _Tcred, class _Tint, class _Tintres>
+    template <class _Tcred, class _Tint, class _Tintres>
     class session
     {
     public:
-        ///
-        /// Method configuration data type
-        ///
-        typedef _Tmeth config_method_type;
-
         ///
         /// Credentials data type
         ///
diff --git a/lib/EAPBase_UI/include/Module.h b/lib/EAPBase_UI/include/Module.h
index 2984c3c..26d246c 100644
--- a/lib/EAPBase_UI/include/Module.h
+++ b/lib/EAPBase_UI/include/Module.h
@@ -25,7 +25,7 @@ namespace eap
     ///
     /// A group of methods all EAP UI peers must or should implement.
     ///
-    template <class _Tmeth, class _Tcred, class _Tint, class _Tintres> class peer_ui;
+    template <class _Tcred, class _Tint, class _Tintres> class peer_ui;
 }
 
 #pragma once
@@ -35,15 +35,10 @@ namespace eap
 
 namespace eap
 {
-    template <class _Tmeth, class _Tcred, class _Tint, class _Tintres>
+    template <class _Tcred, class _Tint, class _Tintres>
     class peer_ui : public module
     {
     public:
-        ///
-        /// Method configuration data type
-        ///
-        typedef _Tmeth config_method_type;
-
         ///
         /// Credentials data type
         ///
diff --git a/lib/TLS/include/Session.h b/lib/TLS/include/Session.h
index e537182..704ea91 100644
--- a/lib/TLS/include/Session.h
+++ b/lib/TLS/include/Session.h
@@ -60,7 +60,7 @@ namespace eap
     };
 
 
-    class session_tls : public session<config_method_tls, credentials_tls, bool, bool>
+    class session_tls : public session<credentials_tls, bool, bool>
     {
     public:
         ///
diff --git a/lib/TLS/src/Session.cpp b/lib/TLS/src/Session.cpp
index 3b93f87..6316cca 100644
--- a/lib/TLS/src/Session.cpp
+++ b/lib/TLS/src/Session.cpp
@@ -30,7 +30,7 @@ using namespace winstd;
 
 eap::session_tls::session_tls(_In_ module *mod) :
     m_phase(phase_handshake_start),
-    session<config_method_tls, credentials_tls, bool, bool>(mod)
+    session<credentials_tls, bool, bool>(mod)
 {
     m_packet_req.m_code  = (EapCode)0;
     m_packet_req.m_id    = 0;
@@ -48,7 +48,7 @@ eap::session_tls::session_tls(_In_ module *mod) :
 eap::session_tls::session_tls(_In_ const session_tls &other) :
     m_phase(other.m_phase),
     m_session_id(other.m_session_id),
-    session<config_method_tls, credentials_tls, bool, bool>(other)
+    session<credentials_tls, bool, bool>(other)
 {
     m_packet_req.m_code  = other.m_packet_req.m_code ;
     m_packet_req.m_id    = other.m_packet_req.m_id   ;
@@ -68,7 +68,7 @@ eap::session_tls::session_tls(_In_ const session_tls &other) :
 eap::session_tls::session_tls(_Inout_ session_tls &&other) :
     m_phase(std::move(other.m_phase)),
     m_session_id(std::move(other.m_session_id)),
-    session<config_method_tls, credentials_tls, bool, bool>(std::move(other))
+    session<credentials_tls, bool, bool>(std::move(other))
 {
     m_packet_req.m_code  = std::move(other.m_packet_req.m_code );
     m_packet_req.m_id    = std::move(other.m_packet_req.m_id   );
@@ -95,7 +95,7 @@ eap::session_tls::~session_tls()
 eap::session_tls& eap::session_tls::operator=(_In_ const session_tls &other)
 {
     if (this != &other) {
-        (session<config_method_tls, credentials_tls, bool, bool>&)*this = other;
+        (session<credentials_tls, bool, bool>&)*this = other;
         m_phase              = other.m_phase;
 
         m_packet_req.m_code  = other.m_packet_req.m_code ;
@@ -121,7 +121,7 @@ eap::session_tls& eap::session_tls::operator=(_In_ const session_tls &other)
 eap::session_tls& eap::session_tls::operator=(_Inout_ session_tls &&other)
 {
     if (this != &other) {
-        (session<config_method_tls, credentials_tls, bool, bool>&)*this = std::move(other);
+        (session<credentials_tls, bool, bool>&)*this = std::move(other);
         m_phase              = std::move(other.m_phase);
 
         m_packet_req.m_code  = std::move(other.m_packet_req.m_code );
@@ -156,7 +156,7 @@ bool eap::session_tls::begin(
         return false;
     }
 
-    return session<config_method_tls, credentials_tls, bool, bool>::begin(dwFlags, pAttributeArray, hTokenImpersonateUser, dwMaxSendPacketSize, ppEapError);
+    return session<credentials_tls, bool, bool>::begin(dwFlags, pAttributeArray, hTokenImpersonateUser, dwMaxSendPacketSize, ppEapError);
 }
 
 
diff --git a/lib/TTLS/include/Module.h b/lib/TTLS/include/Module.h
index f2b05c6..a454d3a 100644
--- a/lib/TTLS/include/Module.h
+++ b/lib/TTLS/include/Module.h
@@ -35,7 +35,7 @@ namespace eap
 
 namespace eap
 {
-    class peer_ttls : public peer<config_method_ttls, credentials_ttls, bool, bool>
+    class peer_ttls : public peer<credentials_ttls, bool, bool>
     {
     public:
         ///
diff --git a/lib/TTLS/include/Session.h b/lib/TTLS/include/Session.h
index b00621a..c27f087 100644
--- a/lib/TTLS/include/Session.h
+++ b/lib/TTLS/include/Session.h
@@ -49,7 +49,7 @@ namespace eap
     };
 
 
-    class session_ttls : public session<config_method_ttls, credentials_ttls, bool, bool>
+    class session_ttls : public session<credentials_ttls, bool, bool>
     {
     public:
         ///
diff --git a/lib/TTLS/src/Module.cpp b/lib/TTLS/src/Module.cpp
index fdeddde..9a603a9 100644
--- a/lib/TTLS/src/Module.cpp
+++ b/lib/TTLS/src/Module.cpp
@@ -28,7 +28,7 @@ using namespace winstd;
 // eap::peer_ttls
 //////////////////////////////////////////////////////////////////////
 
-eap::peer_ttls::peer_ttls() : peer<config_method_ttls, credentials_ttls, bool, bool>(eap_type_ttls)
+eap::peer_ttls::peer_ttls() : peer<credentials_ttls, bool, bool>(eap_type_ttls)
 {
 }
 
diff --git a/lib/TTLS/src/Session.cpp b/lib/TTLS/src/Session.cpp
index e702e10..68fe4ed 100644
--- a/lib/TTLS/src/Session.cpp
+++ b/lib/TTLS/src/Session.cpp
@@ -30,21 +30,21 @@ using namespace winstd;
 
 eap::session_ttls::session_ttls(_In_ module *mod) :
     m_version(version_0),
-    session<config_method_ttls, credentials_ttls, bool, bool>(mod)
+    session<credentials_ttls, bool, bool>(mod)
 {
 }
 
 
 eap::session_ttls::session_ttls(_In_ const session_ttls &other) :
     m_version(other.m_version),
-    session<config_method_ttls, credentials_ttls, bool, bool>(other)
+    session<credentials_ttls, bool, bool>(other)
 {
 }
 
 
 eap::session_ttls::session_ttls(_Inout_ session_ttls &&other) :
     m_version(std::move(other.m_version)),
-    session<config_method_ttls, credentials_ttls, bool, bool>(std::move(other))
+    session<credentials_ttls, bool, bool>(std::move(other))
 {
 }
 
@@ -52,7 +52,7 @@ eap::session_ttls::session_ttls(_Inout_ session_ttls &&other) :
 eap::session_ttls& eap::session_ttls::operator=(_In_ const session_ttls &other)
 {
     if (this != &other) {
-        (session<config_method_ttls, credentials_ttls, bool, bool>&)*this = other;
+        (session<credentials_ttls, bool, bool>&)*this = other;
         m_version = other.m_version;
     }
 
@@ -63,7 +63,7 @@ eap::session_ttls& eap::session_ttls::operator=(_In_ const session_ttls &other)
 eap::session_ttls& eap::session_ttls::operator=(_Inout_ session_ttls &&other)
 {
     if (this != &other) {
-        (session<config_method_ttls, credentials_ttls, bool, bool>&)*this = std::move(other);
+        (session<credentials_ttls, bool, bool>&)*this = std::move(other);
         m_version = std::move(other.m_version);
     }
 
diff --git a/lib/TTLS_UI/include/Module.h b/lib/TTLS_UI/include/Module.h
index f37eb5e..846236e 100644
--- a/lib/TTLS_UI/include/Module.h
+++ b/lib/TTLS_UI/include/Module.h
@@ -35,7 +35,7 @@ namespace eap
 
 namespace eap
 {
-    class peer_ttls_ui : public peer_ui<eap::config_method_ttls, eap::credentials_ttls, bool, bool>
+    class peer_ttls_ui : public peer_ui<credentials_ttls, bool, bool>
     {
     public:
         ///
diff --git a/lib/TTLS_UI/src/Module.cpp b/lib/TTLS_UI/src/Module.cpp
index 536af7c..bcd798d 100644
--- a/lib/TTLS_UI/src/Module.cpp
+++ b/lib/TTLS_UI/src/Module.cpp
@@ -25,7 +25,7 @@
 // eap::peer_ttls_ui
 //////////////////////////////////////////////////////////////////////
 
-eap::peer_ttls_ui::peer_ttls_ui() : peer_ui<eap::config_method_ttls, eap::credentials_ttls, bool, bool>(winstd::eap_type_ttls)
+eap::peer_ttls_ui::peer_ttls_ui() : peer_ui<eap::credentials_ttls, bool, bool>(winstd::eap_type_ttls)
 {
 }