diff --git a/lib/appium_lib_core/device.rb b/lib/appium_lib_core/device.rb
index eb716c98..fadc9dae 100644
--- a/lib/appium_lib_core/device.rb
+++ b/lib/appium_lib_core/device.rb
@@ -20,26 +20,6 @@ module Device
       class << self
         def extended(_mod)
           extend_webdriver_with_forwardable
-
-          # Compatibility for appium_lib. Below command are extended by `extend Appium::Core::Deivce`in appium_lib.
-          # TODO: Will remove
-          [
-            :take_element_screenshot, :save_viewport_screenshot,
-            :lock, :device_locked?, :unlock,
-            :hide_keyboard, :is_keyboard_shown,
-            :ime_activate, :ime_available_engines, :ime_active_engine, :ime_activated, :ime_deactivate,
-            :get_settings, :update_settings,
-            :within_context, :current_context, :available_contexts, :set_context,
-            :push_file, :pull_file, :pull_folder,
-            :keyevent, :press_keycode, :long_press_keycode,
-            :match_images_features, :find_image_occurrence, :get_images_similarity, :compare_images,
-            :app_strings, :background_app,
-            :install_app, :remove_app, :app_installed?, :activate_app, :terminate_app,
-            :app_state,
-            :stop_recording_screen, :stop_and_save_recording_screen,
-            :shake, :device_time,
-            :execute_driver, :execute_cdp
-          ].each(&method(:delegate_from_appium_driver))
         end
 
         # def extended
diff --git a/test/unit/android/device/w3c/definition_test.rb b/test/unit/android/device/w3c/definition_test.rb
index 7d57ffa1..951eb31c 100644
--- a/test/unit/android/device/w3c/definition_test.rb
+++ b/test/unit/android/device/w3c/definition_test.rb
@@ -42,44 +42,6 @@ def parameterized_method_defined_check(array)
               delegate_from_appium_driver(v)
             end
           end
-
-          def test_with_arg_definitions
-            parameterized_method_defined_check([:shake,
-                                                :device_locked?,
-                                                :unlock,
-                                                :device_time,
-                                                :current_context,
-                                                :open_notifications,
-                                                :current_activity,
-                                                :current_package,
-                                                :get_system_bars,
-                                                :get_display_density,
-                                                :is_keyboard_shown,
-                                                :available_contexts,
-                                                :set_context,
-                                                :app_strings,
-                                                :lock,
-                                                :install_app,
-                                                :remove_app,
-                                                :app_installed?,
-                                                :terminate_app,
-                                                :activate_app,
-                                                :app_state,
-                                                :background_app,
-                                                :hide_keyboard,
-                                                :keyevent,
-                                                :press_keycode,
-                                                :long_press_keycode,
-                                                :push_file,
-                                                :pull_file,
-                                                :pull_folder,
-                                                :get_settings,
-                                                :update_settings,
-                                                :get_clipboard,
-                                                :set_clipboard,
-                                                :execute_driver,
-                                                :execute_cdp])
-          end
         end # class DefinitionTest
       end # module W3C
     end # module Device
diff --git a/test/unit/ios/device/w3c/definition_test.rb b/test/unit/ios/device/w3c/definition_test.rb
index f6c509ed..2f9c703e 100644
--- a/test/unit/ios/device/w3c/definition_test.rb
+++ b/test/unit/ios/device/w3c/definition_test.rb
@@ -32,10 +32,6 @@ def test_delegate_driver_method
             assert @driver.respond_to? :device_locked?
           end
 
-          def test_delegate_from_appium_driver
-            assert @core.send(:delegated_target_for_test).respond_to? :device_locked?
-          end
-
           def delegate_from_appium_driver(key)
             assert @core.send(:delegated_target_for_test).respond_to? key
           end
@@ -46,39 +42,6 @@ def parameterized_method_defined_check(array)
               delegate_from_appium_driver(v)
             end
           end
-
-          def test_with_arg_definitions
-            parameterized_method_defined_check([:shake,
-                                                :device_locked?,
-                                                :unlock,
-                                                :device_time,
-                                                :current_context,
-                                                :available_contexts,
-                                                :set_context,
-                                                :app_strings,
-                                                :lock,
-                                                :install_app,
-                                                :remove_app,
-                                                :terminate_app,
-                                                :activate_app,
-                                                :app_state,
-                                                :app_installed?,
-                                                :background_app,
-                                                :hide_keyboard,
-                                                :keyevent,
-                                                :press_keycode,
-                                                :long_press_keycode,
-                                                :push_file,
-                                                :pull_file,
-                                                :pull_folder,
-                                                :get_clipboard,
-                                                :set_clipboard,
-                                                :get_settings,
-                                                :update_settings,
-                                                :touch_id,
-                                                :toggle_touch_id_enrollment,
-                                                :execute_driver])
-          end
         end # class DefinitionTest
       end # module W3C
     end # module Device