diff --git a/moonlight-common/.classpath b/moonlight-common/.classpath
index 09191526..db1e0181 100644
--- a/moonlight-common/.classpath
+++ b/moonlight-common/.classpath
@@ -4,6 +4,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="libs/xpp3-1.1.4c.jar"/>
 	<classpathentry kind="lib" path="libs/tinyrtsp.jar"/>
-	<classpathentry kind="lib" path="libs/commons-codec-1.9.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/moonlight-common/libs/commons-codec-1.9.jar b/moonlight-common/libs/commons-codec-1.9.jar
deleted file mode 100644
index ef35f1c5..00000000
Binary files a/moonlight-common/libs/commons-codec-1.9.jar and /dev/null differ
diff --git a/moonlight-common/src/com/limelight/nvstream/http/LimelightCryptoProvider.java b/moonlight-common/src/com/limelight/nvstream/http/LimelightCryptoProvider.java
index 81acd9c5..fe313cd9 100644
--- a/moonlight-common/src/com/limelight/nvstream/http/LimelightCryptoProvider.java
+++ b/moonlight-common/src/com/limelight/nvstream/http/LimelightCryptoProvider.java
@@ -7,4 +7,5 @@ public interface LimelightCryptoProvider {
 	public X509Certificate getClientCertificate();
 	public RSAPrivateKey getClientPrivateKey();
 	public byte[] getPemEncodedClientCertificate();
+	public String encodeBase64String(byte[] data);
 }
diff --git a/moonlight-common/src/com/limelight/nvstream/http/NvHTTP.java b/moonlight-common/src/com/limelight/nvstream/http/NvHTTP.java
index 131ded8b..82a0192b 100644
--- a/moonlight-common/src/com/limelight/nvstream/http/NvHTTP.java
+++ b/moonlight-common/src/com/limelight/nvstream/http/NvHTTP.java
@@ -16,7 +16,6 @@ import java.util.Stack;
 
 import javax.crypto.SecretKey;
 
-import org.apache.commons.codec.binary.Base64;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlPullParserFactory;
@@ -25,6 +24,7 @@ import org.xmlpull.v1.XmlPullParserFactory;
 public class NvHTTP {
 	private String uniqueId;
 	private PairingManager pm;
+	private LimelightCryptoProvider cryptoProvider;
 
 	public static final int PORT = 47984;
 	public static final int CONNECTION_TIMEOUT = 5000;
@@ -35,6 +35,7 @@ public class NvHTTP {
 	
 	public NvHTTP(InetAddress host, String uniqueId, String deviceName, LimelightCryptoProvider cryptoProvider) {
 		this.uniqueId = uniqueId;
+		this.cryptoProvider = cryptoProvider;
 		
 		String safeAddress;
 		if (host instanceof Inet6Address) {
@@ -200,14 +201,14 @@ public class NvHTTP {
 			"/launch?uniqueid=" + uniqueId +
 			"&appid=" + appId +
 			"&mode=" + width + "x" + height + "x" + refreshRate +
-			"&additionalStates=1&sops=1&rikey="+Base64.encodeBase64String(inputKey.getEncoded()));
+			"&additionalStates=1&sops=1&rikey="+cryptoProvider.encodeBase64String(inputKey.getEncoded()));
 		String gameSession = getXmlString(in, "gamesession");
 		return Integer.parseInt(gameSession);
 	}
 	
 	public boolean resumeApp(SecretKey inputKey) throws IOException, XmlPullParserException {
 		InputStream in = openHttpConnection(baseUrl + "/resume?uniqueid=" + uniqueId +
-				"&rikey="+Base64.encodeBase64String(inputKey.getEncoded()));
+				"&rikey="+cryptoProvider.encodeBase64String(inputKey.getEncoded()));
 		String resume = getXmlString(in, "resume");
 		return Integer.parseInt(resume) != 0;
 	}