diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSyncConnectionReader.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSyncConnectionReader.java
deleted file mode 100644
index 0b47b6f377515df4c5eff2770355601bb79d2054..0000000000000000000000000000000000000000
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSyncConnectionReader.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-import org.briarproject.bramble.api.plugin.TransportConnectionReader;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-class MailboxSyncConnectionReader implements TransportConnectionReader {
-	private final ByteArrayInputStream bIS;
-
-	public MailboxSyncConnectionReader(byte[] encryptedSyncStream) {
-		bIS = new ByteArrayInputStream(encryptedSyncStream);
-	}
-
-	@Override
-	public InputStream getInputStream() {
-		return bIS;
-	}
-
-	@Override
-	public void dispose(boolean exception, boolean recognised)
-			throws IOException {
-		bIS.close();
-	}
-}
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSyncConnectionWriter.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSyncConnectionWriter.java
deleted file mode 100644
index b51d9dacf03dbf8014f64b00ce9129c7a62b1419..0000000000000000000000000000000000000000
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxSyncConnectionWriter.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.briarproject.bramble.mailbox;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.mailbox.MailboxConstants;
-import org.briarproject.bramble.api.plugin.TransportConnectionWriter;
-import org.briarproject.bramble.mailbox.protocol.MailboxProtocol;
-import org.briarproject.bramble.mailbox.protocol.MailboxRequestStore;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-public class MailboxSyncConnectionWriter implements TransportConnectionWriter {
-
-	private ByteArrayOutputStream bufferOS = new ByteArrayOutputStream();
-
-	private MailboxProtocol mailboxProtocol;
-	private ContactId contactId;
-
-	public MailboxSyncConnectionWriter(MailboxProtocol mailboxProtocol,
-			ContactId contactId) {
-		this.mailboxProtocol = mailboxProtocol;
-		this.contactId = contactId;
-	}
-
-	@Override
-	public int getMaxLatency() {
-		return MailboxConstants.MAX_MAILBOX_LATENCY;
-	}
-
-	@Override
-	public int getMaxIdleTime() {
-		return MailboxConstants.MAX_IDLE_TIME;
-	}
-
-	@Override
-	public OutputStream getOutputStream() {
-		return bufferOS;
-	}
-
-	@Override
-	public void dispose(boolean exception) throws IOException {
-		if (exception == true) return;
-
-		MailboxRequestStore message =
-				new MailboxRequestStore(contactId, bufferOS.toByteArray());
-
-		try {
-			mailboxProtocol.writeRequest(message);
-			message.awaitResponse();
-		} catch (InterruptedException e) {
-			throw new IOException("MailboxMessage delivery failed");
-		}
-
-		if (!message.wasSuccessfull()) {
-			throw new IOException(message.getResponseError());
-		}
-	}
-}