diff --git a/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java b/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
index 073a104e89a..438fd403a65 100644
--- a/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
+++ b/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
@@ -5,20 +5,12 @@
 package org.qtproject.qt.android.bindings;
 
 import android.app.Activity;
-import android.app.Dialog;
-import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
-import android.content.res.Resources.Theme;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Browser;
-import android.util.AttributeSet;
-import android.view.ActionMode;
-import android.view.ActionMode.Callback;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.KeyEvent;
@@ -26,15 +18,10 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.WindowManager.LayoutParams;
-import android.view.accessibility.AccessibilityEvent;
-
-import org.qtproject.qt.android.QtNative;
 
 import org.qtproject.qt.android.QtActivityLoader;
 import org.qtproject.qt.android.QtLoader;
 
-
 public class QtActivity extends Activity
 {
     public static final String EXTRA_SOURCE_INFO = "org.qtproject.qt.android.sourceInfo";
@@ -85,154 +72,6 @@ public class QtActivity extends Activity
     /////////////// PLEASE DO NOT CHANGE THE FOLLOWING CODE //////////////////////////
     //////////////////////////////////////////////////////////////////////////////////
 
-    @Override
-    public boolean dispatchKeyEvent(KeyEvent event)
-    {
-        if (QtLoader.m_delegateObject != null && QtLoader.dispatchKeyEvent != null)
-            return (Boolean) QtLoader.invokeDelegateMethod(QtLoader.dispatchKeyEvent, event);
-        else
-            return super.dispatchKeyEvent(event);
-    }
-    public boolean super_dispatchKeyEvent(KeyEvent event)
-    {
-        return super.dispatchKeyEvent(event);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event)
-    {
-        if (QtLoader.m_delegateObject != null && QtLoader.dispatchPopulateAccessibilityEvent != null)
-            return (Boolean) QtLoader.invokeDelegateMethod(QtLoader.dispatchPopulateAccessibilityEvent, event);
-        else
-            return super.dispatchPopulateAccessibilityEvent(event);
-    }
-    public boolean super_dispatchPopulateAccessibilityEvent(AccessibilityEvent event)
-    {
-        return super.dispatchPopulateAccessibilityEvent(event);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean dispatchTouchEvent(MotionEvent ev)
-    {
-        if (QtLoader.m_delegateObject != null && QtLoader.dispatchTouchEvent != null)
-            return (Boolean) QtLoader.invokeDelegateMethod(QtLoader.dispatchTouchEvent, ev);
-        else
-            return super.dispatchTouchEvent(ev);
-    }
-    public boolean super_dispatchTouchEvent(MotionEvent event)
-    {
-        return super.dispatchTouchEvent(event);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean dispatchTrackballEvent(MotionEvent ev)
-    {
-        if (QtLoader.m_delegateObject != null && QtLoader.dispatchTrackballEvent != null)
-            return (Boolean) QtLoader.invokeDelegateMethod(QtLoader.dispatchTrackballEvent, ev);
-        else
-            return super.dispatchTrackballEvent(ev);
-    }
-    public boolean super_dispatchTrackballEvent(MotionEvent event)
-    {
-        return super.dispatchTrackballEvent(event);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data)
-    {
-
-        if (QtLoader.m_delegateObject != null && QtLoader.onActivityResult != null) {
-            QtLoader.invokeDelegateMethod(QtLoader.onActivityResult, requestCode, resultCode, data);
-            return;
-        }
-        super.onActivityResult(requestCode, resultCode, data);
-    }
-    public void super_onActivityResult(int requestCode, int resultCode, Intent data)
-    {
-        super.onActivityResult(requestCode, resultCode, data);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    protected void onApplyThemeResource(Theme theme, int resid, boolean first)
-    {
-        if (!QtLoader.invokeDelegate(theme, resid, first).invoked)
-            super.onApplyThemeResource(theme, resid, first);
-    }
-    public void super_onApplyThemeResource(Theme theme, int resid, boolean first)
-    {
-        super.onApplyThemeResource(theme, resid, first);
-    }
-    //---------------------------------------------------------------------------
-
-
-    @Override
-    protected void onChildTitleChanged(Activity childActivity, CharSequence title)
-    {
-        if (!QtLoader.invokeDelegate(childActivity, title).invoked)
-            super.onChildTitleChanged(childActivity, title);
-    }
-    public void super_onChildTitleChanged(Activity childActivity, CharSequence title)
-    {
-        super.onChildTitleChanged(childActivity, title);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig)
-    {
-        if (!QtLoader.invokeDelegate(newConfig).invoked)
-            super.onConfigurationChanged(newConfig);
-    }
-    public void super_onConfigurationChanged(Configuration newConfig)
-    {
-        super.onConfigurationChanged(newConfig);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onContentChanged()
-    {
-        if (!QtLoader.invokeDelegate().invoked)
-            super.onContentChanged();
-    }
-    public void super_onContentChanged()
-    {
-        super.onContentChanged();
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean onContextItemSelected(MenuItem item)
-    {
-        QtLoader.InvokeResult res = QtLoader.invokeDelegate(item);
-        if (res.invoked)
-            return (Boolean)res.methodReturns;
-        else
-            return super.onContextItemSelected(item);
-    }
-    public boolean super_onContextItemSelected(MenuItem item)
-    {
-        return super.onContextItemSelected(item);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onContextMenuClosed(Menu menu)
-    {
-        if (!QtLoader.invokeDelegate(menu).invoked)
-            super.onContextMenuClosed(menu);
-    }
-    public void super_onContextMenuClosed(Menu menu)
-    {
-        super.onContextMenuClosed(menu);
-    }
-    //---------------------------------------------------------------------------
-
     protected void onCreateHook(Bundle savedInstanceState) {
         m_loader.APPLICATION_PARAMETERS = APPLICATION_PARAMETERS;
         m_loader.ENVIRONMENT_VARIABLES = ENVIRONMENT_VARIABLES;
@@ -270,7 +109,70 @@ public class QtActivity extends Activity
         onCreateHook(savedInstanceState);
         addReferrer(getIntent());
     }
-    //---------------------------------------------------------------------------
+
+    @Override
+    public boolean dispatchKeyEvent(KeyEvent event)
+    {
+        if (QtLoader.m_delegateObject != null && QtLoader.dispatchKeyEvent != null)
+            return (Boolean) QtLoader.invokeDelegateMethod(QtLoader.dispatchKeyEvent, event);
+        else
+            return super.dispatchKeyEvent(event);
+    }
+    public boolean super_dispatchKeyEvent(KeyEvent event)
+    {
+        return super.dispatchKeyEvent(event);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data)
+    {
+
+        if (QtLoader.m_delegateObject != null && QtLoader.onActivityResult != null) {
+            QtLoader.invokeDelegateMethod(QtLoader.onActivityResult, requestCode, resultCode, data);
+            return;
+        }
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+    public void super_onActivityResult(int requestCode, int resultCode, Intent data)
+    {
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig)
+    {
+        if (!QtLoader.invokeDelegate(newConfig).invoked)
+            super.onConfigurationChanged(newConfig);
+    }
+    public void super_onConfigurationChanged(Configuration newConfig)
+    {
+        super.onConfigurationChanged(newConfig);
+    }
+
+    @Override
+    public boolean onContextItemSelected(MenuItem item)
+    {
+        QtLoader.InvokeResult res = QtLoader.invokeDelegate(item);
+        if (res.invoked)
+            return (Boolean)res.methodReturns;
+        else
+            return super.onContextItemSelected(item);
+    }
+    public boolean super_onContextItemSelected(MenuItem item)
+    {
+        return super.onContextItemSelected(item);
+    }
+
+    @Override
+    public void onContextMenuClosed(Menu menu)
+    {
+        if (!QtLoader.invokeDelegate(menu).invoked)
+            super.onContextMenuClosed(menu);
+    }
+    public void super_onContextMenuClosed(Menu menu)
+    {
+        super.onContextMenuClosed(menu);
+    }
 
     @Override
     public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo)
@@ -282,22 +184,6 @@ public class QtActivity extends Activity
     {
         super.onCreateContextMenu(menu, v, menuInfo);
     }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public CharSequence onCreateDescription()
-    {
-        QtLoader.InvokeResult res = QtLoader.invokeDelegate();
-        if (res.invoked)
-            return (CharSequence)res.methodReturns;
-        else
-            return super.onCreateDescription();
-    }
-    public CharSequence super_onCreateDescription()
-    {
-        return super.onCreateDescription();
-    }
-    //---------------------------------------------------------------------------
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu)
@@ -312,54 +198,6 @@ public class QtActivity extends Activity
     {
         return super.onCreateOptionsMenu(menu);
     }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean onCreatePanelMenu(int featureId, Menu menu)
-    {
-        QtLoader.InvokeResult res = QtLoader.invokeDelegate(featureId, menu);
-        if (res.invoked)
-            return (Boolean)res.methodReturns;
-        else
-            return super.onCreatePanelMenu(featureId, menu);
-    }
-    public boolean super_onCreatePanelMenu(int featureId, Menu menu)
-    {
-        return super.onCreatePanelMenu(featureId, menu);
-    }
-    //---------------------------------------------------------------------------
-
-
-    @Override
-    public View onCreatePanelView(int featureId)
-    {
-        QtLoader.InvokeResult res = QtLoader.invokeDelegate(featureId);
-        if (res.invoked)
-            return (View)res.methodReturns;
-        else
-            return super.onCreatePanelView(featureId);
-    }
-    public View super_onCreatePanelView(int featureId)
-    {
-        return super.onCreatePanelView(featureId);
-    }
-
-    //---------------------------------------------------------------------------
-
-    @Override
-    public View onCreateView(String name, Context context, AttributeSet attrs)
-    {
-        QtLoader.InvokeResult res = QtLoader.invokeDelegate(name, context, attrs);
-        if (res.invoked)
-            return (View)res.methodReturns;
-        else
-            return super.onCreateView(name, context, attrs);
-    }
-    public View super_onCreateView(String name, Context context, AttributeSet attrs)
-    {
-        return super.onCreateView(name, context, attrs);
-    }
-    //---------------------------------------------------------------------------
 
     @Override
     protected void onDestroy()
@@ -367,8 +205,6 @@ public class QtActivity extends Activity
         super.onDestroy();
         QtLoader.invokeDelegate();
     }
-    //---------------------------------------------------------------------------
-
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event)
@@ -382,22 +218,6 @@ public class QtActivity extends Activity
     {
         return super.onKeyDown(keyCode, event);
     }
-    //---------------------------------------------------------------------------
-
-
-    @Override
-    public boolean onKeyMultiple(int keyCode, int repeatCount, KeyEvent event)
-    {
-        if (QtLoader.m_delegateObject != null && QtLoader.onKeyMultiple != null)
-            return (Boolean) QtLoader.invokeDelegateMethod(QtLoader.onKeyMultiple, keyCode, repeatCount, event);
-        else
-            return super.onKeyMultiple(keyCode, repeatCount, event);
-    }
-    public boolean super_onKeyMultiple(int keyCode, int repeatCount, KeyEvent event)
-    {
-        return super.onKeyMultiple(keyCode, repeatCount, event);
-    }
-    //---------------------------------------------------------------------------
 
     @Override
     public boolean onKeyUp(int keyCode, KeyEvent event)
@@ -411,45 +231,6 @@ public class QtActivity extends Activity
     {
         return super.onKeyUp(keyCode, event);
     }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onLowMemory()
-    {
-        if (!QtLoader.invokeDelegate().invoked)
-            super.onLowMemory();
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean onMenuItemSelected(int featureId, MenuItem item)
-    {
-        QtLoader.InvokeResult res = QtLoader.invokeDelegate(featureId, item);
-        if (res.invoked)
-            return (Boolean)res.methodReturns;
-        else
-            return super.onMenuItemSelected(featureId, item);
-    }
-    public boolean super_onMenuItemSelected(int featureId, MenuItem item)
-    {
-        return super.onMenuItemSelected(featureId, item);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean onMenuOpened(int featureId, Menu menu)
-    {
-        QtLoader.InvokeResult res = QtLoader.invokeDelegate(featureId, menu);
-        if (res.invoked)
-            return (Boolean)res.methodReturns;
-        else
-            return super.onMenuOpened(featureId, menu);
-    }
-    public boolean super_onMenuOpened(int featureId, Menu menu)
-    {
-        return super.onMenuOpened(featureId, menu);
-    }
-    //---------------------------------------------------------------------------
 
     @Override
     protected void onNewIntent(Intent intent)
@@ -462,7 +243,6 @@ public class QtActivity extends Activity
     {
         super.onNewIntent(intent);
     }
-    //---------------------------------------------------------------------------
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item)
@@ -477,7 +257,6 @@ public class QtActivity extends Activity
     {
         return super.onOptionsItemSelected(item);
     }
-    //---------------------------------------------------------------------------
 
     @Override
     public void onOptionsMenuClosed(Menu menu)
@@ -489,19 +268,6 @@ public class QtActivity extends Activity
     {
         super.onOptionsMenuClosed(menu);
     }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onPanelClosed(int featureId, Menu menu)
-    {
-        if (!QtLoader.invokeDelegate(featureId, menu).invoked)
-            super.onPanelClosed(featureId, menu);
-    }
-    public void super_onPanelClosed(int featureId, Menu menu)
-    {
-        super.onPanelClosed(featureId, menu);
-    }
-    //---------------------------------------------------------------------------
 
     @Override
     protected void onPause()
@@ -509,23 +275,6 @@ public class QtActivity extends Activity
         super.onPause();
         QtLoader.invokeDelegate();
     }
-    //---------------------------------------------------------------------------
-
-    @Override
-    protected void onPostCreate(Bundle savedInstanceState)
-    {
-        super.onPostCreate(savedInstanceState);
-        QtLoader.invokeDelegate(savedInstanceState);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    protected void onPostResume()
-    {
-        super.onPostResume();
-        QtLoader.invokeDelegate();
-    }
-    //---------------------------------------------------------------------------
 
     @Override
     public boolean onPrepareOptionsMenu(Menu menu)
@@ -540,22 +289,6 @@ public class QtActivity extends Activity
     {
         return super.onPrepareOptionsMenu(menu);
     }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean onPreparePanel(int featureId, View view, Menu menu)
-    {
-        QtLoader.InvokeResult res = QtLoader.invokeDelegate(featureId, view, menu);
-        if (res.invoked)
-            return (Boolean)res.methodReturns;
-        else
-            return super.onPreparePanel(featureId, view, menu);
-    }
-    public boolean super_onPreparePanel(int featureId, View view, Menu menu)
-    {
-        return super.onPreparePanel(featureId, view, menu);
-    }
-    //---------------------------------------------------------------------------
 
     @Override
     protected void onRestart()
@@ -563,7 +296,6 @@ public class QtActivity extends Activity
         super.onRestart();
         QtLoader.invokeDelegate();
     }
-    //---------------------------------------------------------------------------
 
     @Override
     protected void onRestoreInstanceState(Bundle savedInstanceState)
@@ -575,7 +307,6 @@ public class QtActivity extends Activity
     {
         super.onRestoreInstanceState(savedInstanceState);
     }
-    //---------------------------------------------------------------------------
 
     @Override
     protected void onResume()
@@ -583,7 +314,6 @@ public class QtActivity extends Activity
         super.onResume();
         QtLoader.invokeDelegate();
     }
-    //---------------------------------------------------------------------------
 
     @Override
     public Object onRetainNonConfigurationInstance()
@@ -598,7 +328,6 @@ public class QtActivity extends Activity
     {
         return super.onRetainNonConfigurationInstance();
     }
-    //---------------------------------------------------------------------------
 
     @Override
     protected void onSaveInstanceState(Bundle outState)
@@ -611,22 +340,6 @@ public class QtActivity extends Activity
         super.onSaveInstanceState(outState);
 
     }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean onSearchRequested()
-    {
-        QtLoader.InvokeResult res = QtLoader.invokeDelegate();
-        if (res.invoked)
-            return (Boolean)res.methodReturns;
-        else
-            return super.onSearchRequested();
-    }
-    public boolean super_onSearchRequested()
-    {
-        return super.onSearchRequested();
-    }
-    //---------------------------------------------------------------------------
 
     @Override
     protected void onStart()
@@ -634,7 +347,6 @@ public class QtActivity extends Activity
         super.onStart();
         QtLoader.invokeDelegate();
     }
-    //---------------------------------------------------------------------------
 
     @Override
     protected void onStop()
@@ -642,83 +354,6 @@ public class QtActivity extends Activity
         super.onStop();
         QtLoader.invokeDelegate();
     }
