diff --git a/.gitignore b/.gitignore
index 7a97f207b5..aaf2a09ee3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 /local.properties
 /.idea/workspace.xml
 /.idea/libraries
+/.idea/caches
 .DS_Store
 /build
 /captures
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000000..30aa626c23
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,29 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <Objective-C-extensions>
+      <file>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+      </file>
+      <class>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+      </class>
+      <extensions>
+        <pair source="cpp" header="h" fileNamingConvention="NONE" />
+        <pair source="c" header="h" fileNamingConvention="NONE" />
+      </extensions>
+    </Objective-C-extensions>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 96cc43efa6..0000000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3377..0000000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5fcfbc383f..65f050f8c7 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,9 +3,8 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="LOCAL" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1226ab3dd6..dc3456943d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,33 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" value="$PROJECT_DIR$/../LiquidPlayer.github.io/LiquidCoreAndroid/0.4.6" />
-    <option name="OPTION_SCOPE" value="public" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
-  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="4">
+        <list size="5">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
         </list>
       </value>
     </option>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 35eb1ddfbb..94a25f7f4c 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/LiquidCoreAndroid/CMakeLists.txt b/LiquidCoreAndroid/CMakeLists.txt
index fff7bad16f..c0292906b4 100644
--- a/LiquidCoreAndroid/CMakeLists.txt
+++ b/LiquidCoreAndroid/CMakeLists.txt
@@ -38,11 +38,14 @@ set( SOURCES
      src/main/cpp/JSC/OpaqueJSString.cpp
      src/main/cpp/JSC/OpaqueJSValue.cpp
 
+     # Common Node.js between Android & iOS
+     ../LiquidCoreCommon/node/NodeInstance.cpp
+     ../LiquidCoreCommon/node/nodedroid_file.cc
+     ../LiquidCoreCommon/node/os_dependent.cpp
+     ../LiquidCoreCommon/node/process_wrap.cc
+
      # Node.js
      src/main/cpp/node/JNI_Process.cpp
-     src/main/cpp/node/nodedroid_file.cc
-     src/main/cpp/node/NodeInstance.cpp
-     src/main/cpp/node/process_wrap.cc
      src/main/cpp/node/sqlite3_shim.cpp
 )
 
