1 files changed, 0 insertions, 15 deletions
diff --git a/app/models/concerns/database_event_tracking.rb b/app/models/concerns/database_event_tracking.rb
index 26e184c202f..7e2f445189e 100644
--- a/app/models/concerns/database_event_tracking.rb
+++ b/app/models/concerns/database_event_tracking.rb
@@ -3,8 +3,6 @@
 module DatabaseEventTracking
   extend ActiveSupport::Concern
 
-  FEATURE_FLAG_BATCH2_CLASSES = %w[Vulnerability MergeRequest::Metrics].freeze
-
   included do
     after_create_commit :publish_database_create_event
     after_destroy_commit :publish_database_destroy_event
@@ -24,9 +22,6 @@ module DatabaseEventTracking
   end
 
   def publish_database_event(name)
-    return unless database_events_for_class_enabled?
-    return unless database_events_feature_flag_enabled?
-
     # Gitlab::Tracking#event is triggering Snowplow event
     # Snowplow events are sent with usage of
     # https://snowplow.github.io/snowplow-ruby-tracker/SnowplowTracker/AsyncEmitter.html
@@ -54,14 +49,4 @@ module DatabaseEventTracking
       .with_indifferent_access
       .slice(*self.class::SNOWPLOW_ATTRIBUTES)
   end
-
-  def database_events_for_class_enabled?
-    is_batch2 = FEATURE_FLAG_BATCH2_CLASSES.include?(self.class.to_s)
-
-    !is_batch2 || Feature.enabled?(:product_intelligence_database_event_tracking_batch2)
-  end
-
-  def database_events_feature_flag_enabled?
-    Feature.enabled?(:product_intelligence_database_event_tracking)
-  end
 end