diff -r cd41ebc93e78 -r 41c9aa696059 app/src/main/java/com/isode/stroke/stringcodecs/Base64.java
--- a/app/src/main/java/com/isode/stroke/stringcodecs/Base64.java	Sun Mar 15 21:08:23 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
- */
-/*
- * Copyright (c) 2010, Isode Limited, London, England.
- * All rights reserved.
- */
-package com.isode.stroke.stringcodecs;
-
-import com.isode.stroke.base.ByteArray;
-
-public class Base64 {
-    /* FIXME: Check license is ok (it is, it's BSD) */
-    public static ByteArray decode(String input) {
-        return new ByteArray(Base64BSD.decode(input));
-    }
-
-    public static String encode(ByteArray input) {
-        return Base64BSD.encodeToString(input.getData(), false);
-    }
-}