diff --git a/crates/diesel_models/src/merchant_connector_account.rs b/crates/diesel_models/src/merchant_connector_account.rs
index 01853cb7aa6..3326331b20c 100644
--- a/crates/diesel_models/src/merchant_connector_account.rs
+++ b/crates/diesel_models/src/merchant_connector_account.rs
@@ -11,7 +11,7 @@ use crate::enums as storage_enums;
 #[cfg(feature = "v1")]
 use crate::schema::merchant_connector_account;
 #[cfg(feature = "v2")]
-use crate::{enums, schema_v2::merchant_connector_account, types};
+use crate::schema_v2::merchant_connector_account;
 
 #[cfg(feature = "v1")]
 #[derive(
diff --git a/crates/diesel_models/src/payment_attempt.rs b/crates/diesel_models/src/payment_attempt.rs
index 9409be94163..470966f1618 100644
--- a/crates/diesel_models/src/payment_attempt.rs
+++ b/crates/diesel_models/src/payment_attempt.rs
@@ -936,7 +936,7 @@ impl PaymentAttemptUpdateInternal {
 
 #[cfg(feature = "v2")]
 impl PaymentAttemptUpdate {
-    pub fn apply_changeset(self, source: PaymentAttempt) -> PaymentAttempt {
+    pub fn apply_changeset(self, _source: PaymentAttempt) -> PaymentAttempt {
         todo!()
         // let PaymentAttemptUpdateInternal {
         //     net_amount,
@@ -1146,7 +1146,7 @@ impl PaymentAttemptUpdate {
 
 #[cfg(feature = "v2")]
 impl From<PaymentAttemptUpdate> for PaymentAttemptUpdateInternal {
-    fn from(payment_attempt_update: PaymentAttemptUpdate) -> Self {
+    fn from(_payment_attempt_update: PaymentAttemptUpdate) -> Self {
         todo!()
         // match payment_attempt_update {
         //     PaymentAttemptUpdate::Update {
diff --git a/crates/diesel_models/src/query/payment_attempt.rs b/crates/diesel_models/src/query/payment_attempt.rs
index cfcbc2bd199..5950791828d 100644
--- a/crates/diesel_models/src/query/payment_attempt.rs
+++ b/crates/diesel_models/src/query/payment_attempt.rs
@@ -1,25 +1,29 @@
+#[cfg(feature = "v1")]
 use std::collections::HashSet;
 
 use async_bb8_diesel::AsyncRunQueryDsl;
+#[cfg(feature = "v1")]
+use diesel::Table;
 use diesel::{
-    associations::HasTable, debug_query, pg::Pg, BoolExpressionMethods, ExpressionMethods,
-    QueryDsl, Table,
+    associations::HasTable, debug_query, pg::Pg, BoolExpressionMethods, ExpressionMethods, QueryDsl,
 };
-use error_stack::{report, ResultExt};
+#[cfg(feature = "v1")]
+use error_stack::report;
+use error_stack::ResultExt;
 
 use super::generics;
 #[cfg(feature = "v1")]
 use crate::schema::payment_attempt::dsl;
 #[cfg(feature = "v2")]
 use crate::schema_v2::payment_attempt::dsl;
+#[cfg(feature = "v1")]
+use crate::{enums::IntentStatus, payment_attempt::PaymentAttemptUpdate, PaymentIntent};
 use crate::{
-    enums::{self, IntentStatus},
+    enums::{self},
     errors::DatabaseError,
-    payment_attempt::{
-        PaymentAttempt, PaymentAttemptNew, PaymentAttemptUpdate, PaymentAttemptUpdateInternal,
-    },
+    payment_attempt::{PaymentAttempt, PaymentAttemptNew, PaymentAttemptUpdateInternal},
     query::generics::db_metrics,
-    PaymentIntent, PgPooledConn, StorageResult,
+    PgPooledConn, StorageResult,
 };
 
 impl PaymentAttemptNew {
diff --git a/crates/diesel_models/src/query/user/sample_data.rs b/crates/diesel_models/src/query/user/sample_data.rs
index b97ea39b82d..b9e3787e05f 100644
--- a/crates/diesel_models/src/query/user/sample_data.rs
+++ b/crates/diesel_models/src/query/user/sample_data.rs
@@ -14,9 +14,11 @@ use crate::schema_v2::{
 use crate::{
     errors,
     schema::{dispute::dsl as dispute_dsl, refund::dsl as refund_dsl},
-    user, Dispute, DisputeNew, PaymentAttempt, PaymentIntent, PaymentIntentNew, PgPooledConn,
-    Refund, RefundNew, StorageResult,
+    Dispute, DisputeNew, PaymentAttempt, PaymentIntent, PgPooledConn, Refund, RefundNew,
+    StorageResult,
 };
+#[cfg(feature = "v1")]
+use crate::{user, PaymentIntentNew};
 
 #[cfg(feature = "v1")]
 pub async fn insert_payment_intents(
diff --git a/crates/diesel_models/src/user/sample_data.rs b/crates/diesel_models/src/user/sample_data.rs
index d6c8d5616fa..3eb0ff42236 100644
--- a/crates/diesel_models/src/user/sample_data.rs
+++ b/crates/diesel_models/src/user/sample_data.rs
@@ -1,23 +1,28 @@
+#[cfg(feature = "v1")]
 use common_enums::{
     AttemptStatus, AuthenticationType, CaptureMethod, Currency, PaymentExperience, PaymentMethod,
     PaymentMethodType,
 };
+#[cfg(feature = "v1")]
 use common_utils::types::{
     ConnectorTransactionId, ExtendedAuthorizationAppliedBool, MinorUnit,
     RequestExtendedAuthorizationBool,
 };
+#[cfg(feature = "v1")]
 use serde::{Deserialize, Serialize};
+#[cfg(feature = "v1")]
 use time::PrimitiveDateTime;
 
 #[cfg(feature = "v1")]
-use crate::schema::payment_attempt;
-#[cfg(feature = "v2")]
-use crate::schema_v2::payment_attempt;
 use crate::{
     enums::{MandateDataType, MandateDetails},
+    schema::payment_attempt,
     ConnectorMandateReferenceId, PaymentAttemptNew,
 };
 
+// #[cfg(feature = "v2")]
+// use crate::schema_v2::payment_attempt;
+
 // #[cfg(feature = "v2")]
 // #[derive(
 //     Clone, Debug, diesel::Insertable, router_derive::DebugAsDisplay, Serialize, Deserialize,