diff --git a/JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java b/JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java
index 212e87c7..89b6e826 100644
--- a/JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java
+++ b/JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java
@@ -39,12 +39,6 @@ public class CallbackBridge {
 */
     }
 
-
-    public static void sendData(int type, String data) {
-        nativeSendData(false, type, data);
-    }
-    public static native void nativeSendData(boolean isAndroid, int type, String data);
-    public static native boolean nativeSetInputReady(boolean ready);
     public static native String nativeClipboard(int action, byte[] copy);
     public static native void nativeSetGrabbing(boolean grab);
 }
diff --git a/JavaApp/src/main/java/org/lwjgl/glfw/GLFW.java b/JavaApp/src/main/java/org/lwjgl/glfw/GLFW.java
index 5e2ff69b..ddc301a9 100644
--- a/JavaApp/src/main/java/org/lwjgl/glfw/GLFW.java
+++ b/JavaApp/src/main/java/org/lwjgl/glfw/GLFW.java
@@ -500,7 +500,6 @@ public class GLFW
     private static double mGLFWInitialTime;
 
     private static ArrayMap<Long, GLFWWindowProperties> mGLFWWindowMap;
-    public static boolean mGLFWIsInputReady;
     public static final ByteBuffer keyDownBuffer = ByteBuffer.allocateDirect(317);
     private static final String PROP_WINDOW_WIDTH = "glfwstub.windowWidth";
     private static final String PROP_WINDOW_HEIGHT= "glfwstub.windowHeight";
@@ -791,9 +790,6 @@ public class GLFW
     }
 
     public static void glfwTerminate() {
-        mGLFWIsInputReady = false;
-        CallbackBridge.nativeSetInputReady(false);
-
         long __functionAddress = Functions.Terminate;
         invokeV(__functionAddress);
     }
@@ -1041,11 +1037,6 @@ public class GLFW
     public static void glfwSetWindowIcon(@NativeType("GLFWwindow *") long window, @Nullable @NativeType("GLFWimage const *") GLFWImage.Buffer images) {}
 
     public static void glfwPollEvents() {
-        if (!mGLFWIsInputReady) {
-            mGLFWIsInputReady = true;
-            CallbackBridge.nativeSetInputReady(true);
-        }
-
         for (Long ptr : mGLFWWindowMap.keySet()) callJV(ptr, Functions.PumpEvents);
         callV(Functions.RewindEvents);
     }
diff --git a/Natives/egl_bridge.m b/Natives/egl_bridge.m
index 87d0dee2..e6c8cfb4 100644
--- a/Natives/egl_bridge.m
+++ b/Natives/egl_bridge.m
@@ -98,6 +98,7 @@ void JNI_LWJGL_changeRenderer(const char* value_c) {
 }
 
 void pojavTerminate() {
+    CallbackBridge_nativeSetInputReady(NO);
     NSDebugLog(@"EGLBridge: Terminating");
 
     switch (config_renderer) {
diff --git a/Natives/input_bridge_v3.m b/Natives/input_bridge_v3.m
index 38f275b6..898b77f6 100644
--- a/Natives/input_bridge_v3.m
+++ b/Natives/input_bridge_v3.m
@@ -175,6 +175,7 @@ void handleFramebufferSizeJava(void* window, int w, int h) {
 }
 
 void pojavPumpEvents(void* window) {
+    CallbackBridge_nativeSetInputReady(YES);
     //__android_log_print(ANDROID_LOG_INFO, "input_bridge_v3", "pojavPumpevents %d", eventCounter);
     size_t counter = atomic_load_explicit(&eventCounter, memory_order_acquire);
     if((cLastX != cursorX || cLastY != cursorY) && GLFW_invoke_CursorPos) {
@@ -303,16 +304,6 @@ JNIEXPORT jstring JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeClipboard(JNI
     return UIKit_accessClipboard(env, action, copySrc);
 }
 
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSetInputReady(JNIEnv* env, jclass clazz, jboolean inputReady) {
-    //NSDebugLog(@"Debug: Changing input state, isReady=%d, isUseStackQueueCall=%d\n", inputReady, isUseStackQueueCall);
-    isInputReady = inputReady;
-    if (isUseStackQueueCall) {
-        sendData(EVENT_TYPE_FRAMEBUFFER_SIZE, windowWidth, windowHeight, 0, 0);
-        sendData(EVENT_TYPE_WINDOW_SIZE, windowWidth, windowHeight, 0, 0);
-    }
-    return isUseStackQueueCall;
-}
-
 JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSetGrabbing(JNIEnv* env, jclass clazz, jboolean grabbing, jfloat xset, jfloat yset) {
     isGrabbing = grabbing;
 
@@ -336,6 +327,20 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeIsGrabbing(J
     return isGrabbing;
 }
 
+void CallbackBridge_nativeSetInputReady(BOOL inputReady) {
+    isInputReady = inputReady;
+/*
+    if (inputReady) {
+        if (GLFW_invoke_FramebufferSize) {
+            GLFW_invoke_FramebufferSize((void*) showingWindow, windowWidth, windowHeight);
+        }
+        if (GLFW_invoke_WindowSize) {
+            GLFW_invoke_FramebufferSize((void*) showingWindow, windowWidth, windowHeight);
+        }
+    }
+*/
+}
+
 BOOL CallbackBridge_nativeSendChar(jchar codepoint /* jint codepoint */) {
     if (GLFW_invoke_Char && isInputReady) {
         if (isUseStackQueueCall) {
diff --git a/Natives/utils.h b/Natives/utils.h
index 38e12fe6..bc9ead8d 100644
--- a/Natives/utils.h
+++ b/Natives/utils.h
@@ -94,6 +94,7 @@ void callback_LauncherViewController_installMinecraft();
 void callback_SurfaceViewController_launchMinecraft(int width, int height);
 int callback_SurfaceViewController_touchHotbar(CGFloat x, CGFloat y);
 
+void CallbackBridge_nativeSetInputReady(BOOL inputReady);
 BOOL CallbackBridge_nativeSendChar(jchar codepoint /* jint codepoint */);
 BOOL CallbackBridge_nativeSendCharMods(jchar codepoint, int mods);
 void CallbackBridge_nativeSendCursorPos(char event, CGFloat x, CGFloat y);