Remove ActiveSupport dependency