-    //---------------------------------------------------------------------------
-
-    @Override
-    protected void onTitleChanged(CharSequence title, int color)
-    {
-        if (!QtLoader.invokeDelegate(title, color).invoked)
-            super.onTitleChanged(title, color);
-    }
-    public void super_onTitleChanged(CharSequence title, int color)
-    {
-        super.onTitleChanged(title, color);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event)
-    {
-        if (QtLoader.m_delegateObject != null  && QtLoader.onTouchEvent != null)
-            return (Boolean) QtLoader.invokeDelegateMethod(QtLoader.onTouchEvent, event);
-        else
-            return super.onTouchEvent(event);
-    }
-    public boolean super_onTouchEvent(MotionEvent event)
-    {
-        return super.onTouchEvent(event);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean onTrackballEvent(MotionEvent event)
-    {
-        if (QtLoader.m_delegateObject != null  && QtLoader.onTrackballEvent != null)
-            return (Boolean) QtLoader.invokeDelegateMethod(QtLoader.onTrackballEvent, event);
-        else
-            return super.onTrackballEvent(event);
-    }
-    public boolean super_onTrackballEvent(MotionEvent event)
-    {
-        return super.onTrackballEvent(event);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onUserInteraction()
-    {
-        if (!QtLoader.invokeDelegate().invoked)
-            super.onUserInteraction();
-    }
-    public void super_onUserInteraction()
-    {
-        super.onUserInteraction();
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    protected void onUserLeaveHint()
-    {
-        if (!QtLoader.invokeDelegate().invoked)
-            super.onUserLeaveHint();
-    }
-    public void super_onUserLeaveHint()
-    {
-        super.onUserLeaveHint();
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onWindowAttributesChanged(LayoutParams params)
-    {
-        if (!QtLoader.invokeDelegate(params).invoked)
-            super.onWindowAttributesChanged(params);
-    }
-    public void super_onWindowAttributesChanged(LayoutParams params)
-    {
-        super.onWindowAttributesChanged(params);
-    }
-    //---------------------------------------------------------------------------
 
     @Override
     public void onWindowFocusChanged(boolean hasFocus)
@@ -730,149 +365,7 @@ public class QtActivity extends Activity
     {
         super.onWindowFocusChanged(hasFocus);
     }
-    //---------------------------------------------------------------------------
 
-    //////////////// Activity API 5 /////////////
-//@ANDROID-5
-    @Override
-    public void onAttachedToWindow()
-    {
-        if (!QtLoader.invokeDelegate().invoked)
-            super.onAttachedToWindow();
-    }
-    public void super_onAttachedToWindow()
-    {
-        super.onAttachedToWindow();
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onBackPressed()
-    {
-        if (!QtLoader.invokeDelegate().invoked)
-            super.onBackPressed();
-    }
-    public void super_onBackPressed()
-    {
-        super.onBackPressed();
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onDetachedFromWindow()
-    {
-        if (!QtLoader.invokeDelegate().invoked)
-            super.onDetachedFromWindow();
-    }
-    public void super_onDetachedFromWindow()
-    {
-        super.onDetachedFromWindow();
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean onKeyLongPress(int keyCode, KeyEvent event)
-    {
-        if (QtLoader.m_delegateObject != null  && QtLoader.onKeyLongPress != null)
-            return (Boolean) QtLoader.invokeDelegateMethod(QtLoader.onKeyLongPress, keyCode, event);
-        else
-            return super.onKeyLongPress(keyCode, event);
-    }
-    public boolean super_onKeyLongPress(int keyCode, KeyEvent event)
-    {
-        return super.onKeyLongPress(keyCode, event);
-    }
-    //---------------------------------------------------------------------------
-//@ANDROID-5
-
-    //////////////// Activity API 11 /////////////
-
-//@ANDROID-11
-    @Override
-    public boolean dispatchKeyShortcutEvent(KeyEvent event)
-    {
-        if (QtLoader.m_delegateObject != null  && QtLoader.dispatchKeyShortcutEvent != null)
-            return (Boolean) QtLoader.invokeDelegateMethod(QtLoader.dispatchKeyShortcutEvent, event);
-        else
-            return super.dispatchKeyShortcutEvent(event);
-    }
-    public boolean super_dispatchKeyShortcutEvent(KeyEvent event)
-    {
-        return super.dispatchKeyShortcutEvent(event);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onActionModeFinished(ActionMode mode)
-    {
-        if (!QtLoader.invokeDelegate(mode).invoked)
-            super.onActionModeFinished(mode);
-    }
-    public void super_onActionModeFinished(ActionMode mode)
-    {
-        super.onActionModeFinished(mode);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onActionModeStarted(ActionMode mode)
-    {
-        if (!QtLoader.invokeDelegate(mode).invoked)
-            super.onActionModeStarted(mode);
-    }
-    public void super_onActionModeStarted(ActionMode mode)
-    {
-        super.onActionModeStarted(mode);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public View onCreateView(View parent, String name, Context context, AttributeSet attrs)
-    {
-        QtLoader.InvokeResult res = QtLoader.invokeDelegate(parent, name, context, attrs);
-        if (res.invoked)
-            return (View)res.methodReturns;
-        else
-            return super.onCreateView(parent, name, context, attrs);
-    }
-    public View super_onCreateView(View parent, String name, Context context,
-            AttributeSet attrs) {
-        return super.onCreateView(parent, name, context, attrs);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean onKeyShortcut(int keyCode, KeyEvent event)
-    {
-        if (QtLoader.m_delegateObject != null  && QtLoader.onKeyShortcut != null)
-            return (Boolean) QtLoader.invokeDelegateMethod(QtLoader.onKeyShortcut, keyCode,event);
-        else
-            return super.onKeyShortcut(keyCode, event);
-    }
-    public boolean super_onKeyShortcut(int keyCode, KeyEvent event)
-    {
-        return super.onKeyShortcut(keyCode, event);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public ActionMode onWindowStartingActionMode(Callback callback)
-    {
-        QtLoader.InvokeResult res = QtLoader.invokeDelegate(callback);
-        if (res.invoked)
-            return (ActionMode)res.methodReturns;
-        else
-            return super.onWindowStartingActionMode(callback);
-    }
-    public ActionMode super_onWindowStartingActionMode(Callback callback)
-    {
-        return super.onWindowStartingActionMode(callback);
-    }
-    //---------------------------------------------------------------------------
-//@ANDROID-11
-    //////////////// Activity API 12 /////////////
-
-//@ANDROID-12
     @Override
     public boolean dispatchGenericMotionEvent(MotionEvent ev)
     {
@@ -885,28 +378,13 @@ public class QtActivity extends Activity
     {
         return super.dispatchGenericMotionEvent(event);
     }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean onGenericMotionEvent(MotionEvent event)
-    {
-        if (QtLoader.m_delegateObject != null  && QtLoader.onGenericMotionEvent != null)
-            return (Boolean) QtLoader.invokeDelegateMethod(QtLoader.onGenericMotionEvent, event);
-        else
-            return super.onGenericMotionEvent(event);
-    }
-    public boolean super_onGenericMotionEvent(MotionEvent event)
-    {
-        return super.onGenericMotionEvent(event);
-    }
-    //---------------------------------------------------------------------------
-//@ANDROID-12
 
     public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults)
     {
         if (QtLoader.m_delegateObject != null && QtLoader.onRequestPermissionsResult != null) {
-            QtLoader.invokeDelegateMethod(QtLoader.onRequestPermissionsResult, requestCode , permissions, grantResults);
-            return;
+            QtLoader.invokeDelegateMethod(QtLoader.onRequestPermissionsResult, requestCode ,
+                    permissions, grantResults);
         }
     }
+    //---------------------------------------------------------------------------
 }
diff --git a/src/android/java/src/org/qtproject/qt/android/bindings/QtService.java b/src/android/java/src/org/qtproject/qt/android/bindings/QtService.java
index d900c33f0ab..8322af2ae72 100644
--- a/src/android/java/src/org/qtproject/qt/android/bindings/QtService.java
+++ b/src/android/java/src/org/qtproject/qt/android/bindings/QtService.java
@@ -8,7 +8,6 @@ import android.app.Service;
 import android.util.Log;
 import android.content.Intent;
 import android.content.res.Configuration;
-import android.os.Bundle;
 import android.os.IBinder;
 
 import org.qtproject.qt.android.QtNative;
@@ -19,11 +18,11 @@ public class QtService extends Service
 {
     QtServiceLoader m_loader = new QtServiceLoader(this, QtService.class);
 
-
     /////////////////////////// forward all notifications ////////////////////////////
     /////////////////////////// Super class calls ////////////////////////////////////
     /////////////// PLEASE DO NOT CHANGE THE FOLLOWING CODE //////////////////////////
     //////////////////////////////////////////////////////////////////////////////////
+
     protected void onCreateHook() {
         // the application has already started
         // do not reload everything again
@@ -43,7 +42,6 @@ public class QtService extends Service
         super.onCreate();
         onCreateHook();
     }
-    //---------------------------------------------------------------------------
 
     @Override
     public void onDestroy()
@@ -51,7 +49,6 @@ public class QtService extends Service
         super.onDestroy();
         QtLoader.invokeDelegate();
     }
-    //---------------------------------------------------------------------------
 
     @Override
     public IBinder onBind(Intent intent)
@@ -62,7 +59,6 @@ public class QtService extends Service
         else
             return null;
     }
-    //---------------------------------------------------------------------------
 
     @Override
     public void onConfigurationChanged(Configuration newConfig)
@@ -74,54 +70,6 @@ public class QtService extends Service
     {
         super.onConfigurationChanged(newConfig);
     }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onLowMemory()
-    {
-        if (!QtLoader.invokeDelegate().invoked)
-            super.onLowMemory();
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId)
-    {
-        QtLoader.InvokeResult res = QtLoader.invokeDelegate(intent, flags, startId);
-        if (res.invoked)
-            return (Integer) res.methodReturns;
-        else
-            return super.onStartCommand(intent, flags, startId);
-    }
-    public int super_onStartCommand(Intent intent, int flags, int startId)
-    {
-        return super.onStartCommand(intent, flags, startId);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onTaskRemoved(Intent rootIntent)
-    {
-        if (!QtLoader.invokeDelegate(rootIntent).invoked)
-            super.onTaskRemoved(rootIntent);
-    }
-    public void super_onTaskRemoved(Intent rootIntent)
-    {
-        super.onTaskRemoved(rootIntent);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onTrimMemory(int level)
-    {
-        if (!QtLoader.invokeDelegate(level).invoked)
-            super.onTrimMemory(level);
-    }
-    public void super_onTrimMemory(int level)
-    {
-        super.onTrimMemory(level);
-    }
-    //---------------------------------------------------------------------------
 
     @Override
     public boolean onUnbind(Intent intent)
@@ -136,4 +84,5 @@ public class QtService extends Service
     {
         return super.onUnbind(intent);
     }
+    //---------------------------------------------------------------------------
 }