diff --git a/lib/customers.js b/lib/customers.js
index 0d871e68..a9e57ef8 100644
--- a/lib/customers.js
+++ b/lib/customers.js
@@ -165,8 +165,7 @@ function edit (id, data, userToken) {
     'id_card_photo',
     'us_ssn',
     'subscriber_info',
-    'name',
-    'phone'
+    'name'
   ]
   const filteredData = _.pick(defaults, _.mapKeys(_.snakeCase, _.omitBy(_.isNil, data)))
   if (_.isEmpty(filteredData)) return getCustomerById(id)
@@ -753,8 +752,7 @@ function selectLatestData (customerData, customerEditedData) {
     'id_card_photo',
     'us_ssn',
     'subscriber_info',
-    'name',
-    'phone'
+    'name'
   ]
   _.map(field => {
     let fieldName = field
diff --git a/lib/new-admin/graphql/types/customer.type.js b/lib/new-admin/graphql/types/customer.type.js
index c806ebcb..ee85541c 100644
--- a/lib/new-admin/graphql/types/customer.type.js
+++ b/lib/new-admin/graphql/types/customer.type.js
@@ -72,7 +72,6 @@ const typeDef = gql`
     idCardPhoto: UploadGQL
     usSsn: String
     subscriberInfo: JSONObject
-    phone: String
   }
 
   type CustomerNote {
diff --git a/migrations/1641482376890-add-overrides-to-subscriber-info.js b/migrations/1641482376890-add-overrides-to-subscriber-info.js
index d7a9881a..192c7e20 100644
--- a/migrations/1641482376890-add-overrides-to-subscriber-info.js
+++ b/migrations/1641482376890-add-overrides-to-subscriber-info.js
@@ -6,11 +6,6 @@ exports.up = function (next) {
      ADD COLUMN phone_override VERIFICATION_TYPE NOT NULL DEFAULT 'automatic',
      ADD COLUMN phone_override_by UUID,
      ADD COLUMN phone_override_at TIMESTAMPTZ
-    `,
-    `ALTER TABLE edited_customer_data
-     ADD COLUMN phone TEXT,
-     ADD COLUMN phone_at TIMESTAMPTZ,
-     ADD COLUMN phone_by UUID
     `
   ]
 
diff --git a/new-lamassu-admin/src/pages/Customers/CustomerData.js b/new-lamassu-admin/src/pages/Customers/CustomerData.js
index 2e278d19..c0628b58 100644
--- a/new-lamassu-admin/src/pages/Customers/CustomerData.js
+++ b/new-lamassu-admin/src/pages/Customers/CustomerData.js
@@ -2,7 +2,6 @@ import { DialogActions, DialogContent, Dialog } from '@material-ui/core'
 import Grid from '@material-ui/core/Grid'
 import { makeStyles } from '@material-ui/core/styles'
 import { parse, format } from 'date-fns/fp'
-import { parsePhoneNumber } from 'libphonenumber-js'
 import * as R from 'ramda'
 import { useState, React } from 'react'
 import * as Yup from 'yup'
@@ -152,11 +151,16 @@ const CustomerData = ({
   ]
 
   const smsDataSchema = {
-    smsData: Yup.object()
-      .shape({
-        phoneNumber: Yup.string().required()
-      })
-      .required()
+    smsData: Yup.lazy(values => {
+      const additionalData = R.omit(['phoneNumber'])(values)
+      const fields = R.keys(additionalData)
+      if (R.length(fields) === 2) {
+        return Yup.object().shape({
+          [R.head(fields)]: Yup.string().required(),
+          [R.last(fields)]: Yup.string().required()
+        })
+      }
+    })
   }
 
   const cards = [
@@ -186,7 +190,6 @@ const CustomerData = ({
       reject: () => updateCustomer({ phoneOverride: OVERRIDE_REJECTED }),
       save: values => {
         editCustomer({
-          phone: parsePhoneNumber(values.phoneNumber).number,
           subscriberInfo: {
             result: R.merge(smsData, R.omit(['phoneNumber'])(values))
           }
@@ -370,12 +373,6 @@ const CustomerData = ({
       component: TextInput,
       editable: true
     })
-    smsDataSchema.smsData = Yup.object()
-      .shape({
-        [it]: Yup.string()
-      })
-      .required()
-      .concat(smsDataSchema.smsData)
   }, R.keys(smsData) ?? [])
 
   const editableCard = (