diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4a3f700..2b90e5c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -66,7 +66,7 @@ jobs:
       # Clean our own artifacts so that they don't clutter the cache
       - run:
           name: Clean Rust build directory before caching it
-          command: cargo clean -p flouze && cargo clean -p flouze-cli && cargo clean -p flouze-jni && cargo clean -p flouze-flutter
+          command: cargo clean -p flouze && cargo clean -p flouze-cli && cargo clean -p flouze-flutter
       - save_cache:
           key: "v1-rust"
           paths:
diff --git a/Cargo.toml b/Cargo.toml
index 33d7bda..5109705 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,6 +2,5 @@
 members = [
   "lib",
   "cli",
-  "jni",
   "flouze_flutter"
 ]
diff --git a/jni/.gitignore b/jni/.gitignore
deleted file mode 100644
index 654ba8e..0000000
--- a/jni/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/.gradle
-/.idea
-/build
-/gen
-/jni.iml
diff --git a/jni/Cargo.toml b/jni/Cargo.toml
deleted file mode 100644
index a1b2679..0000000
--- a/jni/Cargo.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-[package]
-name = "flouze-jni"
-version = "0.1.0"
-authors = ["Adrien Bustany <adrien@bustany.org>"]
-
-[lib]
-path = "src/main/rust/lib.rs"
-crate_type = ["cdylib"]
-
-[dependencies]
-jni = "^0.12"
-prost = "^0.5"
-flouze = { path = "../lib" }
diff --git a/jni/build.gradle b/jni/build.gradle
deleted file mode 100644
index d8a9da0..0000000
--- a/jni/build.gradle
+++ /dev/null
@@ -1,57 +0,0 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.6'
-    }
-}
-
-apply plugin: 'java'
-apply plugin: 'idea'
-apply plugin: 'com.google.protobuf'
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    compile 'com.google.protobuf:protobuf-java:3.0.0'
-    testCompile 'junit:junit:4.12'
-}
-
-sourceSets {
-    main {
-        proto {
-            srcDir '../lib/proto'
-        }
-    }
-}
-
-protobuf {
-    protoc {
-        artifact = 'com.google.protobuf:protoc:3.0.0'
-    }
-
-    generatedFilesBaseDir = "$projectDir/gen"
-}
-
-clean {
-    delete protobuf.generatedFilesBaseDir
-}
-
-idea {
-    module {
-        sourceDirs += file("../lib/proto");
-    }
-}
-
-task compileRust(type: Exec) {
-    commandLine 'cargo', 'build', '--target-dir', "${buildDir}/cargo"
-}
-
-classes.dependsOn compileRust
-
-test {
-    systemProperty "java.library.path", file("${buildDir}/cargo/debug").absolutePath
-}
diff --git a/jni/gradle/wrapper/gradle-wrapper.jar b/jni/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index d98de25..0000000
Binary files a/jni/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/jni/gradle/wrapper/gradle-wrapper.properties b/jni/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index de74548..0000000
--- a/jni/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Thu Jul 05 17:37:21 CEST 2018
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip
diff --git a/jni/gradlew b/jni/gradlew
deleted file mode 100755
index cccdd3d..0000000
--- a/jni/gradlew
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"
diff --git a/jni/gradlew.bat b/jni/gradlew.bat
deleted file mode 100644
index e95643d..0000000
--- a/jni/gradlew.bat
+++ /dev/null
@@ -1,84 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/jni/src/main/java/flouze/Flouze.java b/jni/src/main/java/flouze/Flouze.java
deleted file mode 100644
index 3a57c9f..0000000
--- a/jni/src/main/java/flouze/Flouze.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package flouze;
-
-class Flouze {
-    private static boolean initialized = false;
-
-    public static synchronized void init() {
-        if (!initialized) {
-            System.loadLibrary("flouze_jni");
-            initialized = true;
-        }
-    }
-}
diff --git a/jni/src/main/java/flouze/FlouzeException.java b/jni/src/main/java/flouze/FlouzeException.java
deleted file mode 100644
index 17837ca..0000000
--- a/jni/src/main/java/flouze/FlouzeException.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package flouze;
-
-public class FlouzeException extends Exception {
-    public FlouzeException(String message) {
-        super(message);
-    }
-}
diff --git a/jni/src/main/java/flouze/Repository.java b/jni/src/main/java/flouze/Repository.java
deleted file mode 100644
index 8a1cba1..0000000
--- a/jni/src/main/java/flouze/Repository.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package flouze;
-
-import flouze.Model.Account;
-
-interface Repository {
-    void addAccount(Account account);
-    Account getAccount(byte[] accountId);
-}
diff --git a/jni/src/main/java/flouze/SledRepository.java b/jni/src/main/java/flouze/SledRepository.java
deleted file mode 100644
index ce9f344..0000000
--- a/jni/src/main/java/flouze/SledRepository.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package flouze;
-
-import com.google.protobuf.InvalidProtocolBufferException;
-import flouze.Model.Account;
-
-class SledRepository implements Repository {
-    private final long ptr;
-
-    private SledRepository(long ptr) {
-        this.ptr = ptr;
-    }
-
-    public static SledRepository temporary() {
-        long ptr = _newSledTemporary();
-
-        return new SledRepository(ptr);
-    }
-
-    public void close() {
-        _destroy(ptr);
-    }
-
-    @Override
-    public void addAccount(Account account) {
-        _addAccount(ptr, account.toByteArray());
-    }
-
-    @Override
-    public Account getAccount(byte[] accountId) {
-        try {
-            return Account.parseFrom(_getAccount(ptr, accountId));
-        } catch (InvalidProtocolBufferException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private static native long _newSledTemporary();
-    private native void _destroy(long ptr);
-    private static native void _addAccount(long ptr, byte[] account);
-    private native byte[] _getAccount(long ptr, byte[] accountId);
-}
diff --git a/jni/src/main/rust/lib.rs b/jni/src/main/rust/lib.rs
deleted file mode 100644
index 9ff8954..0000000
--- a/jni/src/main/rust/lib.rs
+++ /dev/null
@@ -1,116 +0,0 @@
-extern crate flouze;
-extern crate jni;
-extern crate prost;
-
-use jni::objects::*;
-use jni::sys::*;
-use jni::JNIEnv;
-
-use flouze::model;
-use flouze::repository::Repository;
-use flouze::sledrepository::SledRepository;
-
-use prost::Message;
-
-const FLOUZE_EXCEPTION_CLASS: &'static str = "flouze/FlouzeException";
-
-fn throw_err(env: &JNIEnv, err: ::flouze::errors::Error) {
-    let _ = env.throw((FLOUZE_EXCEPTION_CLASS, format!("{}", err)));
-}
-
-fn ok_or_throw<T>(env: &JNIEnv, res: ::flouze::errors::Result<T>, default: T) -> T {
-    match res {
-        Err(e) => {
-            throw_err(env, e);
-            default
-        }
-        Ok(v) => v,
-    }
-}
-
-#[no_mangle]
-#[allow(non_snake_case)]
-pub extern "system" fn Java_flouze_SledRepository__1newSledTemporary(
-    env: JNIEnv,
-    _class: JClass,
-) -> jlong {
-    match SledRepository::temporary() {
-        Ok(repo) => Box::into_raw(Box::new(repo)) as jlong,
-        _ => {
-            let _ = env.throw((FLOUZE_EXCEPTION_CLASS, "Error while creating repository"));
-            0
-        }
-    }
-}
-
-#[no_mangle]
-#[allow(non_snake_case)]
-pub unsafe extern "system" fn Java_flouze_SledRepository__1destroy(
-    _env: JNIEnv,
-    _instance: JObject,
-    ptr: jlong,
-) {
-    if ptr == 0 {
-        return;
-    }
-
-    let _repo = Box::from_raw(ptr as *mut SledRepository);
-}
-
-fn add_account(repo: &mut SledRepository, account_data: &Vec<u8>) -> ::flouze::errors::Result<()> {
-    let account = model::Account::decode(account_data)?;
-    repo.add_account(&account)
-}
-
-#[no_mangle]
-#[allow(non_snake_case)]
-pub unsafe extern "system" fn Java_flouze_SledRepository__1addAccount(
-    env: JNIEnv,
-    _class: JClass,
-    instance: jlong,
-    account: jbyteArray,
-) {
-    let mut repo = &mut *(instance as *mut SledRepository);
-    let account_bytes = match env.convert_byte_array(account) {
-        Ok(bytes) => bytes,
-        Err(_) => {
-            return;
-        } // An exception has been raised
-    };
-    ok_or_throw(&env, add_account(&mut repo, &account_bytes), ());
-}
-
-fn get_account(repo: &SledRepository, account_id: &Vec<u8>) -> ::flouze::errors::Result<Vec<u8>> {
-    let account = repo.get_account(&account_id)?;
-
-    let mut buf = Vec::new();
-    buf.reserve(account.encoded_len());
-    account.encode(&mut buf).unwrap();
-
-    Ok(buf)
-}
-
-#[no_mangle]
-#[allow(non_snake_case)]
-pub unsafe extern "system" fn Java_flouze_SledRepository__1getAccount(
-    env: JNIEnv,
-    _class: JClass,
-    instance: jlong,
-    jaccount_id: jbyteArray,
-) -> jbyteArray {
-    let repo = &mut *(instance as *mut SledRepository);
-    let account_id = match env.convert_byte_array(jaccount_id) {
-        Ok(bytes) => bytes,
-        Err(_) => {
-            return env.byte_array_from_slice(&vec![]).unwrap();
-        } // An exception has been raised
-    };
-
-    match get_account(&repo, &account_id) {
-        Ok(bytes) => env.byte_array_from_slice(&bytes).unwrap(),
-        Err(e) => {
-            throw_err(&env, e);
-            return env.byte_array_from_slice(&vec![]).unwrap();
-        }
-    }
-}
diff --git a/jni/src/test/java/flouze/FlouzeTest.java b/jni/src/test/java/flouze/FlouzeTest.java
deleted file mode 100644
index 5064f4e..0000000
--- a/jni/src/test/java/flouze/FlouzeTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package flouze;
-
-import com.google.protobuf.ByteString;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class FlouzeTest {
-    static {
-        Flouze.init();
-    }
-
-    @Test
-    public void testSledRepository() {
-        SledRepository repo = SledRepository.temporary();
-
-        final byte[] person_id = {1, 2, 3};
-        final Model.Person member = Model.Person.newBuilder()
-            .setUuid(ByteString.copyFrom(person_id))
-            .setName("John")
-            .build();
-
-        final byte[] account_id = {1, 2, 3};
-        final Model.Account account = Model.Account.newBuilder()
-            .setUuid(ByteString.copyFrom(account_id))
-            .setLabel("My account")
-            .addMembers(member)
-            .build();
-
-        repo.addAccount(account);
-
-        final Model.Account fetched = repo.getAccount(account_id);
-
-        assertEquals(account, fetched);
-
-        repo.close();
-    }
-}