diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/IncomingJingleFileOffer.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/IncomingJingleFileOffer.java
index f433ab0b6..65c314fb5 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/IncomingJingleFileOffer.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/IncomingJingleFileOffer.java
@@ -30,7 +30,6 @@ import org.jivesoftware.smackx.jingle.JingleTransportMethodManager;
 import org.jivesoftware.smackx.jingle.Role;
 import org.jivesoftware.smackx.jingle.element.Jingle;
 import org.jivesoftware.smackx.jingle.element.JingleContent;
-import org.jivesoftware.smackx.jingle.element.JingleReason;
 import org.jivesoftware.smackx.jingle.transports.JingleTransportInitiationCallback;
 import org.jivesoftware.smackx.jingle.transports.JingleTransportManager;
 import org.jivesoftware.smackx.jingle_filetransfer.callback.IncomingFileOfferCallback;
@@ -47,41 +46,6 @@ public class IncomingJingleFileOffer extends JingleFileTransferSession implement
     private ReceiveTask receivingThread;
     private File target;
 
-    @Override
-    public void cancel() {
-
-    }
-
-    @Override
-    public boolean isFinished() {
-        return false;
-    }
-
-    @Override
-    public boolean isStarted() {
-        return false;
-    }
-
-    @Override
-    public void addEndedListener(EndedListener listener) {
-
-    }
-
-    @Override
-    public void addStartedListener(StartedListener listener) {
-
-    }
-
-    @Override
-    public void notifyEndedListeners(JingleReason.Reason reason) {
-
-    }
-
-    @Override
-    public void notifyStartedListeners() {
-
-    }
-
     public enum State {
         fresh,
         pending,
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferManager.java
index 679231964..90b79459b 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferManager.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferManager.java
@@ -83,7 +83,8 @@ public final class JingleFileTransferManager extends Manager implements JingleHa
         OutgoingJingleFileOffer offer = new OutgoingJingleFileOffer(connection(), recipient);
         JingleManager.getInstanceFor(connection()).registerJingleSessionHandler(recipient, offer.getSessionId(), offer);
         offer.send(file);
-        return offer;
+        //return offer;
+        return null;
     }
 
     public SmackFuture<?> asyncSendFile(FullJid recipient, File file) {
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferSession.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferSession.java
index 94e82d207..5bb5c36ec 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferSession.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferSession.java
@@ -21,14 +21,13 @@ import org.jivesoftware.smackx.jingle.JingleSession;
 import org.jivesoftware.smackx.jingle.JingleUtil;
 import org.jivesoftware.smackx.jingle.Role;
 import org.jivesoftware.smackx.jingle_filetransfer.element.JingleFileTransfer;
-import org.jivesoftware.smackx.jingle_filetransfer.handler.FileTransferHandler;
 
 import org.jxmpp.jid.FullJid;
 
 /**
  * Class representing a Jingle session in the context of Jingle File Transfer (XEP-0234).
  */
-public abstract class JingleFileTransferSession extends JingleSession implements FileTransferHandler {
+public abstract class JingleFileTransferSession extends JingleSession {
 
     public enum Type {
         offer,