diff --git a/Contexts/Context.cs b/Contexts/Context.cs
index eb2cc1e..ab74bba 100644
--- a/Contexts/Context.cs
+++ b/Contexts/Context.cs
@@ -59,12 +59,9 @@ namespace NSspi
             if( disposing )
             {
                 this.Credential.Dispose();
+                this.ContextHandle.Dispose();
             }
 
-            // TODO SAFE_CER
-            ContextNativeMethods.DeleteSecurityContext( ref this.ContextHandle.rawHandle );
-
-            this.ContextHandle.Dispose();
 
             this.disposed = true;
         }