1 files changed, 1 insertions, 9 deletions
diff --git a/activerecord/lib/active_record/locking/optimistic.rb b/activerecord/lib/active_record/locking/optimistic.rb
index ce0a165660..7815889b47 100644
--- a/activerecord/lib/active_record/locking/optimistic.rb
+++ b/activerecord/lib/active_record/locking/optimistic.rb
@@ -144,26 +144,18 @@ module ActiveRecord
           lock_optimistically && columns_hash[locking_column]
         end
 
+        # Set the column to use for optimistic locking. Defaults to +lock_version+.
         def locking_column=(value)
           @original_locking_column = @locking_column if defined?(@locking_column)
           @locking_column          = value.to_s
         end
 
-        # Set the column to use for optimistic locking. Defaults to +lock_version+.
-        def set_locking_column(value = nil, &block)
-          deprecated_property_setter :locking_column, value, block
-        end
-
         # The version column used for optimistic locking. Defaults to +lock_version+.
         def locking_column
           reset_locking_column unless defined?(@locking_column)
           @locking_column
         end
 
-        def original_locking_column #:nodoc:
-          deprecated_original_property_getter :locking_column
-        end
-
         # Quote the column name used for optimistic locking.
         def quoted_locking_column
           connection.quote_column_name(locking_column)