diff --git a/pom.xml b/pom.xml
index e93eb140..d268936b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>dev.vality</groupId>
         <artifactId>service-parent-pom</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.6</version>
     </parent>
 
     <name>fraudbusters</name>
diff --git a/src/main/java/dev/vality/fraudbusters/util/PayerFieldExtractor.java b/src/main/java/dev/vality/fraudbusters/util/PayerFieldExtractor.java
index 86e9f7d8..b22a1ee3 100644
--- a/src/main/java/dev/vality/fraudbusters/util/PayerFieldExtractor.java
+++ b/src/main/java/dev/vality/fraudbusters/util/PayerFieldExtractor.java
@@ -17,8 +17,6 @@ public class PayerFieldExtractor {
     public static Optional<ContactInfo> getContactInfo(Payer payer) {
         if (payer.isSetPaymentResource()) {
             return Optional.ofNullable(payer.getPaymentResource().getContactInfo());
-        } else if (payer.isSetCustomer()) {
-            return Optional.ofNullable(payer.getCustomer().getContactInfo());
         } else if (payer.isSetRecurrent()) {
             return Optional.ofNullable(payer.getRecurrent().getContactInfo());
         }
@@ -26,9 +24,7 @@ public static Optional<ContactInfo> getContactInfo(Payer payer) {
     }
 
     public static Optional<BankCard> getBankCard(Payer payer) {
-        if (payer.isSetCustomer() && payer.getCustomer().getPaymentTool().isSetBankCard()) {
-            return Optional.ofNullable(payer.getCustomer().getPaymentTool().getBankCard());
-        } else if (payer.isSetPaymentResource()
+        if (payer.isSetPaymentResource()
                     && payer.getPaymentResource().getResource().getPaymentTool().isSetBankCard()) {
             return Optional.ofNullable(payer.getPaymentResource().getResource().getPaymentTool().getBankCard());
         } else if (payer.isSetRecurrent() && payer.getRecurrent().getPaymentTool().isSetBankCard()) {
@@ -49,8 +45,6 @@ public static String getPayerType(Payer payer) {
             return PayerType.PAYMENT_RESOURCE.name();
         } else if (payer.isSetRecurrent()) {
             return PayerType.RECURRENT.name();
-        } else if (payer.isSetCustomer()) {
-            return PayerType.CUSTOMER.name();
         } else {
             return ClickhouseUtilsValue.UNKNOWN;
         }
diff --git a/src/main/java/dev/vality/fraudbusters/util/PaymentTypeByContextResolver.java b/src/main/java/dev/vality/fraudbusters/util/PaymentTypeByContextResolver.java
index c15a6846..48b04183 100644
--- a/src/main/java/dev/vality/fraudbusters/util/PaymentTypeByContextResolver.java
+++ b/src/main/java/dev/vality/fraudbusters/util/PaymentTypeByContextResolver.java
@@ -8,7 +8,7 @@
 public class PaymentTypeByContextResolver {
 
     public boolean isRecurrent(Payer payer) {
-        return payer.isSetRecurrent() || payer.isSetCustomer();
+        return payer.isSetRecurrent();
     }
 
     public boolean isMobile(BankCard bankCard) {
diff --git a/src/test/java/dev/vality/fraudbusters/util/BeanUtil.java b/src/test/java/dev/vality/fraudbusters/util/BeanUtil.java
index 5b47de5f..89f7dd98 100644
--- a/src/test/java/dev/vality/fraudbusters/util/BeanUtil.java
+++ b/src/test/java/dev/vality/fraudbusters/util/BeanUtil.java
@@ -56,16 +56,17 @@ public static Context createContext(String paymentId) {
                 new Shop(
                         ID_VALUE_SHOP,
                         new Category("pizza", "no category"),
-                        new ShopDetails("pizza-sushi"),
+                        "pizza-sushi",
                         location
                 ),
                 new InvoicePayment(
                         paymentId,
                         TypeUtil.temporalToString(Instant.now()),
-                        Payer.customer(
-                                new CustomerPayer("custId", "1", "rec_paym_tool", createPaymentTool(),
-                                        contactInfo
-                                )),
+                        Payer.payment_resource(new PaymentResourcePayer()
+                                .setResource(new DisposablePaymentResource()
+                                        .setPaymentTool(createPaymentTool()))
+                                .setContactInfo(new ContactInfo()
+                                        .setEmail("test@test"))),
                         new Cash(
                                 9000L,
                                 new CurrencyRef("RUB")