diff --git a/src/basic_api.cc b/src/basic_api.cc
index 84d50cc..c61de09 100644
--- a/src/basic_api.cc
+++ b/src/basic_api.cc
@@ -113,7 +113,7 @@ JNIEXPORT void JNICALL Java_org_pEp_jniadapter_Engine_keyMistrusted(
 
     if (_ident->fpr == NULL || _ident->fpr[0] == 0) {
         if (_ident->me)
-            ::myself(session, _ident);
+            ::myself(session(), _ident);
         else
             ::update_identity(session(), _ident);
     }
diff --git a/src/org/pEp/jniadapter/AbstractEngine.java b/src/org/pEp/jniadapter/AbstractEngine.java
index e9dc7f1..3c8b35b 100644
--- a/src/org/pEp/jniadapter/AbstractEngine.java
+++ b/src/org/pEp/jniadapter/AbstractEngine.java
@@ -10,43 +10,26 @@ abstract class AbstractEngine implements AutoCloseable {
         System.loadLibrary("pEpJNI");
     }
 
-
     private Sync.MessageToSendCallback messageToSendCallback;
     private Sync.notifyHandshakeCallback notifyHandshakeCallback;
     private Sync.NeedsFastPollCallback needsFastPollCallback;
-    private native void init() throws pEpException;
-    private native void release();
-
-    private long handle;
-
-    final protected long getHandle() {
-        return handle;
-    }
 
     public AbstractEngine() throws pEpException {
         synchronized (AbstractEngine.class) {
-            init();
         }
     }
 
     final public void close() {
         synchronized (AbstractEngine.class){
-            release();
         }
     }
 
     private long keyserverThread;
     private long keyserverQueue;
 
-    private long syncThread;
-    private long syncQueue;
-
     public native void startKeyserverLookup();
     public native void stopKeyserverLookup();
 
-    public native void startSync();
-    public native void stopSync();
-
     public static byte[] toUTF8(String str) {
         if (str == null)
             return null;