@@ -120,6 +123,7 @@ include_directories(
              src/../../deps/sqlite-autoconf-3150000
              src/../../deps/nan-2.5.1
              src/../../deps/boost_1_66_0
+             src/../../LiquidCoreCommon/node
              )
 
 find_library( # Sets the name of the path variable.
diff --git a/LiquidCoreAndroid/build.gradle b/LiquidCoreAndroid/build.gradle
index 09d1588d8f..5abee71355 100644
--- a/LiquidCoreAndroid/build.gradle
+++ b/LiquidCoreAndroid/build.gradle
@@ -3,31 +3,32 @@ apply plugin: 'jacoco'
 apply plugin: 'com.github.dcendents.android-maven'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 27
     buildToolsVersion '26.0.3'
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 4
-        versionName "0.4.6"
+        versionName "0.5.0"
         setProperty("archivesBaseName", "LiquidCore")
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         //multiDexEnabled true
         externalNativeBuild {
             cmake {
                 cppFlags "-std=c++11 -fexceptions"
-                abiFilters "x86", "armeabi-v7a" //, "x86_64", "arm64-v8a"
+                abiFilters "x86", "armeabi-v7a", "x86_64", "arm64-v8a"
+                arguments "-DANDROID_TOOLCHAIN=gcc", "-DANDROID_STL=gnustl_static","-DANDROID_CPP_FEATURES=rtti exceptions"
             }
         }
         sourceSets {
             main {
                 jni.srcDirs = []
-                release.jniLibs.srcDirs = ['../deps/node-8.9.3/prebuilt/32bit/nosymbols'
-                                   //, '../deps/node-8.9.3/prebuilt/64bit/nosymbols'
+                release.jniLibs.srcDirs = ['../deps/node-8.9.3/prebuilt/32bit/nosymbols',
+                                           '../deps/node-8.9.3/prebuilt/64bit/nosymbols'
                 ]
-                debug.jniLibs.srcDirs = ['../deps/node-8.9.3/prebuilt/32bit/symbols'
-                                           //, '../deps/node-8.9.3/prebuilt/64bit/symbols'
+                debug.jniLibs.srcDirs = ['../deps/node-8.9.3/prebuilt/32bit/symbols',
+                                         '../deps/node-8.9.3/prebuilt/64bit/symbols'
                 ]
             }
         }
@@ -50,7 +51,7 @@ android {
         abi {
             enable true
             reset()
-            include 'x86', 'armeabi-v7a' //, 'x86_64', 'arm64-v8a'
+            include 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a'
             universalApk true
         }
     }
@@ -65,9 +66,9 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     debugImplementation 'junit:junit:4.12'
     implementation 'com.android.support:appcompat-v7:26.1.0'
-    androidTestImplementation 'com.android.support:support-annotations:27.0.2'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test:rules:1.0.1'
+    androidTestImplementation 'com.android.support:support-annotations:27.1.1'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test:rules:1.0.2'
     androidTestImplementation 'org.hamcrest:hamcrest-library:1.3'
 }
 
diff --git a/LiquidCoreAndroid/src/main/cpp/JNI/JNI_JSValue.cpp b/LiquidCoreAndroid/src/main/cpp/JNI/JNI_JSValue.cpp
index f8894be90b..91553792a7 100644
--- a/LiquidCoreAndroid/src/main/cpp/JNI/JNI_JSValue.cpp
+++ b/LiquidCoreAndroid/src/main/cpp/JNI/JNI_JSValue.cpp
@@ -192,7 +192,6 @@ NATIVE(JNIJSValue,jboolean,isEqual) (PARAMS, jlong a_, jlong b_)
     if (!a->IsDefunct()) {
         V8_ISOLATE_CTX(a->Context(), isolate, context)
             auto b = SharedWrap<JSValue>::Shared(a->Context(), b_);
-            Local<Value> value = a->Value();
 
             TryCatch trycatch(isolate);
 
diff --git a/LiquidCoreAndroid/src/main/cpp/node/NodeInstance.cpp b/LiquidCoreAndroid/src/main/cpp/node/NodeInstance.cpp
deleted file mode 100644
index d74e100ab9..0000000000
--- a/LiquidCoreAndroid/src/main/cpp/node/NodeInstance.cpp
+++ /dev/null
@@ -1,844 +0,0 @@
-//
-// NodeInstance.cpp
-//
-// LiquidPlayer project
-// https://github.com/LiquidPlayer
-//
-// Edited by Eric Lange
-//
-// Based on node.cc in node/src/node.cc
-/*
- Copyright (c) 2016 Eric Lange. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- - Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#include "node/NodeInstance.h"
-#include "node/nodedroid_file.h"
-
-#if defined HAVE_PERFCTR
-#include "node_counters.h"
-#endif
-
-#if HAVE_OPENSSL
-#include "node_crypto.h"
-#endif
-
-#if defined(NODE_HAVE_I18N_SUPPORT)
-#include "node_i18n.h"
-#endif
-
-#if defined HAVE_DTRACE || defined HAVE_ETW
-#include "node_dtrace.h"
-#endif
-
-#if defined HAVE_LTTNG
-#include "node_lttng.h"
-#endif
-
-#include <sys/resource.h>  // getrlimit, setrlimit
-
-#include "node_perf.h"
-#include "v8-profiler.h"
-
-#include "JSC/JSC.h"
-#include "JNI/JNI.h"
-
-NodeInstance::NodeInstance(JNIEnv* env, jobject thiz) {
-    env->GetJavaVM(&m_jvm);
-    m_JavaThis = env->NewGlobalRef(thiz);
-
-    node_main_thread = new std::thread(node_main_task,reinterpret_cast<void*>(this));
-}
-
-NodeInstance::NodeInstance() {
-    m_jvm = nullptr;
-    m_JavaThis = nullptr;
-    node_main_thread = new std::thread(node_main_task,reinterpret_cast<void*>(this));
-}
-
-NodeInstance::~NodeInstance() {
-    node_main_thread->join();
-    delete node_main_thread;
-}
-
-void NodeInstance::spawnedThread()
-{
-    enum { kMaxArgs = 64 };
-    char cmd[60];
-
-    setenv("NODE_PATH", "/home/node_modules", true);
-    if (m_jvm) {
-        strcpy(cmd, "node -e global.__nodedroid_onLoad();");
-    } else {
-        strcpy(cmd, "node");
-    }
-
-    int argc = 0;
-    char *argv[kMaxArgs];
-
-    char *p2 = strtok(cmd, " ");
-    while (p2 && argc < kMaxArgs-1)
-      {
-        argv[argc++] = p2;
-        p2 = strtok(0, " ");
-      }
-    argv[argc] = 0;
-
-    int ret = StartInstance(argc, argv);
-
-    if (m_jvm) {
-        JNIEnv *env;
-        int getEnvStat = m_jvm->GetEnv((void**)&env, JNI_VERSION_1_6);
-        if (getEnvStat == JNI_EDETACHED) {
-            m_jvm->AttachCurrentThread(&env, NULL);
-        }
-
-        jclass cls = env->GetObjectClass(m_JavaThis);
-        jmethodID mid;
-        do {
-            mid = env->GetMethodID(cls,"onNodeExit","(J)V");
-            if (!env->ExceptionCheck()) break;
-            env->ExceptionClear();
-            jclass super = env->GetSuperclass(cls);
-            env->DeleteLocalRef(cls);
-            if (super == NULL || env->ExceptionCheck()) {
-                if (super != NULL) env->DeleteLocalRef(super);
-                if (getEnvStat == JNI_EDETACHED) {
-                    m_jvm->DetachCurrentThread();
-                }
-                return;
-            }
-            cls = super;
-        } while (true);
-        env->DeleteLocalRef(cls);
-
-        env->CallVoidMethod(m_JavaThis, mid, (jlong)ret);
-
-        env->DeleteGlobalRef(m_JavaThis);
-
-        if (getEnvStat == JNI_EDETACHED) {
-            m_jvm->DetachCurrentThread();
-        }
-    }
-}
-
-void NodeInstance::node_main_task(void *inst) {
-    reinterpret_cast<NodeInstance*>(inst)->spawnedThread();
-}
-
-void NodeInstance::WaitForInspectorDisconnect(Environment* env) {
-#if HAVE_INSPECTOR
-  if (env->inspector_agent()->IsConnected()) {
-    // Restore signal dispositions, the app is done and is no longer
-    // capable of handling signals.
-    env->inspector_agent()->WaitForDisconnect();
-  }
-#endif
-}
-
-bool NodeInstance::DomainHasErrorHandler(const Environment* env,
-                                  const Local<Object>& domain) {
-  HandleScope scope(env->isolate());
-
-  Local<Value> domain_event_listeners_v = domain->Get(env->events_string());
-  if (!domain_event_listeners_v->IsObject())
-    return false;
-
-  Local<Object> domain_event_listeners_o =
-      domain_event_listeners_v.As<Object>();
-
-  Local<Value> domain_error_listeners_v =
-      domain_event_listeners_o->Get(env->error_string());
-
-  if (domain_error_listeners_v->IsFunction() ||
-      (domain_error_listeners_v->IsArray() &&
-      domain_error_listeners_v.As<Array>()->Length() > 0))
-    return true;
-
-  return false;
-}
-
-bool NodeInstance::DomainsStackHasErrorHandler(const Environment* env) {
-  HandleScope scope(env->isolate());
-
-  if (!env->using_domains())
-    return false;
-
-  Local<Array> domains_stack_array = env->domains_stack_array().As<Array>();
-  if (domains_stack_array->Length() == 0)
-    return false;
-
-  uint32_t domains_stack_length = domains_stack_array->Length();
-  for (uint32_t i = domains_stack_length; i > 0; --i) {
-    Local<Value> domain_v = domains_stack_array->Get(i - 1);
-    if (!domain_v->IsObject())
-      return false;
-
-    Local<Object> domain = domain_v.As<Object>();
-    if (DomainHasErrorHandler(env, domain))
-      return true;
-  }
-
-  return false;
-}
-
-bool NodeInstance::ShouldAbortOnUncaughtException(Isolate* isolate) {
-  HandleScope scope(isolate);
-
-  Environment* env = Environment::GetCurrent(isolate);
-  Local<Object> process_object = env->process_object();
-  Local<String> emitting_top_level_domain_error_key =
-    env->emitting_top_level_domain_error_string();
-  bool isEmittingTopLevelDomainError =
-      process_object->Get(emitting_top_level_domain_error_key)->BooleanValue();
-
-  return isEmittingTopLevelDomainError || !DomainsStackHasErrorHandler(env);
-}
-
-void NodeInstance::Chdir(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  if (args.Length() != 1 || !args[0]->IsString()) {
-    return env->ThrowTypeError("Bad argument.");
-  }
-
-  BufferValue path(args.GetIsolate(), nodedroid::fs_(env, args[0], _FS_ACCESS_RD));
-
-  // Only using uv_chdir to validate path -- the default path should never be used
-  if (*path) {
-      int err = uv_chdir(*path);
-      if (err) {
-        return env->ThrowUVException(err, "uv_chdir");
-      }
-
-      // The real default path is held in the filesystem object
-      nodedroid::chdir_(env, args[0]);
-  }
-}
-
-void NodeInstance::Exit(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  __android_log_print(ANDROID_LOG_DEBUG, "NodeInstance", "exit(%d) called", (int) args[0]->Int32Value());
-
-  WaitForInspectorDisconnect(Environment::GetCurrent(args));
-
-  uv_walk(env->event_loop(), [](uv_handle_t* h, void* arg) {
-    uv_unref(h);
-  }, nullptr);
-  uv_stop(env->event_loop());
-}
-
-void NodeInstance::Abort(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  WaitForInspectorDisconnect(Environment::GetCurrent(args));
-
-  uv_walk(env->event_loop(), [](uv_handle_t* h, void* arg) {
-    uv_unref(h);
-  }, nullptr);
-  uv_stop(env->event_loop());
-}
-
-// FIXME: Not sure if we should allow clients to do this
-void NodeInstance::Kill(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  __android_log_print(ANDROID_LOG_DEBUG, "NodeInstance", "kill called");
-
-  if (args.Length() != 2) {
-    return env->ThrowError("Bad argument.");
-  }
-
-  int pid = args[0]->Int32Value();
-  int sig = args[1]->Int32Value();
-  int err = uv_kill(pid, sig);
-  args.GetReturnValue().Set(err);
-}
-
-
-void NodeInstance::Cwd(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-  Local<Value> aliased;
-
-  aliased = nodedroid::cwd_(env);
-  if (aliased->IsUndefined()) {
-      char buf[PATH_MAX];
-
-      size_t cwd_len = sizeof(buf);
-      int err = uv_cwd(buf, &cwd_len);
-      if (err) {
-        return env->ThrowUVException(err, "uv_cwd");
-      }
-
-      Local<String> cwd = String::NewFromUtf8(env->isolate(),
-                                              buf,
-                                              String::kNormalString,
-                                              cwd_len);
-      aliased = nodedroid::alias_(env, cwd);
-  }
-  args.GetReturnValue().Set(aliased);
-}
-
-void NodeInstance::OnFatalError(const char* location, const char* message) {
-  if (location) {
-    __android_log_print(ANDROID_LOG_ERROR, "NodeInstance",
-        "FATAL ERROR: %s %s", location, message);
-  } else {
-    __android_log_print(ANDROID_LOG_ERROR, "NodeInstance",
-        "FATAL ERROR: %s", message);
-  }
-}
-
-static struct {
-  void Initialize(int thread_pool_size, uv_loop_t* loop) {}
-  void Dispose() {}
-  void DrainVMTasks() {}
-  bool StartInspector(Environment *env, const char* script_path,
-                      const node::DebugOptions& options) {
-    env->ThrowError("Node compiled with NODE_USE_V8_PLATFORM=0");
-    return true;
-  }
-
-  void StartTracingAgent() {
-    fprintf(stderr, "Node compiled with NODE_USE_V8_PLATFORM=0, "
-                    "so event tracing is not available.\n");
-  }
-  void StopTracingAgent() {}
-  bool InspectorStarted(Environment *env) {
-    return false;
-  }
-} v8_platform;
-
-static void PrintErrorString(const char* format, ...) {
-  va_list ap;
-  va_start(ap, format);
-#ifdef _WIN32
-  HANDLE stderr_handle = GetStdHandle(STD_ERROR_HANDLE);
-
-  // Check if stderr is something other than a tty/console
-  if (stderr_handle == INVALID_HANDLE_VALUE ||
-      stderr_handle == nullptr ||
-      uv_guess_handle(_fileno(stderr)) != UV_TTY) {
-    vfprintf(stderr, format, ap);
-    va_end(ap);
-    return;
-  }
-
-  // Fill in any placeholders
-  int n = _vscprintf(format, ap);
-  std::vector<char> out(n + 1);
-  vsprintf(out.data(), format, ap);
-
-  // Get required wide buffer size
-  n = MultiByteToWideChar(CP_UTF8, 0, out.data(), -1, nullptr, 0);
-
-  std::vector<wchar_t> wbuf(n);
-  MultiByteToWideChar(CP_UTF8, 0, out.data(), -1, wbuf.data(), n);
-
-  // Don't include the null character in the output
-  CHECK_GT(n, 0);
-  WriteConsoleW(stderr_handle, wbuf.data(), n - 1, nullptr, nullptr);
-#else
-  vfprintf(stderr, format, ap);
-#endif
-  va_end(ap);
-}
-
-static void ReportException(Environment* env,
-                            Local<Value> er,
-                            Local<Message> message) {
-  HandleScope scope(env->isolate());
-
-  AppendExceptionLine(env, er, message, FATAL_ERROR);
-
-  Local<Value> trace_value;
-  Local<Value> arrow;
-  const bool decorated = IsExceptionDecorated(env, er);
-
-  if (er->IsUndefined() || er->IsNull()) {
-    trace_value = Undefined(env->isolate());
-  } else {
-    Local<Object> err_obj = er->ToObject(env->isolate());
-
-    trace_value = err_obj->Get(env->stack_string());
-    arrow =
-        err_obj->GetPrivate(
-            env->context(),
-            env->arrow_message_private_symbol()).ToLocalChecked();
-  }
-
-  node::Utf8Value trace(env->isolate(), trace_value);
-
-  // range errors have a trace member set to undefined
-  if (trace.length() > 0 && !trace_value->IsUndefined()) {
-    if (arrow.IsEmpty() || !arrow->IsString() || decorated) {
-      PrintErrorString("%s\n", *trace);
-    } else {
-      node::Utf8Value arrow_string(env->isolate(), arrow);
-      PrintErrorString("%s\n%s\n", *arrow_string, *trace);
-    }
-  } else {
-    // this really only happens for RangeErrors, since they're the only
-    // kind that won't have all this info in the trace, or when non-Error
-    // objects are thrown manually.
-    Local<Value> message;
-    Local<Value> name;
-
-    if (er->IsObject()) {
-      Local<Object> err_obj = er.As<Object>();
-      message = err_obj->Get(env->message_string());
-      name = err_obj->Get(FIXED_ONE_BYTE_STRING(env->isolate(), "name"));
-    }
-
-    if (message.IsEmpty() ||
-        message->IsUndefined() ||
-        name.IsEmpty() ||
-        name->IsUndefined()) {
-      // Not an error object. Just print as-is.
-      String::Utf8Value message(er);
-
-      PrintErrorString("%s\n", *message ? *message :
-                                          "<toString() threw exception>");
-    } else {
-      node::Utf8Value name_string(env->isolate(), name);
-      node::Utf8Value message_string(env->isolate(), message);
-
-      if (arrow.IsEmpty() || !arrow->IsString() || decorated) {
-        PrintErrorString("%s: %s\n", *name_string, *message_string);
-      } else {
-        node::Utf8Value arrow_string(env->isolate(), arrow);
-        PrintErrorString("%s\n%s: %s\n",
-                         *arrow_string,
-                         *name_string,
-                         *message_string);
-      }
-    }
-  }
-
-  fflush(stderr);
-}
-
-static void ReportException(Environment* env, const TryCatch& try_catch) {
-  ReportException(env, try_catch.Exception(), try_catch.Message());
-}
-
-void FatalException(Isolate* isolate,
-                    Local<Value> error,
-                    Local<Message> message) {
-  HandleScope scope(isolate);
-
-  Environment* env = Environment::GetCurrent(isolate);
-  Local<Object> process_object = env->process_object();
-  Local<String> fatal_exception_string = env->fatal_exception_string();
-  Local<Function> fatal_exception_function =
-      process_object->Get(fatal_exception_string).As<Function>();
-
-  int exit_code = 0;
-  if (!fatal_exception_function->IsFunction()) {
-    // failed before the process._fatalException function was added!
-    // this is probably pretty bad.  Nothing to do but report and exit.
-    ReportException(env, error, message);
-    exit_code = 6;
-  }
-
-  if (exit_code == 0) {
-    TryCatch fatal_try_catch(isolate);
-
-    // Do not call FatalException when _fatalException handler throws
-    fatal_try_catch.SetVerbose(false);
-
-    // this will return true if the JS layer handled it, false otherwise
-    Local<Value> caught =
-        fatal_exception_function->Call(process_object, 1, &error);
-
-    if (fatal_try_catch.HasCaught()) {
-      // the fatal exception function threw, so we must exit
-      ReportException(env, fatal_try_catch);
-      exit_code = 7;
-    }
-
-    if (exit_code == 0 && false == caught->BooleanValue()) {
-      ReportException(env, error, message);
-      exit_code = 1;
-    }
-  }
-
-  if (exit_code) {
-#if HAVE_INSPECTOR
-    env->inspector_agent()->FatalException(error, message);
-#endif
-    exit(exit_code);
-  }
-}
-
-
-static void OnMessage(Local<Message> message, Local<Value> error) {
-  // The current version of V8 sends messages for errors only
-  // (thus `error` is always set).
-  FatalException(Isolate::GetCurrent(), error, message);
-}
-
-void NodeInstance::StartInspector(Environment* env, const char* path,
-                           DebugOptions debug_options) {
-#if HAVE_INSPECTOR
-  CHECK(!env->inspector_agent()->IsStarted());
-  v8_platform.StartInspector(env, path, debug_options);
-#endif  // HAVE_INSPECTOR
-}
-
-#define JSC "Lorg/liquidplayer/javascript/JNIJSContext;"
-
-inline int NodeInstance::StartInstance(void* group_, IsolateData* isolate_data,
-                 int argc, const char* const* argv,
-                 int exec_argc, const char* const* exec_argv) {
-  /* ===Start */
-  OpaqueJSContextGroup *group = reinterpret_cast<OpaqueJSContextGroup *>(group_);
-  Isolate *isolate = group->isolate();
-  HandleScope handle_scope(isolate);
-  JSGlobalContextRef ctxRef = nullptr;
-  JSClassRef globalClass = nullptr;
-  {
-    JSClassDefinition definition = kJSClassDefinitionEmpty;
-    definition.attributes |= kJSClassAttributeNoAutomaticPrototype;
-    globalClass = JSClassCreate(&definition);
-    ctxRef = JSGlobalContextCreateInGroup(group, globalClass);
-  }
-  JSClassRelease(globalClass);
-  auto java_node_context = ctxRef->Context();
-  Local<Context> context = java_node_context->Value();
-
-  auto notify_start = [&] (boost::shared_ptr<JSContext> java_node_context, JSContextRef ctxRef) {
-    JNIEnv *jenv;
-    int getEnvStat = m_jvm->GetEnv((void**)&jenv, JNI_VERSION_1_6);
-    if (getEnvStat == JNI_EDETACHED) {
-      m_jvm->AttachCurrentThread(&jenv, NULL);
-    }
-
-    jclass cls = jenv->GetObjectClass(m_JavaThis);
-    jmethodID mid;
-    do {
-      mid = jenv->GetMethodID(cls,"onNodeStarted","(JJJ)V");
-      if (!jenv->ExceptionCheck()) break;
-      jenv->ExceptionClear();
-      jclass super = jenv->GetSuperclass(cls);
-      jenv->DeleteLocalRef(cls);
-      if (super == NULL || jenv->ExceptionCheck()) {
-        if (super != NULL) jenv->DeleteLocalRef(super);
-        if (getEnvStat == JNI_EDETACHED) {
-          m_jvm->DetachCurrentThread();
-        }
-        CHECK_EQ(0,1); // This is bad
-      }
-      cls = super;
-    } while (true);
-    jenv->DeleteLocalRef(cls);
-
-    jenv->CallVoidMethod(m_JavaThis, mid,
-        SharedWrap<JSContext>::New(java_node_context),
-        SharedWrap<ContextGroup>::New(group->ContextGroup::shared_from_this()),
-        reinterpret_cast<jlong>(ctxRef)
-    );
-
-    if (getEnvStat == JNI_EDETACHED) {
-        m_jvm->DetachCurrentThread();
-    }
-  };
-  /* ===End */
-
-  Context::Scope context_scope(context);
-  Environment env(isolate_data, context);
-  CHECK_EQ(0, uv_key_create(&thread_local_env));
-  uv_key_set(&thread_local_env, &env);
-  env.Start(argc, argv, exec_argc, exec_argv, v8_is_profiling);
-
-  /* ===Start */
-  // Override default chdir and cwd methods
-  Local<Object> process = env.process_object();
-  env.SetMethod(process, "chdir", Chdir);
-  env.SetMethod(process, "cwd", Cwd);
-
-  // Remove process.dlopen().  Nothing good can come of it in this environment.
-  process->Delete(env.context(), String::NewFromUtf8(isolate, "dlopen"));
-
-  // Override exit() and abort() so they don't nuke the app
-  env.SetMethod(process, "reallyExit", Exit);
-  env.SetMethod(process, "abort", Abort);
-  env.SetMethod(process, "_kill", Kill);
-
-  if (m_jvm) {
-    notify_start(java_node_context, ctxRef);
-  }
-  /* ===End */
-
-  const char* path = argc > 1 ? argv[1] : nullptr;
-  StartInspector(&env, path, debug_options);
-
-  if (debug_options.inspector_enabled() && !v8_platform.InspectorStarted(&env))
-    return 12;  // Signal internal error.
-
-  env.set_abort_on_uncaught_exception(abort_on_uncaught_exception);
-
-  if (force_async_hooks_checks) {
-    env.async_hooks()->force_checks();
-  }
-
-  {
-    Environment::AsyncCallbackScope callback_scope(&env);
-    env.async_hooks()->push_async_ids(1, 0);
-    LoadEnvironment(&env);
-    env.async_hooks()->pop_async_id(1);
-  }
-
-  env.set_trace_sync_io(trace_sync_io);
-
-  {
-    SealHandleScope seal(isolate);
-
-    bool more;
-    PERFORMANCE_MARK(&env, LOOP_START);
-    do {
-      uv_run(env.event_loop(), UV_RUN_DEFAULT);
-
-      v8_platform.DrainVMTasks();
-
-      more = uv_loop_alive(env.event_loop());
-      if (more)
-        continue;
-
-      EmitBeforeExit(&env);
-
-      // Emit `beforeExit` if the loop became alive either after emitting
-      // event, or after running some callbacks.
-      more = uv_loop_alive(env.event_loop());
-    } while (more == true);
-    PERFORMANCE_MARK(&env, LOOP_EXIT);
-  }
-
-  env.set_trace_sync_io(false);
-
-  const int exit_code = EmitExit(&env);
-  RunAtExit(&env);
-
-  /* ===Start */
-  JSGlobalContextRelease(ctxRef);
-  JSContextGroupRelease(group);
-  group->Dispose();
-  /* ===End */
-
-  uv_key_delete(&thread_local_env);
-
-  v8_platform.DrainVMTasks();
-  WaitForInspectorDisconnect(&env);
-#if defined(LEAK_SANITIZER)
-  __lsan_do_leak_check();
-#endif
-
-  return exit_code;
-}
-
-inline int NodeInstance::StartInstance(uv_loop_t* event_loop,
-                 int argc, const char* const* argv,
-                 int exec_argc, const char* const* exec_argv) {
-  Isolate::CreateParams params;
-  ArrayBufferAllocator allocator;
-  params.array_buffer_allocator = &allocator;
-#ifdef NODE_ENABLE_VTUNE_PROFILING
-  params.code_event_handler = vTune::GetVtuneCodeEventHandler();
-#endif
-
-  Isolate* const isolate = Isolate::New(params);
-  if (isolate == nullptr)
-    return 12;  // Signal internal error.
-
-  isolate->AddMessageListener(OnMessage);
-  isolate->SetAbortOnUncaughtExceptionCallback(ShouldAbortOnUncaughtException);
-  isolate->SetAutorunMicrotasks(false);
-  isolate->SetFatalErrorHandler(OnFatalError);
-
-  if (track_heap_objects) {
-    isolate->GetHeapProfiler()->StartTrackingHeapObjects(true);
-  }
-
-  {
-    Mutex::ScopedLock scoped_lock(node_isolate_mutex);
-    CHECK_EQ(node_isolate, nullptr);
-    node_isolate = isolate;
-  }
-
-  JSContextGroupRef group = &* OpaqueJSContextGroup::New(isolate, event_loop);
-
-  int exit_code;
-  {
-    Locker locker(isolate);
-    Isolate::Scope isolate_scope(isolate);
-    HandleScope handle_scope(isolate);
-    IsolateData isolate_data(isolate, event_loop, allocator.zero_fill_field());
-    exit_code = StartInstance((void*)group, &isolate_data, argc, argv, exec_argc, exec_argv);
-  }
-
-  {
-    Mutex::ScopedLock scoped_lock(node_isolate_mutex);
-    CHECK_EQ(node_isolate, isolate);
-    node_isolate = nullptr;
-  }
-
-  isolate->Dispose();
-
-  return exit_code;
-}
-
-inline void NodeInstance::PlatformInit() {
-#ifdef __POSIX__
-#if HAVE_INSPECTOR
-  sigset_t sigmask;
-  sigemptyset(&sigmask);
-  sigaddset(&sigmask, SIGUSR1);
-  const int err = pthread_sigmask(SIG_SETMASK, &sigmask, nullptr);
-#endif  // HAVE_INSPECTOR
-
-  // Make sure file descriptors 0-2 are valid before we start logging anything.
-  for (int fd = STDIN_FILENO; fd <= STDERR_FILENO; fd += 1) {
-    struct stat ignored;
-    if (fstat(fd, &ignored) == 0)
-      continue;
-    // Anything but EBADF means something is seriously wrong.  We don't
-    // have to special-case EINTR, fstat() is not interruptible.
-    if (errno != EBADF)
-      ABORT();
-    if (fd != open("/dev/null", O_RDWR))
-      ABORT();
-  }
-
-#if HAVE_INSPECTOR
-  CHECK_EQ(err, 0);
-#endif  // HAVE_INSPECTOR
-
-#ifndef NODE_SHARED_MODE
-  // Restore signal dispositions, the parent process may have changed them.
-  struct sigaction act;
-  memset(&act, 0, sizeof(act));
-
-  // The hard-coded upper limit is because NSIG is not very reliable; on Linux,
-  // it evaluates to 32, 34 or 64, depending on whether RT signals are enabled.
-  // Counting up to SIGRTMIN doesn't work for the same reason.
-  for (unsigned nr = 1; nr < kMaxSignal; nr += 1) {
-    if (nr == SIGKILL || nr == SIGSTOP)
-      continue;
-    act.sa_handler = (nr == SIGPIPE) ? SIG_IGN : SIG_DFL;
-    CHECK_EQ(0, sigaction(nr, &act, nullptr));
-  }
-#endif  // !NODE_SHARED_MODE
-
-  RegisterSignalHandler(SIGINT, SignalExit, true);
-  RegisterSignalHandler(SIGTERM, SignalExit, true);
-
-  // Raise the open file descriptor limit.
-  struct rlimit lim;
-  if (getrlimit(RLIMIT_NOFILE, &lim) == 0 && lim.rlim_cur != lim.rlim_max) {
-    // Do a binary search for the limit.
-    rlim_t min = lim.rlim_cur;
-    rlim_t max = 1 << 20;
-    // But if there's a defined upper bound, don't search, just set it.
-    if (lim.rlim_max != RLIM_INFINITY) {
-      min = lim.rlim_max;
-      max = lim.rlim_max;
-    }
-    do {
-      lim.rlim_cur = min + (max - min) / 2;
-      if (setrlimit(RLIMIT_NOFILE, &lim)) {
-        max = lim.rlim_cur;
-      } else {
-        min = lim.rlim_cur;
-      }
-    } while (min + 1 < max);
-  }
-#endif  // __POSIX__
-#ifdef _WIN32
-  for (int fd = 0; fd <= 2; ++fd) {
-    auto handle = reinterpret_cast<HANDLE>(_get_osfhandle(fd));
-    if (handle == INVALID_HANDLE_VALUE ||
-        GetFileType(handle) == FILE_TYPE_UNKNOWN) {
-      // Ignore _close result. If it fails or not depends on used Windows
-      // version. We will just check _open result.
-      _close(fd);
-      if (fd != _open("nul", _O_RDWR))
-        ABORT();
-    }
-  }
-#endif  // _WIN32
-}
-
-int NodeInstance::StartInstance(int argc, char *argv[]) {
-  atexit([] () { uv_tty_reset_mode(); });
-  PlatformInit();
-  node::performance::performance_node_start = PERFORMANCE_NOW();
-
-  CHECK_GT(argc, 0);
-
-  // Hack around with the argv pointer. Used for process.title = "blah".
-  argv = uv_setup_args(argc, argv);
-
-  // This needs to run *before* V8::Initialize().  The const_cast is not
-  // optional, in case you're wondering.
-  int exec_argc;
-  const char** exec_argv;
-  Init(&argc, const_cast<const char**>(argv), &exec_argc, &exec_argv);
-
-#if HAVE_OPENSSL
-  {
-    std::string extra_ca_certs;
-    if (SafeGetenv("NODE_EXTRA_CA_CERTS", &extra_ca_certs))
-      crypto::UseExtraCaCerts(extra_ca_certs);
-  }
-#ifdef NODE_FIPS_MODE
-  // In the case of FIPS builds we should make sure
-  // the random source is properly initialized first.
-  OPENSSL_init();
-#endif  // NODE_FIPS_MODE
-  // V8 on Windows doesn't have a good source of entropy. Seed it from
-  // OpenSSL's pool.
-  V8::SetEntropySource(crypto::EntropySource);
-#endif  // HAVE_OPENSSL
-
-  ContextGroup::init_v8();
-
-  node::performance::performance_v8_start = PERFORMANCE_NOW();
-  v8_initialized = true;
-  uv_loop_t uv_loop;
-  uv_loop_init(&uv_loop);
-  const int exit_code =
-      StartInstance(&uv_loop, argc, argv, exec_argc, exec_argv);
-  if (trace_enabled) {
-    v8_platform.StopTracingAgent();
-  }
-  v8_initialized = false;
-
-  //CHECK_EQ(uv_loop_alive(&uv_loop), 0);
-  //FIXME: why does uncommenting this lead to spurious death?
-  //uv_loop_close(&uv_loop);
-
-  delete[] exec_argv;
-  exec_argv = nullptr;
-
-  return exit_code;
-}
diff --git a/LiquidCoreAndroid/src/main/cpp/node/NodeInstance.h b/LiquidCoreAndroid/src/main/cpp/node/NodeInstance.h
deleted file mode 100644
index 85bb9c4e2f..0000000000
--- a/LiquidCoreAndroid/src/main/cpp/node/NodeInstance.h
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-// NodeInstance.h
-//
-// LiquidPlayer project
-// https://github.com/LiquidPlayer
-//
-// Created by Eric Lange
-//
-/*
- Copyright (c) 2016 Eric Lange. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- - Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef NODEDROID_NODEINSTANCE_H
-#define NODEDROID_NODEINSTANCE_H
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <jni.h>
-#include <android/log.h>
-#include <thread>
-#include <string>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <map>
-
-#include "node.h"
-#include "uv.h"
-#include "node_mutex.h"
-#include "env.h"
-#include "env-inl.h"
-#if HAVE_OPENSSL
-#include "node_crypto.h"
-#endif
-
-#include "Common/Common.h"
-
-using namespace node;
-
-class NodeInstance {
-public:
-    NodeInstance(JNIEnv* env, jobject thiz);
-    NodeInstance();
-    virtual ~NodeInstance();
-
-private:
-    void StartInspector(Environment* env, const char* path,
-                           DebugOptions debug_options);
-
-    inline int StartInstance(uv_loop_t* event_loop,
-                 int argc, const char* const* argv,
-                 int exec_argc, const char* const* exec_argv);
-    inline int StartInstance(void* group, IsolateData* isolate_data,
-                 int argc, const char* const* argv,
-                 int exec_argc, const char* const* exec_argv);
-    inline void PlatformInit();
-
-    int StartInstance(int argc, char *argv[]);
-    void spawnedThread();
-
-    static void WaitForInspectorDisconnect(Environment* env);
-    static bool DomainHasErrorHandler(const Environment* env,
-                                  const Local<Object>& domain);
-    static bool DomainsStackHasErrorHandler(const Environment* env);
-    static bool ShouldAbortOnUncaughtException(Isolate* isolate);
-
-    static void node_main_task(void *inst);
-
-    static void Chdir(const FunctionCallbackInfo<Value>& args);
-    static void Cwd(const FunctionCallbackInfo<Value>& args);
-    static void Exit(const FunctionCallbackInfo<Value>& args);
-    static void Abort(const FunctionCallbackInfo<Value>& args);
-    static void Kill(const FunctionCallbackInfo<Value>& args);
-    static void OnFatalError(const char* location, const char* message);
-
-private:
-    Mutex node_isolate_mutex;
-    v8::Isolate* node_isolate = nullptr;
-
-    bool trace_sync_io = false;
-    bool v8_is_profiling = false;
-    bool abort_on_uncaught_exception = false;
-    bool force_async_hooks_checks = false;
-    bool track_heap_objects = false;
-    bool trace_enabled = false;
-
-    JavaVM *m_jvm = nullptr;
-    jobject m_JavaThis = nullptr;
-
-    uv_key_t thread_local_env;
-
-    std::thread* node_main_thread = nullptr;
-};
-
-#endif //NODEDROID_NODEINSTANCE_H
diff --git a/LiquidCoreAndroid/src/main/cpp/node/nodedroid_file.cc b/LiquidCoreAndroid/src/main/cpp/node/nodedroid_file.cc
deleted file mode 100644
index ac2a49e90a..0000000000
--- a/LiquidCoreAndroid/src/main/cpp/node/nodedroid_file.cc
+++ /dev/null
@@ -1,1771 +0,0 @@
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-#include "node_buffer.h"
-#include "node_internals.h"
-#include "node_stat_watcher.h"
-
-#include "req-wrap-inl.h"
-#include "string_bytes.h"
-
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <errno.h>
-#include <limits.h>
-
-#if defined(__MINGW32__) || defined(_MSC_VER)
-# include <io.h>
-#endif
-
-#include <vector>
-
-#include "nodedroid_file.h"
-
-namespace nodedroid {
-namespace {
-
-using v8::Array;
-using v8::ArrayBuffer;
-using v8::Context;
-using v8::Float64Array;
-using v8::Function;
-using v8::FunctionCallbackInfo;
-using v8::FunctionTemplate;
-using v8::HandleScope;
-using v8::Integer;
-using v8::Local;
-using v8::MaybeLocal;
-using v8::Number;
-using v8::Object;
-using v8::String;
-using v8::Value;
-using v8::Maybe;
-
-using node::ReqWrap;
-using node::Environment;
-using node::encoding;
-using node::UTF8;
-using node::UVException;
-using node::StringBytes;
-using node::arraysize;
-using node::BufferValue;
-using node::MaybeStackBuffer;
-using node::StatWatcher;
-using node::ClearWrap;
-using node::AsyncWrap;
-
-using nodedroid::FillStatsArray;
-
-#ifndef MIN
-# define MIN(a, b) ((a) < (b) ? (a) : (b))
-#endif
-
-#define TYPE_ERROR(msg) env->ThrowTypeError(msg)
-
-#define GET_OFFSET(a) ((a)->IsNumber() ? (a)->IntegerValue() : -1)
-
-class FSReqWrap: public ReqWrap<uv_fs_t> {
- public:
-  enum Ownership { COPY, MOVE };
-
-  inline static FSReqWrap* New(Environment* env,
-                               Local<Object> req,
-                               const char* syscall,
-                               const char* data = nullptr,
-                               enum encoding encoding = UTF8,
-                               Ownership ownership = COPY);
-
-  inline void Dispose();
-
-  void ReleaseEarly() {
-    if (data_ != inline_data()) {
-      delete[] data_;
-      data_ = nullptr;
-    }
-  }
-
-  const char* syscall() const { return syscall_; }
-  const char* data() const { return data_; }
-  const enum encoding encoding_;
-
-  size_t self_size() const override { return sizeof(*this); }
-
- private:
-  FSReqWrap(Environment* env,
-            Local<Object> req,
-            const char* syscall,
-            const char* data,
-            enum encoding encoding)
-      : ReqWrap(env, req, AsyncWrap::PROVIDER_FSREQWRAP),
-        encoding_(encoding),
-        syscall_(syscall),
-        data_(data) {
-    Wrap(object(), this);
-  }
-
-  ~FSReqWrap() {
-    ReleaseEarly();
-    ClearWrap(object());
-  }
-
-  void* operator new(size_t size) = delete;
-  void* operator new(size_t size, char* storage) { return storage; }
-  char* inline_data() { return reinterpret_cast<char*>(this + 1); }
-
-  const char* syscall_;
-  const char* data_;
-
-  DISALLOW_COPY_AND_ASSIGN(FSReqWrap);
-};
-
-#define ASSERT_PATH(path)                                                   \
-  if (*path == nullptr)                                                     \
-    return TYPE_ERROR( #path " must be a string or Buffer");
-
-FSReqWrap* FSReqWrap::New(Environment* env,
-                          Local<Object> req,
-                          const char* syscall,
-                          const char* data,
-                          enum encoding encoding,
-                          Ownership ownership) {
-  const bool copy = (data != nullptr && ownership == COPY);
-  const size_t size = copy ? 1 + strlen(data) : 0;
-  FSReqWrap* that;
-  char* const storage = new char[sizeof(*that) + size];
-  that = new(storage) FSReqWrap(env, req, syscall, data, encoding);
-  if (copy)
-    that->data_ = static_cast<char*>(memcpy(that->inline_data(), data, size));
-  return that;
-}
-
-
-void FSReqWrap::Dispose() {
-  this->~FSReqWrap();
-  delete[] reinterpret_cast<char*>(this);
-}
-
-
-void NewFSReqWrap(const FunctionCallbackInfo<Value>& args) {
-  CHECK(args.IsConstructCall());
-  ClearWrap(args.This());
-}
-
-
-inline bool IsInt64(double x) {
-  return x == static_cast<double>(static_cast<int64_t>(x));
-}
-
-void After(uv_fs_t *req) {
-  FSReqWrap* req_wrap = static_cast<FSReqWrap*>(req->data);
-  CHECK_EQ(req_wrap->req(), req);
-  req_wrap->ReleaseEarly();  // Free memory that's no longer used now.
-
-  Environment* env = req_wrap->env();
-  HandleScope handle_scope(env->isolate());
-  Context::Scope context_scope(env->context());
-
-  // there is always at least one argument. "error"
-  int argc = 1;
-
-  // Allocate space for two args. We may only use one depending on the case.
-  // (Feel free to increase this if you need more)
-  Local<Value> argv[2];
-  MaybeLocal<Value> link;
-  Local<Value> error;
-
-  if (req->result < 0) {
-    // An error happened.
-    argv[0] = UVException(env->isolate(),
-                          req->result,
-                          req_wrap->syscall(),
-                          nullptr,
-                          req->path,
-                          req_wrap->data());
-  } else {
-    // error value is empty or null for non-error.
-    argv[0] = Null(env->isolate());
-
-    // All have at least two args now.
-    argc = 2;
-
-    switch (req->fs_type) {
-      // These all have no data to pass.
-      case UV_FS_ACCESS:
-      case UV_FS_CLOSE:
-      case UV_FS_RENAME:
-      case UV_FS_UNLINK:
-      case UV_FS_RMDIR:
-      case UV_FS_MKDIR:
-      case UV_FS_FTRUNCATE:
-      case UV_FS_FSYNC:
-      case UV_FS_FDATASYNC:
-      case UV_FS_LINK:
-      case UV_FS_SYMLINK:
-      case UV_FS_CHMOD:
-      case UV_FS_FCHMOD:
-      case UV_FS_CHOWN:
-      case UV_FS_FCHOWN:
-      case UV_FS_COPYFILE:
-        // These, however, don't.
-        argc = 1;
-        break;
-
-      case UV_FS_STAT:
-      case UV_FS_LSTAT:
-      case UV_FS_FSTAT:
-        argc = 1;
-        FillStatsArray(env->fs_stats_field_array(),
-                       static_cast<const uv_stat_t*>(req->ptr));
-        break;
-
-      case UV_FS_UTIME:
-      case UV_FS_FUTIME:
-        argc = 0;
-        break;
-
-      case UV_FS_OPEN:
-        argv[1] = Integer::New(env->isolate(), req->result);
-        break;
-
-      case UV_FS_WRITE:
-        argv[1] = Integer::New(env->isolate(), req->result);
-        break;
-
-      case UV_FS_MKDTEMP:
-      {
-        link = StringBytes::Encode(env->isolate(),
-                                   static_cast<const char*>(req->path),
-                                   req_wrap->encoding_,
-                                   &error);
-        if (link.IsEmpty()) {
-          // TODO(addaleax): Use `error` itself here.
-          argv[0] = UVException(env->isolate(),
-                                UV_EINVAL,
-                                req_wrap->syscall(),
-                                "Invalid character encoding for filename",
-                                req->path,
-                                req_wrap->data());
-        } else {
-          link = MaybeLocal<Value>(alias_(env, link.ToLocalChecked()));
-          argv[1] = link.ToLocalChecked();
-        }
-        break;
-      }
-
-      case UV_FS_READLINK:
-        link = StringBytes::Encode(env->isolate(),
-                                   static_cast<const char*>(req->ptr),
-                                   req_wrap->encoding_,
-                                   &error);
-        if (link.IsEmpty()) {
-          // TODO(addaleax): Use `error` itself here.
-          argv[0] = UVException(env->isolate(),
-                                UV_EINVAL,
-                                req_wrap->syscall(),
-                                "Invalid character encoding for link",
-                                req->path,
-                                req_wrap->data());
-        } else {
-          link = MaybeLocal<Value>(alias_(env, link.ToLocalChecked()));
-          argv[1] = link.ToLocalChecked();
-        }
-        break;
-
-      case UV_FS_REALPATH:
-        link = StringBytes::Encode(env->isolate(),
-                                   static_cast<const char*>(req->ptr),
-                                   req_wrap->encoding_,
-                                   &error);
-        if (link.IsEmpty()) {
-          // TODO(addaleax): Use `error` itself here.
-          argv[0] = UVException(env->isolate(),
-                                UV_EINVAL,
-                                req_wrap->syscall(),
-                                "Invalid character encoding for link",
-                                req->path,
-                                req_wrap->data());
-        } else {
-          link = MaybeLocal<Value>(alias_(env, link.ToLocalChecked()));
-          argv[1] = link.ToLocalChecked();
-        }
-        break;
-
-      case UV_FS_READ:
-        // Buffer interface
-        argv[1] = Integer::New(env->isolate(), req->result);
-        break;
-
-      case UV_FS_SCANDIR:
-        {
-          int r;
-          Local<Array> names = Array::New(env->isolate(), 0);
-          Local<Function> fn = env->push_values_to_array_function();
-          Local<Value> name_argv[NODE_PUSH_VAL_TO_ARRAY_MAX];
-          size_t name_idx = 0;
-
-          for (int i = 0; ; i++) {
-            uv_dirent_t ent;
-
-            r = uv_fs_scandir_next(req, &ent);
-            if (r == UV_EOF)
-              break;
-            if (r != 0) {
-              argv[0] = UVException(r,
-                                    nullptr,
-                                    req_wrap->syscall(),
-                                    static_cast<const char*>(req->path));
-              break;
-            }
-
-            MaybeLocal<Value> filename =
-                StringBytes::Encode(env->isolate(),
-                                    ent.name,
-                                    req_wrap->encoding_,
-                                    &error);
-            if (filename.IsEmpty()) {
-              // TODO(addaleax): Use `error` itself here.
-              argv[0] = UVException(env->isolate(),
-                                    UV_EINVAL,
-                                    req_wrap->syscall(),
-                                    "Invalid character encoding for filename",
-                                    req->path,
-                                    req_wrap->data());
-              break;
-            }
-            name_argv[name_idx++] = filename.ToLocalChecked();
-
-            if (name_idx >= arraysize(name_argv)) {
-              fn->Call(env->context(), names, name_idx, name_argv)
-                  .ToLocalChecked();
-              name_idx = 0;
-            }
-          }
-
-          if (name_idx > 0) {
-            fn->Call(env->context(), names, name_idx, name_argv)
-                .ToLocalChecked();
-          }
-
-          argv[1] = names;
-        }
-        break;
-
-      default:
-        CHECK(0 && "Unhandled eio response");
-    }
-  }
-
-  req_wrap->MakeCallback(env->oncomplete_string(), argc, argv);
-
-  uv_fs_req_cleanup(req_wrap->req());
-  req_wrap->Dispose();
-}
-
-// This struct is only used on sync fs calls.
-// For async calls FSReqWrap is used.
-class fs_req_wrap {
- public:
-  fs_req_wrap() {}
-  ~fs_req_wrap() { uv_fs_req_cleanup(&req); }
-  uv_fs_t req;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(fs_req_wrap);
-};
-
-
-#define ASYNC_DEST_CALL(func, request, dest, encoding, ...)                   \
-  Environment* env = Environment::GetCurrent(args);                           \
-  CHECK(request->IsObject());                                                 \
-  FSReqWrap* req_wrap = FSReqWrap::New(env, request.As<Object>(),             \
-                                       #func, dest, encoding);                \
-  int err = uv_fs_ ## func(env->event_loop(),                                 \
-                           req_wrap->req(),                                   \
-                           __VA_ARGS__,                                       \
-                           After);                                            \
-  req_wrap->Dispatched();                                                     \
-  if (err < 0) {                                                              \
-    uv_fs_t* uv_req = req_wrap->req();                                        \
-    uv_req->result = err;                                                     \
-    uv_req->path = nullptr;                                                   \
-    After(uv_req);                                                            \
-    req_wrap = nullptr;                                                       \
-  } else {                                                                    \
-    args.GetReturnValue().Set(req_wrap->persistent());                        \
-  }
-
-#define ASYNC_CALL(func, req, encoding, ...)                                  \
-  ASYNC_DEST_CALL(func, req, nullptr, encoding, __VA_ARGS__)                  \
-
-#define SYNC_DEST_CALL(func, path, dest, ...)                                 \
-  fs_req_wrap req_wrap;                                                       \
-  env->PrintSyncTrace();                                                      \
-  int err = uv_fs_ ## func(env->event_loop(),                                 \
-                         &req_wrap.req,                                       \
-                         __VA_ARGS__,                                         \
-                         nullptr);                                            \
-  if (err < 0) {                                                              \
-    return env->ThrowUVException(err, #func, nullptr, path, dest);            \
-  }                                                                           \
-
-#define SYNC_CALL(func, path, ...)                                            \
-  SYNC_DEST_CALL(func, path, nullptr, __VA_ARGS__)                            \
-
-#define SYNC_REQ req_wrap.req
-
-#define SYNC_RESULT err
-
-void Access(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args.GetIsolate());
-  HandleScope scope(env->isolate());
-
-  if (args.Length() < 2)
-    return TYPE_ERROR("path and mode are required");
-  if (!args[1]->IsInt32())
-    return TYPE_ERROR("mode must be an integer");
-
-  {
-    BufferValue path(env->isolate(), args[0]);
-    ASSERT_PATH(path)
-  }
-  BufferValue path(env->isolate(), fs_(env, args[0], _FS_ACCESS_RD));
-
-  int mode = static_cast<int>(args[1]->Int32Value());
-
-  if (args[2]->IsObject()) {
-    ASYNC_CALL(access, args[2], UTF8, *path, mode);
-  } else {
-    SYNC_CALL(access, *path, *path, mode);
-  }
-}
-
-
-void Close(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  if (args.Length() < 1)
-    return TYPE_ERROR("fd is required");
-  if (!args[0]->IsInt32())
-    return TYPE_ERROR("fd must be a file descriptor");
-
-  int fd = args[0]->Int32Value();
-
-  if (args[1]->IsObject()) {
-    ASYNC_CALL(close, args[1], UTF8, fd)
-  } else {
-    SYNC_CALL(close, 0, fd)
-  }
-}
-
-}  // anonymous namespace
-
-v8::Local<v8::Value> fs_(node::Environment *env, v8::Local<v8::Value> path, int req_access)
-{
-    HandleScope handle_scope(env->isolate());
-    Context::Scope context_scope(env->context());
-
-    BufferValue p(env->isolate(), path);
-
-    int access = 0;
-    Local<v8::Private> privateKey = v8::Private::ForApi(env->isolate(),
-        String::NewFromUtf8(env->isolate(), "__fs"));
-    Local<Object> globalObj = env->context()->Global();
-    Maybe<bool> result = globalObj->HasPrivate(env->context(), privateKey);
-    if (result.IsJust() && result.FromJust()) {
-      Local<Value> fsVal;
-      if(globalObj->GetPrivate(env->context(), privateKey).ToLocal(&fsVal)) {
-        Local<Object> fsObj = fsVal->ToObject(env->context()).ToLocalChecked();
-
-        Local<Value> cwd = fsObj->Get(String::NewFromUtf8(env->isolate(), "cwd"));
-        BufferValue c(env->isolate(), cwd);
-        char fullp[strlen(*c) + strlen(*p) + 8];
-
-        const char *pth = *p;
-        while (*pth == ' ' || *pth == '\t') pth++;
-        if (*pth != '/') {
-            strcpy(fullp, *c);
-            strcpy(fullp + strlen(*c), "/");
-            strcpy(fullp + strlen(*c) + 1, pth);
-            pth = fullp;
-        }
-
-        fs_req_wrap req_wrap;
-        env->PrintSyncTrace();
-        int err = uv_fs_realpath(env->event_loop(),
-                             &req_wrap.req, pth, nullptr);
-        const char* link_path;
-        if (err != 0) {
-            link_path = pth;
-        } else {
-            link_path = static_cast<const char*>(SYNC_REQ.ptr);
-        }
-
-        Local<Value> error;
-        Local<Value> rc = StringBytes::Encode(env->isolate(),
-                                              link_path,
-                                              UTF8,
-                                              &error).ToLocalChecked();
-        if (rc.IsEmpty()) {
-          env->ThrowUVException(UV_EINVAL,
-                                "realpath",
-                                "Invalid character encoding for path",
-                                pth);
-          return rc;
-        }
-        Local<Object> test = fsObj->Get(env->context(), String::NewFromUtf8(env->isolate(), "fs"))
-            .ToLocalChecked()->ToObject(env->context()).ToLocalChecked();
-        MaybeLocal<Value> tuple = test->CallAsFunction(env->context(), fsObj, 1, &rc);
-        if (tuple.IsEmpty()) {
-            access = 0;
-        } else {
-          access = (int) tuple.ToLocalChecked()->ToObject(env->context()).ToLocalChecked()
-            ->Get(env->context(), 0).ToLocalChecked()
-            ->ToNumber(env->context()).ToLocalChecked()->Value();
-          rc = tuple.ToLocalChecked()->ToObject(env->context()).ToLocalChecked()
-            ->Get(env->context(), 1).ToLocalChecked();
-        }
-
-        if ((req_access & access) != req_access) {
-            env->ThrowError("access denied (EACCES)");
-            return Local<Value>::New(env->isolate(),Undefined(env->isolate()));
-        }
-        return rc;
-      }
-    }
-    // FileSystem object not set up yet, so carry on as normal
-    return path;
-}
-
-Local<Value> alias_(Environment *env, Local<Value> path)
-{
-    HandleScope handle_scope(env->isolate());
-    Context::Scope context_scope(env->context());
-
-    Local<v8::Private> privateKey = v8::Private::ForApi(env->isolate(),
-        String::NewFromUtf8(env->isolate(), "__fs"));
-    Local<Object> globalObj = env->context()->Global();
-    Maybe<bool> result = globalObj->HasPrivate(env->context(), privateKey);
-    if (result.IsJust() && result.FromJust()) {
-      Local<Value> fsVal;
-      if(globalObj->GetPrivate(env->context(), privateKey).ToLocal(&fsVal)) {
-        Local<Object> fsObj = fsVal->ToObject(env->context()).ToLocalChecked();
-
-        Local<Object> alias = fsObj->Get(env->context(),String::NewFromUtf8(env->isolate(),"alias"))
-            .ToLocalChecked()->ToObject(env->context()).ToLocalChecked();
-        MaybeLocal<Value> aliased = alias->CallAsFunction(env->context(), fsObj, 1, &path);
-
-        return aliased.ToLocalChecked();
-      }
-    }
-    // FileSystem object not set up yet, so carry on as normal
-    return path;
-}
-
-Local<Value> chdir_(Environment *env, Local<Value> path)
-{
-    HandleScope handle_scope(env->isolate());
-    Context::Scope context_scope(env->context());
-
-    path = fs_(env, path, _FS_ACCESS_RD);
-    if (!path->IsUndefined()) {
-      String::Utf8Value str(path);
-
-      Local<v8::Private> privateKey = v8::Private::ForApi(env->isolate(),
-        String::NewFromUtf8(env->isolate(), "__fs"));
-      Local<Object> globalObj = env->context()->Global();
-      Maybe<bool> result = globalObj->HasPrivate(env->context(), privateKey);
-      if (result.IsJust() && result.FromJust()) {
-        Local<Value> fsVal;
-        if(globalObj->GetPrivate(env->context(), privateKey).ToLocal(&fsVal)) {
-          Local<Object> fsObj = fsVal->ToObject(env->context()).ToLocalChecked();
-          fsObj->Set(env->context(), String::NewFromUtf8(env->isolate(), "cwd"), path);
-        }
-      }
-    }
-    return path;
-}
-
-Local<Value> cwd_(Environment *env)
-{
-    HandleScope handle_scope(env->isolate());
-    Context::Scope context_scope(env->context());
-
-    Local<v8::Private> privateKey = v8::Private::ForApi(env->isolate(),
-        String::NewFromUtf8(env->isolate(), "__fs"));
-    Local<Object> globalObj = env->context()->Global();
-    Maybe<bool> result = globalObj->HasPrivate(env->context(), privateKey);
-    if (result.IsJust() && result.FromJust()) {
-      Local<Value> fsVal;
-      if(globalObj->GetPrivate(env->context(), privateKey).ToLocal(&fsVal)) {
-        Local<Object> fsObj = fsVal->ToObject(env->context()).ToLocalChecked();
-        return alias_(env, fsObj->Get(env->context(),
-            String::NewFromUtf8(env->isolate(), "cwd")).ToLocalChecked());
-      }
-    }
-    return Local<Value>::New(env->isolate(),Undefined(env->isolate()));
-}
-
-void FillStatsArray(double* fields, const uv_stat_t* s) {
-  fields[0] = s->st_dev;
-  fields[1] = s->st_mode;
-  fields[2] = s->st_nlink;
-  fields[3] = s->st_uid;
-  fields[4] = s->st_gid;
-  fields[5] = s->st_rdev;
-#if defined(__POSIX__)
-  fields[6] = s->st_blksize;
-#else
-  fields[6] = -1;
-#endif
-  fields[7] = s->st_ino;
-  fields[8] = s->st_size;
-#if defined(__POSIX__)
-  fields[9] = s->st_blocks;
-#else
-  fields[9] = -1;
-#endif
-// Dates.
-// NO-LINT because the fields are 'long' and we just want to cast to `unsigned`
-#define X(idx, name)                                           \
-  /* NOLINTNEXTLINE(runtime/int) */                            \
-  fields[idx] = ((unsigned long)(s->st_##name.tv_sec) * 1e3) + \
-  /* NOLINTNEXTLINE(runtime/int) */                            \
-                ((unsigned long)(s->st_##name.tv_nsec) / 1e6); \
-
-  X(10, atim)
-  X(11, mtim)
-  X(12, ctim)
-  X(13, birthtim)
-#undef X
-}
-
-// Used to speed up module loading.  Returns the contents of the file as
-// a string or undefined when the file cannot be opened.  The speedup
-// comes from not creating Error objects on failure.
-static void InternalModuleReadFile(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-  uv_loop_t* loop = env->event_loop();
-
-  CHECK(args[0]->IsString());
-  node::Utf8Value path(env->isolate(),  fs_(env, args[0], _FS_ACCESS_NONE));
-
-  if (strlen(*path) != path.length())
-    return;  // Contains a nul byte.
-
-  uv_fs_t open_req;
-  const int fd = uv_fs_open(loop, &open_req, *path, O_RDONLY, 0, nullptr);
-  uv_fs_req_cleanup(&open_req);
-
-  if (fd < 0) {
-    return;
-  }
-
-  const size_t kBlockSize = 32 << 10;
-  std::vector<char> chars;
-  int64_t offset = 0;
-  ssize_t numchars;
-  do {
-    const size_t start = chars.size();
-    chars.resize(start + kBlockSize);
-
-    uv_buf_t buf;
-    buf.base = &chars[start];
-    buf.len = kBlockSize;
-
-    uv_fs_t read_req;
-    numchars = uv_fs_read(loop, &read_req, fd, &buf, 1, offset, nullptr);
-    uv_fs_req_cleanup(&read_req);
-
-    CHECK_GE(numchars, 0);
-    offset += numchars;
-  } while (static_cast<size_t>(numchars) == kBlockSize);
-
-  uv_fs_t close_req;
-  CHECK_EQ(0, uv_fs_close(loop, &close_req, fd, nullptr));
-  uv_fs_req_cleanup(&close_req);
-
-  size_t start = 0;
-  if (offset >= 3 && 0 == memcmp(&chars[0], "\xEF\xBB\xBF", 3)) {
-    start = 3;  // Skip UTF-8 BOM.
-  }
-
-  Local<String> chars_string =
-      String::NewFromUtf8(env->isolate(),
-                          &chars[start],
-                          String::kNormalString,
-                          offset - start);
-  args.GetReturnValue().Set(chars_string);
-}
-
-// Used to speed up module loading.  Returns 0 if the path refers to
-// a file, 1 when it's a directory or < 0 on error (usually -ENOENT.)
-// The speedup comes from not creating thousands of Stat and Error objects.
-static void InternalModuleStat(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  CHECK(args[0]->IsString());
-  node::Utf8Value path(env->isolate(),  fs_(env, args[0], _FS_ACCESS_NONE));
-
-  uv_fs_t req;
-  int rc = uv_fs_stat(env->event_loop(), &req, *path, nullptr);
-  if (rc == 0) {
-    const uv_stat_t* const s = static_cast<const uv_stat_t*>(req.ptr);
-    rc = !!(s->st_mode & S_IFDIR);
-  }
-  uv_fs_req_cleanup(&req);
-
-  args.GetReturnValue().Set(rc);
-}
-
-static void Stat(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  if (args.Length() < 1)
-    return TYPE_ERROR("path required");
-
-  {
-    BufferValue path(env->isolate(), args[0]);
-    ASSERT_PATH(path)
-  }
-  BufferValue path(env->isolate(), fs_(env, args[0], _FS_ACCESS_RD));
-
-  if (*path != nullptr) {
-      if (args[1]->IsObject()) {
-        ASYNC_CALL(stat, args[1], UTF8, *path)
-      } else {
-        SYNC_CALL(stat, *path, *path)
-        FillStatsArray(env->fs_stats_field_array(),
-                       static_cast<const uv_stat_t*>(SYNC_REQ.ptr));
-      }
-  }
-}
-
-static void LStat(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  if (args.Length() < 1)
-    return TYPE_ERROR("path required");
-
-  {
-    BufferValue path(env->isolate(), args[0]);
-    ASSERT_PATH(path)
-  }
-  BufferValue path(env->isolate(), fs_(env, args[0], _FS_ACCESS_RD));
-
-  if (*path != nullptr) {
-      if (args[1]->IsObject()) {
-        ASYNC_CALL(lstat, args[1], UTF8, *path)
-      } else {
-        SYNC_CALL(lstat, *path, *path)
-        FillStatsArray(env->fs_stats_field_array(),
-                       static_cast<const uv_stat_t*>(SYNC_REQ.ptr));
-      }
-  }
-}
-
-static void FStat(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  if (args.Length() < 1)
-    return TYPE_ERROR("fd is required");
-  if (!args[0]->IsInt32())
-    return TYPE_ERROR("fd must be a file descriptor");
-
-  int fd = args[0]->Int32Value();
-
-  if (args[1]->IsObject()) {
-    ASYNC_CALL(fstat, args[1], UTF8, fd)
-  } else {
-    SYNC_CALL(fstat, nullptr, fd)
-    FillStatsArray(env->fs_stats_field_array(),
-                   static_cast<const uv_stat_t*>(SYNC_REQ.ptr));
-  }
-}
-
-static void Symlink(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  int len = args.Length();
-  if (len < 1)
-    return TYPE_ERROR("target path required");
-  if (len < 2)
-    return TYPE_ERROR("src path required");
-
-  {
-    BufferValue target(env->isolate(), args[0]);
-    ASSERT_PATH(target)
-    BufferValue path(env->isolate(), args[1]);
-    ASSERT_PATH(path)
-  }
-  BufferValue target(env->isolate(), fs_(env, args[0], _FS_ACCESS_RD|_FS_ACCESS_WR));
-  BufferValue path(env->isolate(), fs_(env, args[1], _FS_ACCESS_RD|_FS_ACCESS_WR));
-
-  int flags = 0;
-
-  if (args[2]->IsString()) {
-    node::Utf8Value mode(env->isolate(), args[2]);
-    if (strcmp(*mode, "dir") == 0) {
-      flags |= UV_FS_SYMLINK_DIR;
-    } else if (strcmp(*mode, "junction") == 0) {
-      flags |= UV_FS_SYMLINK_JUNCTION;
-    } else if (strcmp(*mode, "file") != 0) {
-      return env->ThrowError("Unknown symlink type");
-    }
-  }
-
-  if (*path != nullptr && *target != nullptr) {
-      if (args[3]->IsObject()) {
-        ASYNC_DEST_CALL(symlink, args[3], *path, UTF8, *target, *path, flags)
-      } else {
-        SYNC_DEST_CALL(symlink, *target, *path, *target, *path, flags)
-      }
-  }
-}
-
-static void Link(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  int len = args.Length();
-  if (len < 1)
-    return TYPE_ERROR("src path required");
-  if (len < 2)
-    return TYPE_ERROR("dest path required");
-
-  {
-    BufferValue src(env->isolate(), args[0]);
-    ASSERT_PATH(src)
-    BufferValue dest(env->isolate(), args[1]);
-    ASSERT_PATH(dest)
-  }
-  BufferValue src(env->isolate(), fs_(env, args[0], _FS_ACCESS_RD|_FS_ACCESS_WR));
-  BufferValue dest(env->isolate(), fs_(env, args[1], _FS_ACCESS_RD|_FS_ACCESS_WR));
-
-  if (*src != nullptr && *dest != nullptr) {
-      if (args[2]->IsObject()) {
-        ASYNC_DEST_CALL(link, args[2], *dest, UTF8, *src, *dest)
-      } else {
-        SYNC_DEST_CALL(link, *src, *dest, *src, *dest)
-      }
-  }
-}
-
-static void ReadLink(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  const int argc = args.Length();
-
-  if (argc < 1)
-    return TYPE_ERROR("path required");
-
-  {
-    BufferValue path(env->isolate(), args[0]);
-    ASSERT_PATH(path)
-  }
-  BufferValue path(env->isolate(), fs_(env, args[0], _FS_ACCESS_RD));
-
-  const enum encoding encoding = ParseEncoding(env->isolate(), args[1], UTF8);
-
-  Local<Value> callback = Null(env->isolate());
-  if (argc == 3)
-    callback = args[2];
-
-  if (*path != nullptr) {
-      if (callback->IsObject()) {
-        ASYNC_CALL(readlink, callback, encoding, *path)
-      } else {
-        SYNC_CALL(readlink, *path, *path)
-        const char* link_path = static_cast<const char*>(SYNC_REQ.ptr);
-
-        Local<Value> error;
-        MaybeLocal<Value> rc = StringBytes::Encode(env->isolate(),
-                                                   link_path,
-                                                   encoding,
-                                                   &error);
-        if (rc.IsEmpty()) {
-          // TODO(addaleax): Use `error` itself here.
-          return env->ThrowUVException(UV_EINVAL,
-                                       "readlink",
-                                       "Invalid character encoding for link",
-                                       *path);
-        }
-        rc = MaybeLocal<Value>(alias_(env, rc.ToLocalChecked()));
-        args.GetReturnValue().Set(rc.ToLocalChecked());
-      }
-  }
-}
-
-static void Rename(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  int len = args.Length();
-  if (len < 1)
-    return TYPE_ERROR("old path required");
-  if (len < 2)
-    return TYPE_ERROR("new path required");
-
-  {
-    BufferValue old_path(env->isolate(), args[0]);
-    ASSERT_PATH(old_path)
-    BufferValue new_path(env->isolate(), args[1]);
-    ASSERT_PATH(new_path)
-  }
-  BufferValue old_path(env->isolate(), fs_(env, args[0], _FS_ACCESS_RD|_FS_ACCESS_WR));
-  BufferValue new_path(env->isolate(), fs_(env, args[1], _FS_ACCESS_RD|_FS_ACCESS_WR));
-
-  if (*old_path != nullptr && *new_path != nullptr) {
-      if (args[2]->IsObject()) {
-        ASYNC_DEST_CALL(rename, args[2], *new_path, UTF8, *old_path, *new_path)
-      } else {
-        SYNC_DEST_CALL(rename, *old_path, *new_path, *old_path, *new_path)
-      }
-  }
-}
-
-static void FTruncate(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  if (args.Length() < 2)
-    return TYPE_ERROR("fd and length are required");
-  if (!args[0]->IsInt32())
-    return TYPE_ERROR("fd must be a file descriptor");
-
-  int fd = args[0]->Int32Value();
-
-  // FIXME(bnoordhuis) It's questionable to reject non-ints here but still
-  // allow implicit coercion from null or undefined to zero.  Probably best
-  // handled in lib/fs.js.
-  Local<Value> len_v(args[1]);
-  if (!len_v->IsUndefined() &&
-      !len_v->IsNull() &&
-      !IsInt64(len_v->NumberValue())) {
-    return env->ThrowTypeError("Not an integer");
-  }
-
-  const int64_t len = len_v->IntegerValue();
-
-  if (args[2]->IsObject()) {
-    ASYNC_CALL(ftruncate, args[2], UTF8, fd, len)
-  } else {
-    SYNC_CALL(ftruncate, 0, fd, len)
-  }
-}
-
-static void Fdatasync(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  if (args.Length() < 1)
-    return TYPE_ERROR("fd is required");
-  if (!args[0]->IsInt32())
-    return TYPE_ERROR("fd must be a file descriptor");
-
-  int fd = args[0]->Int32Value();
-
-  if (args[1]->IsObject()) {
-    ASYNC_CALL(fdatasync, args[1], UTF8, fd)
-  } else {
-    SYNC_CALL(fdatasync, 0, fd)
-  }
-}
-
-static void Fsync(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  if (args.Length() < 1)
-    return TYPE_ERROR("fd is required");
-  if (!args[0]->IsInt32())
-    return TYPE_ERROR("fd must be a file descriptor");
-
-  int fd = args[0]->Int32Value();
-
-  if (args[1]->IsObject()) {
-    ASYNC_CALL(fsync, args[1], UTF8, fd)
-  } else {
-    SYNC_CALL(fsync, 0, fd)
-  }
-}
-
-static void Unlink(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  if (args.Length() < 1)
-    return TYPE_ERROR("path required");
-
-  {
-    BufferValue path(env->isolate(), args[0]);
-    ASSERT_PATH(path)
-  }
-  BufferValue path(env->isolate(), fs_(env, args[0], _FS_ACCESS_RD|_FS_ACCESS_WR));
-
-  if (*path != nullptr) {
-      if (args[1]->IsObject()) {
-        ASYNC_CALL(unlink, args[1], UTF8, *path)
-      } else {
-        SYNC_CALL(unlink, *path, *path)
-      }
-  }
-}
-
-static void RMDir(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  if (args.Length() < 1)
-    return TYPE_ERROR("path required");
-
-  {
-    BufferValue path(env->isolate(), args[0]);
-    ASSERT_PATH(path)
-  }
-  BufferValue path(env->isolate(), fs_(env, args[0], _FS_ACCESS_RD|_FS_ACCESS_WR));
-
-  if (*path != nullptr) {
-      if (args[1]->IsObject()) {
-        ASYNC_CALL(rmdir, args[1], UTF8, *path)
-      } else {
-        SYNC_CALL(rmdir, *path, *path)
-      }
-  }
-}
-
-static void MKDir(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  if (args.Length() < 2)
-    return TYPE_ERROR("path and mode are required");
-  if (!args[1]->IsInt32())
-    return TYPE_ERROR("mode must be an integer");
-
-  {
-    BufferValue path(env->isolate(), args[0]);
-    ASSERT_PATH(path)
-  }
-  BufferValue path(env->isolate(), fs_(env, args[0], _FS_ACCESS_RD|_FS_ACCESS_WR));
-
-  int mode = static_cast<int>(args[1]->Int32Value());
-
-  if (*path != nullptr) {
-      if (args[2]->IsObject()) {
-        ASYNC_CALL(mkdir, args[2], UTF8, *path, mode)
-      } else {
-        SYNC_CALL(mkdir, *path, *path, mode)
-      }
-  }
-}
-
-static void RealPath(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  const int argc = args.Length();
-
-  if (argc < 1)
-    return TYPE_ERROR("path required");
-
-  {
-    BufferValue path(env->isolate(), args[0]);
-    ASSERT_PATH(path)
-  }
-  BufferValue path(env->isolate(), fs_(env, args[0], _FS_ACCESS_RD));
-
-  const enum encoding encoding = ParseEncoding(env->isolate(), args[1], UTF8);
-
-  Local<Value> callback = Null(env->isolate());
-  if (argc == 3)
-    callback = args[2];
-
-  if (*path != nullptr) {
-      if (callback->IsObject()) {
-        ASYNC_CALL(realpath, callback, encoding, *path);
-      } else {
-        SYNC_CALL(realpath, *path, *path);
-        const char* link_path = static_cast<const char*>(SYNC_REQ.ptr);
-
-        Local<Value> error;
-        MaybeLocal<Value> rc = StringBytes::Encode(env->isolate(),
-                                                   link_path,
-                                                   encoding,
-                                                   &error);
-        if (rc.IsEmpty()) {
-          // TODO(addaleax): Use `error` itself here.
-          return env->ThrowUVException(UV_EINVAL,
-                                       "realpath",
-                                       "Invalid character encoding for path",
-                                       *path);
-        }
-        rc = MaybeLocal<Value>(alias_(env, rc.ToLocalChecked()));
-        args.GetReturnValue().Set(rc.ToLocalChecked());
-      }
-  }
-}
-
-static void ReadDir(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  const int argc = args.Length();
-
-  if (argc < 1)
-    return TYPE_ERROR("path required");
-
-  {
-    BufferValue path(env->isolate(), args[0]);
-    ASSERT_PATH(path)
-  }
-  BufferValue path(env->isolate(), fs_(env, args[0], _FS_ACCESS_RD));
-
-  const enum encoding encoding = ParseEncoding(env->isolate(), args[1], UTF8);
-
-  Local<Value> callback = Null(env->isolate());
-  if (argc == 3)
-    callback = args[2];
-
-  if (*path != nullptr) {
-      if (callback->IsObject()) {
-        ASYNC_CALL(scandir, callback, encoding, *path, 0 /*flags*/)
-      } else {
-        SYNC_CALL(scandir, *path, *path, 0 /*flags*/)
-
-        CHECK_GE(SYNC_REQ.result, 0);
-        int r;
-        Local<Array> names = Array::New(env->isolate(), 0);
-        Local<Function> fn = env->push_values_to_array_function();
-        Local<Value> name_v[NODE_PUSH_VAL_TO_ARRAY_MAX];
-        size_t name_idx = 0;
-
-        for (int i = 0; ; i++) {
-          uv_dirent_t ent;
-
-          r = uv_fs_scandir_next(&SYNC_REQ, &ent);
-          if (r == UV_EOF)
-            break;
-          if (r != 0)
-            return env->ThrowUVException(r, "readdir", "", *path);
-
-          Local<Value> error;
-          MaybeLocal<Value> filename = StringBytes::Encode(env->isolate(),
-                                                           ent.name,
-                                                           encoding,
-                                                           &error);
-          if (filename.IsEmpty()) {
-            // TODO(addaleax): Use `error` itself here.
-            return env->ThrowUVException(UV_EINVAL,
-                                         "readdir",
-                                         "Invalid character encoding for filename",
-                                         *path);
-          }
-
-          name_v[name_idx++] = filename.ToLocalChecked();
-
-          if (name_idx >= arraysize(name_v)) {
-            fn->Call(env->context(), names, name_idx, name_v)
-                .ToLocalChecked();
-            name_idx = 0;
-          }
-        }
-
-        if (name_idx > 0) {
-          fn->Call(env->context(), names, name_idx, name_v).ToLocalChecked();
-        }
-
-        args.GetReturnValue().Set(names);
-      }
-  }
-}
-
-static void Open(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  int len = args.Length();
-  if (len < 1)
-    return TYPE_ERROR("path required");
-  if (len < 2)
-    return TYPE_ERROR("flags required");
-  if (len < 3)
-    return TYPE_ERROR("mode required");
-  if (!args[1]->IsInt32())
-    return TYPE_ERROR("flags must be an int");
-  if (!args[2]->IsInt32())
-    return TYPE_ERROR("mode must be an int");
-
-  int flags = args[1]->Int32Value();
-
-  int req_access = (flags&O_ACCMODE) == O_RDWR   ? _FS_ACCESS_RD|_FS_ACCESS_WR :
-                   (flags&O_ACCMODE) == O_WRONLY ? _FS_ACCESS_WR :
-                   (flags&O_ACCMODE) == O_RDONLY ? _FS_ACCESS_RD : _FS_ACCESS_NONE;
-
-  {
-    BufferValue path(env->isolate(), args[0]);
-    ASSERT_PATH(path)
-  }
-  BufferValue path(env->isolate(), fs_(env, args[0], req_access));
-
-  int mode = static_cast<int>(args[2]->Int32Value());
-
-  if (*path != nullptr) {
-      if (args[3]->IsObject()) {
-        ASYNC_CALL(open, args[3], UTF8, *path, flags, mode)
-      } else {
-        SYNC_CALL(open, *path, *path, flags, mode)
-        args.GetReturnValue().Set(SYNC_RESULT);
-      }
-  }
-}
-
-
-static void CopyFile(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  if (!args[0]->IsString())
-    return TYPE_ERROR("src must be a string");
-  if (!args[1]->IsString())
-    return TYPE_ERROR("dest must be a string");
-  if (!args[2]->IsInt32())
-    return TYPE_ERROR("flags must be an int");
-
-  BufferValue src(env->isolate(), args[0]);
-  ASSERT_PATH(src)
-  BufferValue dest(env->isolate(), args[1]);
-  ASSERT_PATH(dest)
-  int flags = args[2]->Int32Value();
-
-  if (args[3]->IsObject()) {
-    ASYNC_DEST_CALL(copyfile, args[3], *dest, UTF8, *src, *dest, flags)
-  } else {
-    SYNC_DEST_CALL(copyfile, *src, *dest, *src, *dest, flags)
-  }
-}
-
-
-// Wrapper for write(2).
-//
-// bytesWritten = write(fd, buffer, offset, length, position, callback)
-// 0 fd        integer. file descriptor
-// 1 buffer    the data to write
-// 2 offset    where in the buffer to start from
-// 3 length    how much to write
-// 4 position  if integer, position to write at in the file.
-//             if null, write from the current position
-static void WriteBuffer(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  if (!args[0]->IsInt32())
-    return env->ThrowTypeError("First argument must be file descriptor");
-
-  CHECK(node::Buffer::HasInstance(args[1]));
-
-  int fd = args[0]->Int32Value();
-  Local<Object> obj = args[1].As<Object>();
-  const char* buf = node::Buffer::Data(obj);
-  size_t buffer_length = node::Buffer::Length(obj);
-  size_t off = args[2]->Uint32Value();
-  size_t len = args[3]->Uint32Value();
-  int64_t pos = GET_OFFSET(args[4]);
-  Local<Value> req = args[5];
-
-  if (off > buffer_length)
-    return env->ThrowRangeError("offset out of bounds");
-  if (len > buffer_length)
-    return env->ThrowRangeError("length out of bounds");
-  if (off + len < off)
-    return env->ThrowRangeError("off + len overflow");
-  if (!node::Buffer::IsWithinBounds(off, len, buffer_length))
-    return env->ThrowRangeError("off + len > buffer.length");
-
-  buf += off;
-
-  uv_buf_t uvbuf = uv_buf_init(const_cast<char*>(buf), len);
-
-  if (req->IsObject()) {
-    ASYNC_CALL(write, req, UTF8, fd, &uvbuf, 1, pos)
-    return;
-  }
-
-  SYNC_CALL(write, nullptr, fd, &uvbuf, 1, pos)
-  args.GetReturnValue().Set(SYNC_RESULT);
-}
-
-
-// Wrapper for writev(2).
-//
-// bytesWritten = writev(fd, chunks, position, callback)
-// 0 fd        integer. file descriptor
-// 1 chunks    array of buffers to write
-// 2 position  if integer, position to write at in the file.
-//             if null, write from the current position
-static void WriteBuffers(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  CHECK(args[0]->IsInt32());
-  CHECK(args[1]->IsArray());
-
-  int fd = args[0]->Int32Value();
-  Local<Array> chunks = args[1].As<Array>();
-  int64_t pos = GET_OFFSET(args[2]);
-  Local<Value> req = args[3];
-
-  MaybeStackBuffer<uv_buf_t> iovs(chunks->Length());
-
-  for (uint32_t i = 0; i < iovs.length(); i++) {
-    Local<Value> chunk = chunks->Get(i);
-
-    if (!node::Buffer::HasInstance(chunk))
-      return env->ThrowTypeError("Array elements all need to be buffers");
-
-    iovs[i] = uv_buf_init(node::Buffer::Data(chunk), node::Buffer::Length(chunk));
-  }
-
-  if (req->IsObject()) {
-    ASYNC_CALL(write, req, UTF8, fd, *iovs, iovs.length(), pos)
-    return;
-  }
-
-  SYNC_CALL(write, nullptr, fd, *iovs, iovs.length(), pos)
-  args.GetReturnValue().Set(SYNC_RESULT);
-}
-
-
-// Wrapper for write(2).
-//
-// bytesWritten = write(fd, string, position, enc, callback)
-// 0 fd        integer. file descriptor
-// 1 string    non-buffer values are converted to strings
-// 2 position  if integer, position to write at in the file.
-//             if null, write from the current position
-// 3 enc       encoding of string
-static void WriteString(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  if (!args[0]->IsInt32())
-    return env->ThrowTypeError("First argument must be file descriptor");
-
-  Local<Value> req;
-  Local<Value> string = args[1];
-  int fd = args[0]->Int32Value();
-  char* buf = nullptr;
-  int64_t pos;
-  size_t len;
-  FSReqWrap::Ownership ownership = FSReqWrap::COPY;
-
-  // will assign buf and len if string was external
-  if (!StringBytes::GetExternalParts(string,
-                                     const_cast<const char**>(&buf),
-                                     &len)) {
-    enum encoding enc = ParseEncoding(env->isolate(), args[3], UTF8);
-    len = StringBytes::StorageSize(env->isolate(), string, enc);
-    buf = new char[len];
-    // StorageSize may return too large a char, so correct the actual length
-    // by the write size
-    len = StringBytes::Write(env->isolate(), buf, len, args[1], enc);
-    ownership = FSReqWrap::MOVE;
-  }
-  pos = GET_OFFSET(args[2]);
-  req = args[4];
-
-  uv_buf_t uvbuf = uv_buf_init(const_cast<char*>(buf), len);
-
-  if (!req->IsObject()) {
-    // SYNC_CALL returns on error.  Make sure to always free the memory.
-    struct Delete {
-      inline explicit Delete(char* pointer) : pointer_(pointer) {}
-      inline ~Delete() { delete[] pointer_; }
-      char* const pointer_;
-    };
-    Delete delete_on_return(ownership == FSReqWrap::MOVE ? buf : nullptr);
-    SYNC_CALL(write, nullptr, fd, &uvbuf, 1, pos)
-    return args.GetReturnValue().Set(SYNC_RESULT);
-  }
-
-  FSReqWrap* req_wrap =
-      FSReqWrap::New(env, req.As<Object>(), "write", buf, UTF8, ownership);
-  int err = uv_fs_write(env->event_loop(),
-                        req_wrap->req(),
-                        fd,
-                        &uvbuf,
-                        1,
-                        pos,
-                        After);
-  req_wrap->Dispatched();
-  if (err < 0) {
-    uv_fs_t* uv_req = req_wrap->req();
-    uv_req->result = err;
-    uv_req->path = nullptr;
-    After(uv_req);
-    return;
-  }
-
-  return args.GetReturnValue().Set(req_wrap->persistent());
-}
-
-
-/*
- * Wrapper for read(2).
- *
- * bytesRead = fs.read(fd, buffer, offset, length, position)
- *
- * 0 fd        integer. file descriptor
- * 1 buffer    instance of Buffer
- * 2 offset    integer. offset to start reading into inside buffer
- * 3 length    integer. length to read
- * 4 position  file position - null for current position
- *
- */
-static void Read(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  if (args.Length() < 2)
-    return TYPE_ERROR("fd and buffer are required");
-  if (!args[0]->IsInt32())
-    return TYPE_ERROR("fd must be a file descriptor");
-  if (!node::Buffer::HasInstance(args[1]))
-    return TYPE_ERROR("Second argument needs to be a buffer");
-
-  int fd = args[0]->Int32Value();
-
-  Local<Value> req;
-
-  size_t len;
-  int64_t pos;
-
-  char * buf = nullptr;
-
-  Local<Object> buffer_obj = args[1]->ToObject(env->isolate());
-  char *buffer_data = node::Buffer::Data(buffer_obj);
-  size_t buffer_length = node::Buffer::Length(buffer_obj);
-
-  size_t off = args[2]->Int32Value();
-  if (off >= buffer_length) {
-    return env->ThrowError("Offset is out of bounds");
-  }
-
-  len = args[3]->Int32Value();
-  if (!node::Buffer::IsWithinBounds(off, len, buffer_length))
-    return env->ThrowRangeError("Length extends beyond buffer");
-
-  pos = GET_OFFSET(args[4]);
-
-  buf = buffer_data + off;
-
-  uv_buf_t uvbuf = uv_buf_init(const_cast<char*>(buf), len);
-
-  req = args[5];
-
-  if (req->IsObject()) {
-    ASYNC_CALL(read, req, UTF8, fd, &uvbuf, 1, pos);
-  } else {
-    SYNC_CALL(read, 0, fd, &uvbuf, 1, pos)
-    args.GetReturnValue().Set(SYNC_RESULT);
-  }
-}
-
-
-/* fs.chmod(path, mode);
- * Wrapper for chmod(1) / EIO_CHMOD
- */
-static void Chmod(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  if (args.Length() < 2)
-    return TYPE_ERROR("path and mode are required");
-  if (!args[1]->IsInt32())
-    return TYPE_ERROR("mode must be an integer");
-
-  {
-    BufferValue path(env->isolate(), args[0]);
-    ASSERT_PATH(path)
-  }
-  BufferValue path(env->isolate(), fs_(env, args[0], _FS_ACCESS_RD|_FS_ACCESS_WR));
-
-  int mode = static_cast<int>(args[1]->Int32Value());
-
-  if (*path != nullptr) {
-      if (args[2]->IsObject()) {
-        ASYNC_CALL(chmod, args[2], UTF8, *path, mode);
-      } else {
-        SYNC_CALL(chmod, *path, *path, mode);
-      }
-  }
-}
-
-
-/* fs.fchmod(fd, mode);
- * Wrapper for fchmod(1) / EIO_FCHMOD
- */
-static void FChmod(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  if (args.Length() < 2)
-    return TYPE_ERROR("fd and mode are required");
-  if (!args[0]->IsInt32())
-    return TYPE_ERROR("fd must be a file descriptor");
-  if (!args[1]->IsInt32())
-    return TYPE_ERROR("mode must be an integer");
-
-  int fd = args[0]->Int32Value();
-  int mode = static_cast<int>(args[1]->Int32Value());
-
-  if (args[2]->IsObject()) {
-    ASYNC_CALL(fchmod, args[2], UTF8, fd, mode);
-  } else {
-    SYNC_CALL(fchmod, 0, fd, mode);
-  }
-}
-
-
-/* fs.chown(path, uid, gid);
- * Wrapper for chown(1) / EIO_CHOWN
- */
-static void Chown(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  int len = args.Length();
-  if (len < 1)
-    return TYPE_ERROR("path required");
-  if (len < 2)
-    return TYPE_ERROR("uid required");
-  if (len < 3)
-    return TYPE_ERROR("gid required");
-  if (!args[1]->IsUint32())
-    return TYPE_ERROR("uid must be an unsigned int");
-  if (!args[2]->IsUint32())
-    return TYPE_ERROR("gid must be an unsigned int");
-
-  {
-    BufferValue path(env->isolate(), args[0]);
-    ASSERT_PATH(path)
-  }
-  BufferValue path(env->isolate(), fs_(env, args[0], _FS_ACCESS_RD|_FS_ACCESS_WR));
-
-  uv_uid_t uid = static_cast<uv_uid_t>(args[1]->Uint32Value());
-  uv_gid_t gid = static_cast<uv_gid_t>(args[2]->Uint32Value());
-
-  if (*path != nullptr) {
-      if (args[3]->IsObject()) {
-        ASYNC_CALL(chown, args[3], UTF8, *path, uid, gid);
-      } else {
-        SYNC_CALL(chown, *path, *path, uid, gid);
-      }
-  }
-}
-
-
-/* fs.fchown(fd, uid, gid);
- * Wrapper for fchown(1) / EIO_FCHOWN
- */
-static void FChown(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  int len = args.Length();
-  if (len < 1)
-    return TYPE_ERROR("fd required");
-  if (len < 2)
-    return TYPE_ERROR("uid required");
-  if (len < 3)
-    return TYPE_ERROR("gid required");
-  if (!args[0]->IsInt32())
-    return TYPE_ERROR("fd must be an int");
-  if (!args[1]->IsUint32())
-    return TYPE_ERROR("uid must be an unsigned int");
-  if (!args[2]->IsUint32())
-    return TYPE_ERROR("gid must be an unsigned int");
-
-  int fd = args[0]->Int32Value();
-  uv_uid_t uid = static_cast<uv_uid_t>(args[1]->Uint32Value());
-  uv_gid_t gid = static_cast<uv_gid_t>(args[2]->Uint32Value());
-
-  if (args[3]->IsObject()) {
-    ASYNC_CALL(fchown, args[3], UTF8, fd, uid, gid);
-  } else {
-    SYNC_CALL(fchown, 0, fd, uid, gid);
-  }
-}
-
-
-static void UTimes(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  int len = args.Length();
-  if (len < 1)
-    return TYPE_ERROR("path required");
-  if (len < 2)
-    return TYPE_ERROR("atime required");
-  if (len < 3)
-    return TYPE_ERROR("mtime required");
-  if (!args[1]->IsNumber())
-    return TYPE_ERROR("atime must be a number");
-  if (!args[2]->IsNumber())
-    return TYPE_ERROR("mtime must be a number");
-
-  {
-    BufferValue path(env->isolate(), args[0]);
-    ASSERT_PATH(path)
-  }
-  BufferValue path(env->isolate(), fs_(env, args[0], _FS_ACCESS_RD|_FS_ACCESS_WR));
-
-  const double atime = static_cast<double>(args[1]->NumberValue());
-  const double mtime = static_cast<double>(args[2]->NumberValue());
-
-  if (*path != nullptr) {
-      if (args[3]->IsObject()) {
-        ASYNC_CALL(utime, args[3], UTF8, *path, atime, mtime);
-      } else {
-        SYNC_CALL(utime, *path, *path, atime, mtime);
-      }
-  }
-}
-
-static void FUTimes(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  int len = args.Length();
-  if (len < 1)
-    return TYPE_ERROR("fd required");
-  if (len < 2)
-    return TYPE_ERROR("atime required");
-  if (len < 3)
-    return TYPE_ERROR("mtime required");
-  if (!args[0]->IsInt32())
-    return TYPE_ERROR("fd must be an int");
-  if (!args[1]->IsNumber())
-    return TYPE_ERROR("atime must be a number");
-  if (!args[2]->IsNumber())
-    return TYPE_ERROR("mtime must be a number");
-
-  const int fd = args[0]->Int32Value();
-  const double atime = static_cast<double>(args[1]->NumberValue());
-  const double mtime = static_cast<double>(args[2]->NumberValue());
-
-  if (args[3]->IsObject()) {
-    ASYNC_CALL(futime, args[3], UTF8, fd, atime, mtime);
-  } else {
-    SYNC_CALL(futime, 0, fd, atime, mtime);
-  }
-}
-
-static void Mkdtemp(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  CHECK_GE(args.Length(), 2);
-
-  BufferValue tmpl(env->isolate(), args[0]);
-  if (*tmpl == nullptr)
-    return TYPE_ERROR("template must be a string or Buffer");
-
-  const enum encoding encoding = ParseEncoding(env->isolate(), args[1], UTF8);
-
-  if (args[2]->IsObject()) {
-    ASYNC_CALL(mkdtemp, args[2], encoding, *tmpl);
-  } else {
-    SYNC_CALL(mkdtemp, *tmpl, *tmpl);
-    const char* path = static_cast<const char*>(SYNC_REQ.path);
-
-    Local<Value> error;
-    MaybeLocal<Value> rc =
-        StringBytes::Encode(env->isolate(), path, encoding, &error);
-    if (rc.IsEmpty()) {
-      // TODO(addaleax): Use `error` itself here.
-      return env->ThrowUVException(UV_EINVAL,
-                                   "mkdtemp",
-                                   "Invalid character encoding for filename",
-                                   *tmpl);
-    }
-    rc = MaybeLocal<Value>(alias_(env, rc.ToLocalChecked()));
-    args.GetReturnValue().Set(rc.ToLocalChecked());
-  }
-}
-
-void GetStatValues(const FunctionCallbackInfo<Value>& args) {
-  Environment* env = Environment::GetCurrent(args);
-  double* fields = env->fs_stats_field_array();
-  if (fields == nullptr) {
-    // stat fields contains twice the number of entries because `fs.StatWatcher`
-    // needs room to store data for *two* `fs.Stats` instances.
-    fields = new double[2 * 14];
-    env->set_fs_stats_field_array(fields);
-  }
-  Local<ArrayBuffer> ab = ArrayBuffer::New(env->isolate(),
-                                           fields,
-                                           sizeof(double) * 2 * 14);
-  Local<Float64Array> fields_array = Float64Array::New(ab, 0, 2 * 14);
-  args.GetReturnValue().Set(fields_array);
-}
-
-void InitFs(Local<Object> target,
-            Local<Value> unused,
-            Local<Context> context,
-            void* priv) {
-  Environment* env = Environment::GetCurrent(context);
-
-  env->SetMethod(target, "access", Access);
-  env->SetMethod(target, "close", Close);
-  env->SetMethod(target, "open", Open);
-  env->SetMethod(target, "read", Read);
-  env->SetMethod(target, "fdatasync", Fdatasync);
-  env->SetMethod(target, "fsync", Fsync);
-  env->SetMethod(target, "rename", Rename);
-  env->SetMethod(target, "ftruncate", FTruncate);
-  env->SetMethod(target, "rmdir", RMDir);
-  env->SetMethod(target, "mkdir", MKDir);
-  env->SetMethod(target, "readdir", ReadDir);
-  env->SetMethod(target, "internalModuleReadFile", InternalModuleReadFile);
-  env->SetMethod(target, "internalModuleStat", InternalModuleStat);
-  env->SetMethod(target, "stat", Stat);
-  env->SetMethod(target, "lstat", LStat);
-  env->SetMethod(target, "fstat", FStat);
-  env->SetMethod(target, "link", Link);
-  env->SetMethod(target, "symlink", Symlink);
-  env->SetMethod(target, "readlink", ReadLink);
-  env->SetMethod(target, "unlink", Unlink);
-  env->SetMethod(target, "writeBuffer", WriteBuffer);
-  env->SetMethod(target, "writeBuffers", WriteBuffers);
-  env->SetMethod(target, "writeString", WriteString);
-  env->SetMethod(target, "realpath", RealPath);
-  env->SetMethod(target, "copyFile", CopyFile);
-
-  env->SetMethod(target, "chmod", Chmod);
-  env->SetMethod(target, "fchmod", FChmod);
-  // env->SetMethod(target, "lchmod", LChmod);
-
-  env->SetMethod(target, "chown", Chown);
-  env->SetMethod(target, "fchown", FChown);
-  // env->SetMethod(target, "lchown", LChown);
-
-  env->SetMethod(target, "utimes", UTimes);
-  env->SetMethod(target, "futimes", FUTimes);
-
-  env->SetMethod(target, "mkdtemp", Mkdtemp);
-
-  env->SetMethod(target, "getStatValues", GetStatValues);
-
-  StatWatcher::Initialize(env, target);
-
-  // Create FunctionTemplate for FSReqWrap
-  Local<FunctionTemplate> fst =
-      FunctionTemplate::New(env->isolate(), NewFSReqWrap);
-  fst->InstanceTemplate()->SetInternalFieldCount(1);
-  AsyncWrap::AddWrapMethods(env, fst);
-  Local<String> wrapString =
-      FIXED_ONE_BYTE_STRING(env->isolate(), "FSReqWrap");
-  fst->SetClassName(wrapString);
-  target->Set(wrapString, fst->GetFunction());
-}
-
-}  // end namespace node
-
-NODE_MODULE_CONTEXT_AWARE_BUILTIN(fs, nodedroid::InitFs)
diff --git a/LiquidCoreAndroid/src/main/cpp/node/nodedroid_file.h b/LiquidCoreAndroid/src/main/cpp/node/nodedroid_file.h
deleted file mode 100644
index 08d06b127c..0000000000
--- a/LiquidCoreAndroid/src/main/cpp/node/nodedroid_file.h
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-// nodedroid_file.h
-//
-// LiquidPlayer project
-// https://github.com/LiquidPlayer
-//
-// Edited by Eric Lange
-//
-// Based on node_file.h in node/src/node_file.h
-/*
- Copyright (c) 2016 Eric Lange. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- - Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef SRC_NODE_FILE_H_
-#define SRC_NODE_FILE_H_
-
-#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
-
-#include "node.h"
-#include "v8.h"
-
-namespace nodedroid {
-
-#define _FS_ACCESS_RD (1)
-#define _FS_ACCESS_WR (2)
-#define _FS_ACCESS_NONE (0)
-
-void InitFs(v8::Local<v8::Object> target);
-v8::Local<v8::Value> alias_(node::Environment *env, v8::Local<v8::Value> path);
-v8::Local<v8::Value> fs_(node::Environment *env, v8::Local<v8::Value> path, int req_access);
-v8::Local<v8::Value> chdir_(node::Environment *env, v8::Local<v8::Value> path);
-v8::Local<v8::Value> cwd_(node::Environment *env);
-void FillStatsArray(double* fields, const uv_stat_t* s);
-
-extern "C" node::node_module fs_module;
-
-}  // namespace nodedroid
-
-#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
-
-#endif  // SRC_NODE_FILE_H_
diff --git a/LiquidCoreAndroid/src/main/cpp/node/process_wrap.cc b/LiquidCoreAndroid/src/main/cpp/node/process_wrap.cc
deleted file mode 100644
index a15f174877..0000000000
--- a/LiquidCoreAndroid/src/main/cpp/node/process_wrap.cc
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// process_wrap.cc
-//
-// LiquidPlayer project
-// https://github.com/LiquidPlayer
-//
-// Edited by Eric Lange
-//
-// Based on process_wrap.cc in node/src/process_wrap.cc
-/*
- Copyright (c) 2016-17 Eric Lange. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- - Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#include "env.h"
-#include "env-inl.h"
-#include "handle_wrap.h"
-#include "node_wrap.h"
-#include "util.h"
-#include "util-inl.h"
-
-#include <string.h>
-#include <stdlib.h>
-
-namespace nodedroid {
-
-using v8::Local;
-using v8::Object;
-using v8::Value;
-using v8::Context;
-using v8::FunctionCallbackInfo;
-using v8::FunctionTemplate;
-
-using node::HandleWrap;
-using node::Environment;
-
-class ProcessWrap : public HandleWrap {
- public:
-  static void Initialize(Local<Object> target,
-                         Local<Value> unused,
-                         Local<Context> context) {
-    Environment* env = Environment::GetCurrent(context);
-    Local<FunctionTemplate> constructor = env->NewFunctionTemplate(New);
-    constructor->InstanceTemplate()->SetInternalFieldCount(1);
-    constructor->SetClassName(FIXED_ONE_BYTE_STRING(env->isolate(), "Process"));
-
-    // Disable all process manipulation capabilities for nodedroid
-    // We don't want mini-apps to have this much control
-    /*
-    env->SetProtoMethod(constructor, "close", HandleWrap::Close);
-
-    env->SetProtoMethod(constructor, "spawn", Spawn);
-    env->SetProtoMethod(constructor, "kill", Kill);
-
-    env->SetProtoMethod(constructor, "ref", HandleWrap::Ref);
-    env->SetProtoMethod(constructor, "unref", HandleWrap::Unref);
-    env->SetProtoMethod(constructor, "hasRef", HandleWrap::HasRef);
-    */
-
-    target->Set(FIXED_ONE_BYTE_STRING(env->isolate(), "Process"),
-                constructor->GetFunction());
-  }
-
-  size_t self_size() const override { return sizeof(*this); }
-
- private:
-  static void New(const FunctionCallbackInfo<Value>& args) {
-    // This constructor should not be exposed to public javascript.
-    // Therefore we assert that we are not trying to call this as a
-    // normal function.
-    CHECK(args.IsConstructCall());
-    Environment* env = Environment::GetCurrent(args);
-    new ProcessWrap(env, args.This());
-  }
-
-  ProcessWrap(Environment* env, Local<Object> object)
-      : HandleWrap(env,
-                   object,
-                   reinterpret_cast<uv_handle_t*>(&process_),
-                   AsyncWrap::PROVIDER_PROCESSWRAP) {
-  }
-
-  uv_process_t process_;
-};
-
-}  // namespace node
-
-NODE_MODULE_CONTEXT_AWARE_BUILTIN(process_wrap, nodedroid::ProcessWrap::Initialize)
diff --git a/LiquidCoreCommon/node/NodeInstance.cpp b/LiquidCoreCommon/node/NodeInstance.cpp
index 755ac86bc5..ad52cd0fa8 100644
--- a/LiquidCoreCommon/node/NodeInstance.cpp
+++ b/LiquidCoreCommon/node/NodeInstance.cpp
@@ -85,7 +85,7 @@ NodeInstance::NodeInstance(JNIEnv* env, jobject thiz) {
 
     node_main_thread = new std::thread(node_main_task,reinterpret_cast<void*>(this));
     on_start = nullptr;
-    on_node_started_data = nullptr;
+    callback_data = nullptr;
 }
 #endif
 
@@ -547,7 +547,7 @@ void NodeInstance::StartInspector(Environment* env, const char* path,
 #define JSC "Lorg/liquidplayer/javascript/JNIJSContext;"
 
 #ifdef __ANDROID__
-void NodeInstance::NotifyStart(boost::shared_ptr<JSContext> java_node_context, JSContextRef ctxRef) {
+void NodeInstance::NotifyStart(JSContextRef ctxRef, JSContextGroupRef groupRef) {
     JNIEnv *jenv;
     int getEnvStat = m_jvm->GetEnv((void**)&jenv, JNI_VERSION_1_6);
     if (getEnvStat == JNI_EDETACHED) {
@@ -572,9 +572,11 @@ void NodeInstance::NotifyStart(boost::shared_ptr<JSContext> java_node_context, J
         cls = super;
     } while (true);
     jenv->DeleteLocalRef(cls);
-    
+
+    auto group = const_cast<OpaqueJSContextGroup*>(groupRef);
+
     jenv->CallVoidMethod(m_JavaThis, mid,
-                         SharedWrap<JSContext>::New(java_node_context),
+                         SharedWrap<JSContext>::New(ctxRef->Context()),
                          SharedWrap<ContextGroup>::New(group->ContextGroup::shared_from_this()),
                          reinterpret_cast<jlong>(ctxRef)
                          );
@@ -624,14 +626,8 @@ inline int NodeInstance::StartInstance(void* group_, IsolateData* isolate_data,
   env.SetMethod(process, "reallyExit", Exit);
   env.SetMethod(process, "abort", Abort);
   env.SetMethod(process, "_kill", Kill);
+  NotifyStart(ctxRef, group);
 
-#ifdef __ANDROID__
-  if (m_jvm) {
-    NotifyStart(java_node_context, ctxRef);
-  }
-#else
-    NotifyStart(ctxRef, group);
-#endif
   /* ===End */
 
   const char* path = argc > 1 ? argv[1] : nullptr;
diff --git a/LiquidCoreCommon/node/NodeInstance.h b/LiquidCoreCommon/node/NodeInstance.h
index 45edc02dbf..53c9e85d3c 100644
--- a/LiquidCoreCommon/node/NodeInstance.h
+++ b/LiquidCoreCommon/node/NodeInstance.h
@@ -59,6 +59,7 @@
 
 #ifdef __ANDROID__
 # include "Common/Common.h"
+# include <JavaScriptCore/JavaScript.h>
 #endif
 
 using namespace node;
@@ -121,11 +122,7 @@ class NodeInstance {
 #endif
     uv_key_t thread_local_env;
 
-#ifdef __ANDROID__
-    void NotifyStart(boost::shared_ptr<JSContext> java_node_context, JSContextRef ctxRef);
-#else
     void NotifyStart(JSContextRef ctx, JSContextGroupRef group);
-#endif
 
     OnNodeStartedCallback on_start = nullptr;
     OnNodeExitCallback on_exit = nullptr;
diff --git a/LiquidCoreCommon/node/os_dependent.cpp b/LiquidCoreCommon/node/os_dependent.cpp
index 0969fb9830..518c5a3eb7 100644
--- a/LiquidCoreCommon/node/os_dependent.cpp
+++ b/LiquidCoreCommon/node/os_dependent.cpp
@@ -73,7 +73,7 @@ v8::Local<v8::Context> os_newContext(v8::Isolate *isolate, JSContextGroupRef gro
         JSClassDefinition definition = kJSClassDefinitionEmpty;
         definition.attributes |= kJSClassAttributeNoAutomaticPrototype;
         globalClass = JSClassCreate(&definition);
-        *ctxRef = JSGlobalContextCreateInGroup(group, globalClass);
+        *ctxRef = JSGlobalContextCreateInGroup(groupRef, globalClass);
     }
     JSClassRelease(globalClass);
     auto java_node_context = (*ctxRef)->Context();
@@ -85,7 +85,7 @@ void os_Dispose(JSContextGroupRef group, JSGlobalContextRef ctxRef)
 {
     JSGlobalContextRelease(ctxRef);
     JSContextGroupRelease(group);
-    group->Dispose();
+    const_cast<OpaqueJSContextGroup*>(group)->Dispose();
 }
 
 #endif