diff -r cd41ebc93e78 -r 41c9aa696059 app/src/main/java/com/isode/stroke/stringcodecs/PBKDF2.java
--- a/app/src/main/java/com/isode/stroke/stringcodecs/PBKDF2.java	Sun Mar 15 21:08:23 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2010, Isode Limited, London, England.
- * All rights reserved.
- */
-/*
- * Copyright (c) 2010, Remko Tronçon.
- * All rights reserved.
- */
-package com.isode.stroke.stringcodecs;
-
-import com.isode.stroke.base.ByteArray;
-
-public class PBKDF2 {
-
-    public static ByteArray encode(ByteArray password, ByteArray salt, int iterations) {
-        ByteArray u = HMACSHA1.getResult(password, ByteArray.plus(salt, new ByteArray("\0\0\0\1")));
-        ByteArray result = new ByteArray(u);
-        byte[] resultData = result.getData();
-        int i = 1;
-        while (i < iterations) {
-            u = HMACSHA1.getResult(password, u);
-            for (int j = 0; j < u.getSize(); ++j) {
-                resultData[j] ^= u.getData()[j];
-            }
-            ++i;
-        }
-        return result;
-    }
-}