diff --git a/src/tpm2_wrap.c b/src/tpm2_wrap.c
index f37f483..3d344ec 100644
--- a/src/tpm2_wrap.c
+++ b/src/tpm2_wrap.c
@@ -609,7 +609,6 @@ int wolfTPM2_StartSession(WOLFTPM2_DEV* dev, WOLFTPM2_SESSION* session,
         return rc;
     }
 
-    session->handle.dev = dev;
     session->handle.hndl = authSesOut.sessionHandle;
     session->nonceTPM = authSesOut.nonceTPM;
 
@@ -661,7 +660,6 @@ int wolfTPM2_CreatePrimaryKey(WOLFTPM2_DEV* dev, WOLFTPM2_KEY* key,
     #endif
         return rc;
     }
-    key->handle.dev  = dev;
     key->handle.hndl = createPriOut.objectHandle;
     key->handle.auth = createPriIn.inSensitive.sensitive.userAuth;
 
@@ -730,7 +728,6 @@ int wolfTPM2_ChangeAuthKey(WOLFTPM2_DEV* dev, WOLFTPM2_KEY* key,
         XMEMSET(&dev->session[0].auth, 0, sizeof(dev->session[0].auth));
         return rc;
     }
-    key->handle.dev  = dev;
     key->handle.hndl = loadOut.objectHandle;
     key->handle.auth = changeIn.newAuth;
 
@@ -791,8 +788,7 @@ int wolfTPM2_CreateKey(WOLFTPM2_DEV* dev, WOLFTPM2_KEYBLOB* keyBlob,
     printf("save\n");
     TPM2_PrintBin(createOut.outPrivate.buffer, createOut.outPrivate.size);
 #endif
-    
-    keyBlob->handle.dev  = dev;
+
     keyBlob->handle.auth = createIn.inSensitive.sensitive.userAuth;
     keyBlob->pub = createOut.outPublic;
     keyBlob->priv = createOut.outPrivate;
@@ -829,7 +825,6 @@ int wolfTPM2_LoadKey(WOLFTPM2_DEV* dev, WOLFTPM2_KEYBLOB* keyBlob,
         XMEMSET(&dev->session[0].auth, 0, sizeof(dev->session[0].auth));
         return rc;
     }
-    keyBlob->handle.dev  = dev;
     keyBlob->handle.hndl = loadOut.objectHandle;
 
 #ifdef DEBUG_WOLFTPM
@@ -885,7 +880,6 @@ int wolfTPM2_LoadPublicKey(WOLFTPM2_DEV* dev, WOLFTPM2_KEY* key,
     #endif
         return rc;
     }
-    key->handle.dev = dev;
     key->handle.hndl = loadExtOut.objectHandle;
     key->pub = loadExtIn.inPublic;
 
@@ -1128,7 +1122,6 @@ int wolfTPM2_ImportPrivateKey(WOLFTPM2_DEV* dev, const WOLFTPM2_KEY* parentKey,
         return rc;
     }
 
-    keyBlob->handle.dev = dev;
     keyBlob->pub = importIn.objectPublic;
     keyBlob->priv = importOut.outPrivate;
 
@@ -1423,7 +1416,6 @@ int wolfTPM2_ReadPublicKey(WOLFTPM2_DEV* dev, WOLFTPM2_KEY* key,
         return rc;
     }
 
-    key->handle.dev = dev;
     key->handle.hndl = readPubIn.objectHandle;
     key->pub = readPubOut.outPublic;
 
@@ -3043,7 +3035,6 @@ int wolfTPM2_LoadSymmetricKey(WOLFTPM2_DEV* dev, WOLFTPM2_KEY* key, int alg,
     /* Load private key */
     rc = TPM2_LoadExternal(&loadExtIn, &loadExtOut);
     if (rc == TPM_RC_SUCCESS) {
-        key->handle.dev = dev;
         key->handle.hndl = loadExtOut.objectHandle;
         key->pub = loadExtIn.inPublic;
 
@@ -3272,7 +3263,6 @@ int wolfTPM2_LoadKeyedHashKey(WOLFTPM2_DEV* dev, WOLFTPM2_KEY* key,
         XMEMSET(&dev->session[0].auth, 0, sizeof(dev->session[0].auth));
         return rc;
     }
-    key->handle.dev  = dev;
     key->handle.hndl = loadOut.objectHandle;
     key->handle.auth = createIn.inSensitive.sensitive.userAuth;
 
@@ -3427,7 +3417,6 @@ int wolfTPM2_UnloadHandles(WOLFTPM2_DEV* dev, word32 handleStart, word32 handleC
         return BAD_FUNC_ARG;
     }
     XMEMSET(&handle, 0, sizeof(handle));
-    handle.dev  = dev;
     handle.auth = dev->session[0].auth;
     for (hndl=handleStart; hndl < handleStart+handleCount; hndl++) {
         handle.hndl = hndl;
diff --git a/wolftpm/tpm2_wrap.h b/wolftpm/tpm2_wrap.h
index df27539..3948141 100644
--- a/wolftpm/tpm2_wrap.h
+++ b/wolftpm/tpm2_wrap.h
@@ -28,25 +28,26 @@
     extern "C" {
 #endif
 
-typedef struct WOLFTPM2_DEV {
-    TPM2_CTX ctx;
-    TPMS_AUTH_COMMAND session[MAX_SESSION_NUM];
-} WOLFTPM2_DEV;
-
 typedef struct WOLFTPM2_HANDLE {
-    WOLFTPM2_DEV*   dev;
     TPM_HANDLE      hndl;
     TPM2B_AUTH      auth;
     TPMT_SYM_DEF    symmetric;
 } WOLFTPM2_HANDLE;
 
 typedef struct WOLFTPM2_SESSION {
+    TPM_ST_T        type;
     WOLFTPM2_HANDLE handle;
     TPM2B_NONCE     nonceTPM;
     TPM2B_DIGEST    salt;
     const char*     bindPassword;
 } WOLFTPM2_SESSION;
 
+typedef struct WOLFTPM2_DEV {
+    TPM2_CTX ctx;
+    TPMS_AUTH_COMMAND session[MAX_SESSION_NUM]; /* TODO: rename ot authCmd for consistency with native naming */
+    WOLFTPM2_SESSION sessions[MAX_SESSION_NUM];
+} WOLFTPM2_DEV;
+
 typedef struct WOLFTPM2_KEY {
     WOLFTPM2_HANDLE   handle;
     TPM2B_PUBLIC      pub;