diff --git a/lib/appium_lib_core/common/base/driver.rb b/lib/appium_lib_core/common/base/driver.rb
index 3a3d0501..7f74c517 100644
--- a/lib/appium_lib_core/common/base/driver.rb
+++ b/lib/appium_lib_core/common/base/driver.rb
@@ -193,9 +193,6 @@ def add_command(method:, url:, name:, &block)
             raise ::Appium::Core::Error::ArgumentError, "Available method is either #{AVAILABLE_METHODS}"
           end
 
-          # TODO: Remove this logger before Appium 2.0 release
-          ::Appium::Logger.info '[Experimental] this method is experimental for Appium 2.0. This interface may change.'
-
           @bridge.add_command method: method, url: url, name: name, &block
         end
 
diff --git a/lib/appium_lib_core/driver.rb b/lib/appium_lib_core/driver.rb
index 4cb25bce..90fda3a1 100644
--- a/lib/appium_lib_core/driver.rb
+++ b/lib/appium_lib_core/driver.rb
@@ -430,12 +430,6 @@ def start_driver(server_url: nil,
           @http_client.delete_additional_header Appium::Core::Base::Http::RequestHeaders::KEYS[:idempotency]
         end
 
-        # TODO: this method can be removed after releasing Appium 2.0, and after a while
-        # since Appium 2.0 reuqires 'automationName'. This method won't help anymore then.
-        # If "automationName" is set only server side, this method set "automationName" attribute into @automation_name.
-        # Since @automation_name is set only client side before start_driver is called.
-        set_automation_name_if_nil
-
         set_implicit_wait_by_default(@default_wait)
 
         @driver
@@ -694,16 +688,6 @@ def convert_downcase(value)
         value.is_a?(Symbol) ? value.downcase : value.downcase.strip.intern
       end
 
-      # @private
-      def set_automation_name_if_nil
-        return unless @automation_name.nil?
-
-        automation_name = if @driver.capabilities['automationName']
-                            @driver.capabilities['automationName'].downcase.strip.intern
-                          end
-        @automation_name = convert_to_symbol automation_name
-      end
-
       def get_cap(name)
         name_with_prefix = "#{::Appium::Core::Base::Bridge::APPIUM_PREFIX}#{name}"
         @caps[convert_to_symbol name] ||
diff --git a/sig/lib/appium_lib_core/driver.rbs b/sig/lib/appium_lib_core/driver.rbs
index 7222fb96..18601693 100644
--- a/sig/lib/appium_lib_core/driver.rbs
+++ b/sig/lib/appium_lib_core/driver.rbs
@@ -193,8 +193,6 @@ module Appium
       def set_automation_name: () -> Symbol?
 
       def convert_downcase: (Symbol value) -> Symbol
-
-      def set_automation_name_if_nil: () -> Symbol?
     end
   end
 end
diff --git a/test/functional/android/driver_test.rb b/test/functional/android/driver_test.rb
index cf246669..33cbcd17 100644
--- a/test/functional/android/driver_test.rb
+++ b/test/functional/android/driver_test.rb
@@ -85,8 +85,6 @@ def test_mobile_perform_action
       new_element = @driver.find_element :xpath, '//*[@focused="true"]'
       assert_equal 'Right is always right', new_element.text
     end
-
-    # TODO: call @driver.quit after tests
   end
 end
 # rubocop:enable Style/ClassVars
diff --git a/test/functional/ios/driver_test.rb b/test/functional/ios/driver_test.rb
index 8e8efb88..42f015ba 100644
--- a/test/functional/ios/driver_test.rb
+++ b/test/functional/ios/driver_test.rb
@@ -178,8 +178,6 @@ def test_batch_combination_ruby_script
       assert_equal(rect.width, r.result[1]['width'])
       assert_equal(rect.height, r.result[1]['height'])
     end
-
-    # TODO: call @driver.quit after tests
   end
 end
 # rubocop:enable Style/ClassVars