diff --git a/Gemfile.lock b/Gemfile.lock
index 0f3e99521c1..d6f072de731 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -197,7 +197,7 @@ GEM
       debug_inspector (>= 0.0.1)
     bootsnap (1.15.0)
       msgpack (~> 1.2)
-    brakeman (5.4.0)
+    brakeman (5.4.1)
     browser (5.3.1)
     builder (3.2.4)
     bullet (7.0.7)
diff --git a/app/components/phone_input_component.html.erb b/app/components/phone_input_component.html.erb
index efe8510bb5c..24a495525de 100644
--- a/app/components/phone_input_component.html.erb
+++ b/app/components/phone_input_component.html.erb
@@ -36,12 +36,6 @@
         :phone,
         class: 'usa-label',
       ) { t('two_factor_authentication.phone_label') } %>
-  <div class="js">
-    <%= f.hint(capture do %>
-      <%= t('forms.example') %>
-      <span class="phone-input__example"></span>
-    <% end) %>
-  </div>
   <%= render ValidatedFieldComponent.new(
         form: f,
         name: :phone,
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ec78024eaef..9c17fec259f 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -65,6 +65,7 @@ def analytics
         sp: current_sp&.issuer,
         session: session,
         ahoy: ahoy,
+        irs_session_id: irs_attempts_api_session_id,
       )
   end
 
diff --git a/app/controllers/concerns/idv/verify_info_concern.rb b/app/controllers/concerns/idv/verify_info_concern.rb
index 0635f2c248f..9e1acd7dce2 100644
--- a/app/controllers/concerns/idv/verify_info_concern.rb
+++ b/app/controllers/concerns/idv/verify_info_concern.rb
@@ -97,7 +97,8 @@ def async_state_done(current_async_state)
         extra: {
           address_edited: !!flow_session['address_edited'],
           address_line2_present: !pii[:address2].blank?,
-          pii_like_keypaths: [[:errors, :ssn], [:response_body, :first_name]],
+          pii_like_keypaths: [[:errors, :ssn], [:response_body, :first_name],
+                              [:state_id, :state_id_jurisdiction]],
         },
       )
       log_idv_verification_submitted_event(
@@ -105,15 +106,14 @@ def async_state_done(current_async_state)
         failure_reason: irs_attempts_api_tracker.parse_failure_reason(form_response),
       )
 
-      if form_response.success?
-        response = check_ssn
-        form_response = form_response.merge(response)
-      end
+      form_response = form_response.merge(check_ssn) if form_response.success?
       summarize_result_and_throttle_failures(form_response)
       delete_async
 
       if form_response.success?
+        move_applicant_to_idv_session
         idv_session.mark_verify_info_step_complete!
+        idv_session.invalidate_steps_after_verify_info!
         redirect_to idv_phone_url
       else
         idv_session.invalidate_verify_info_step!
@@ -196,27 +196,13 @@ def log_idv_verification_submitted_event(success: false, failure_reason: nil)
     end
 
     def check_ssn
-      result = Idv::SsnForm.new(current_user).submit(ssn: pii[:ssn])
-
-      if result.success?
-        save_legacy_state
-        delete_pii
-      end
-
-      result
+      Idv::SsnForm.new(current_user).submit(ssn: pii[:ssn])
     end
 
-    def save_legacy_state
-      skip_legacy_steps
+    def move_applicant_to_idv_session
       idv_session.applicant = pii
       idv_session.applicant['uuid'] = current_user.uuid
-    end
-
-    def skip_legacy_steps
-      idv_session.mark_verify_info_step_complete!
-      idv_session.vendor_phone_confirmation = false
-      idv_session.user_phone_confirmation = false
-      idv_session.address_verification_mechanism = 'phone'
+      delete_pii
     end
 
     def add_proofing_costs(results)
diff --git a/app/controllers/idv/in_person/address_search_controller.rb b/app/controllers/idv/in_person/address_search_controller.rb
index e96e4208fee..725ab329e1d 100644
--- a/app/controllers/idv/in_person/address_search_controller.rb
+++ b/app/controllers/idv/in_person/address_search_controller.rb
@@ -1,10 +1,6 @@
 module Idv
   module InPerson
     class AddressSearchController < ApplicationController
-      include RenderConditionConcern
-
-      check_or_render_not_found -> { IdentityConfig.store.arcgis_search_enabled }
-
       def index
         response = addresses(params[:address])
         render(**response)
diff --git a/app/controllers/idv/in_person/usps_locations_controller.rb b/app/controllers/idv/in_person/usps_locations_controller.rb
index 6e62cb11ecf..ec7e9cc2a16 100644
--- a/app/controllers/idv/in_person/usps_locations_controller.rb
+++ b/app/controllers/idv/in_person/usps_locations_controller.rb
@@ -20,26 +20,21 @@ class UspsLocationsController < ApplicationController
 
       # retrieve the list of nearby IPP Post Office locations with a POST request
       def index
-        response = []
-        if IdentityConfig.store.arcgis_search_enabled
-          candidate = UspsInPersonProofing::Applicant.new(
-            address: search_params['street_address'],
-            city: search_params['city'], state: search_params['state'],
-            zip_code: search_params['zip_code']
+        candidate = UspsInPersonProofing::Applicant.new(
+          address: search_params['street_address'],
+          city: search_params['city'], state: search_params['state'],
+          zip_code: search_params['zip_code']
+        )
+        response = proofer.request_facilities(candidate)
+        if response.length > 0
+          analytics.idv_in_person_locations_searched(
+            success: true,
+            result_total: response.length,
           )
-          response = proofer.request_facilities(candidate)
-          if response.length > 0
-            analytics.idv_in_person_locations_searched(
-              success: true,
-              result_total: response.length,
-            )
-          else
-            analytics.idv_in_person_locations_searched(
-              success: false, errors: 'No USPS locations found',
-            )
-          end
         else
-          response = proofer.request_pilot_facilities
+          analytics.idv_in_person_locations_searched(
+            success: false, errors: 'No USPS locations found',
+          )
         end
         render json: response.to_json
       end
diff --git a/app/controllers/redirect/policy_controller.rb b/app/controllers/redirect/policy_controller.rb
new file mode 100644
index 00000000000..9e75c5dfd79
--- /dev/null
+++ b/app/controllers/redirect/policy_controller.rb
@@ -0,0 +1,10 @@
+module Redirect
+  class PolicyController < RedirectController
+    def show
+      redirect_to_and_log(
+        MarketingSite.security_and_privacy_practices_url,
+        tracker_method: analytics.method(:policy_redirect),
+      )
+    end
+  end
+  end
diff --git a/app/javascript/packages/document-capture/components/document-capture.tsx b/app/javascript/packages/document-capture/components/document-capture.tsx
index 42e6f2bacc1..5dd591c2de5 100644
--- a/app/javascript/packages/document-capture/components/document-capture.tsx
+++ b/app/javascript/packages/document-capture/components/document-capture.tsx
@@ -9,7 +9,6 @@ import { getConfigValue } from '@18f/identity-config';
 import { UploadFormEntriesError } from '../services/upload';
 import DocumentsStep from './documents-step';
 import InPersonPrepareStep from './in-person-prepare-step';
-import InPersonLocationStep from './in-person-location-step';
 import InPersonLocationPostOfficeSearchStep from './in-person-location-post-office-search-step';
 import InPersonSwitchBackStep from './in-person-switch-back-step';
 import ReviewIssuesStep from './review-issues-step';
@@ -60,7 +59,7 @@ function DocumentCapture({ isAsyncForm = false, onStepChange = () => {} }: Docum
   const { t } = useI18n();
   const { flowPath } = useContext(UploadContext);
   const { trackSubmitEvent, trackVisitEvent } = useContext(AnalyticsContext);
-  const { inPersonURL, arcgisSearchEnabled } = useContext(InPersonContext);
+  const { inPersonURL } = useContext(InPersonContext);
   const appName = getConfigValue('appName');
 
   useDidUpdateEffect(onStepChange, [stepName]);
@@ -114,7 +113,7 @@ function DocumentCapture({ isAsyncForm = false, onStepChange = () => {} }: Docum
       : ([
           {
             name: 'location',
-            form: arcgisSearchEnabled ? InPersonLocationPostOfficeSearchStep : InPersonLocationStep,
+            form: InPersonLocationPostOfficeSearchStep,
             title: t('in_person_proofing.headings.po_search.location'),
           },
           {
diff --git a/app/javascript/packages/document-capture/components/in-person-location-post-office-search-step.spec.tsx b/app/javascript/packages/document-capture/components/in-person-location-post-office-search-step.spec.tsx
index 4df8ac8d242..e88a91c6e57 100644
--- a/app/javascript/packages/document-capture/components/in-person-location-post-office-search-step.spec.tsx
+++ b/app/javascript/packages/document-capture/components/in-person-location-post-office-search-step.spec.tsx
@@ -7,9 +7,7 @@ import type { SetupServerApi } from 'msw/node';
 import { SWRConfig } from 'swr';
 import { I18nContext } from '@18f/identity-react-i18n';
 import { ComponentType } from 'react';
-import { LOCATIONS_URL } from './in-person-location-step';
-import { ADDRESS_SEARCH_URL } from './address-search';
-import InPersonContext from '../context/in-person';
+import { ADDRESS_SEARCH_URL, LOCATIONS_URL } from './address-search';
 import InPersonLocationPostOfficeSearchStep from './in-person-location-post-office-search-step';
 
 const DEFAULT_RESPONSE = [
@@ -58,11 +56,9 @@ const DEFAULT_PROPS = {
   registerField() {},
 };
 
-describe('InPersonLocationStep', () => {
+describe('InPersonPostOfficeSearchStep', () => {
   const wrapper: ComponentType = ({ children }) => (
-    <InPersonContext.Provider value={{ arcgisSearchEnabled: true }}>
-      <SWRConfig value={{ provider: () => new Map() }}>{children}</SWRConfig>
-    </InPersonContext.Provider>
+    <SWRConfig value={{ provider: () => new Map() }}>{children}</SWRConfig>
   );
 
   let server: SetupServerApi;
@@ -90,9 +86,7 @@ describe('InPersonLocationStep', () => {
     it('displays a try again error message', async () => {
       const { findByText, findByLabelText } = render(
         <SWRConfig value={{ provider: () => new Map() }}>
-          <InPersonContext.Provider value={{ arcgisSearchEnabled: true }}>
-            <InPersonLocationPostOfficeSearchStep {...DEFAULT_PROPS} />
-          </InPersonContext.Provider>
+          <InPersonLocationPostOfficeSearchStep {...DEFAULT_PROPS} />
         </SWRConfig>,
       );
 
diff --git a/app/javascript/packages/document-capture/components/in-person-location-step.spec.tsx b/app/javascript/packages/document-capture/components/in-person-location-step.spec.tsx
deleted file mode 100644
index a5de88ed931..00000000000
--- a/app/javascript/packages/document-capture/components/in-person-location-step.spec.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import sinon from 'sinon';
-import { useContext } from 'react';
-import { render } from '@testing-library/react';
-import { getAllByRole } from '@testing-library/dom';
-import userEvent from '@testing-library/user-event';
-import { setupServer } from 'msw/node';
-import { rest } from 'msw';
-import type { SetupServerApi } from 'msw/node';
-import AnalyticsContext, { AnalyticsContextProvider } from '../context/analytics';
-import InPersonLocationStep, { LOCATIONS_URL } from './in-person-location-step';
-import { ADDRESS_SEARCH_URL } from './address-search';
-
-const DEFAULT_RESPONSE = [
-  {
-    address: '100 Main St E, Bronwood, Georgia, 39826',
-    location: {
-      latitude: 31.831686000000005,
-      longitude: -84.363768,
-    },
-    street_address: '100 Main St E',
-    city: 'Bronwood',
-    state: 'GA',
-    zip_code: '39826',
-  },
-];
-
-const DEFAULT_PROPS = {
-  toPreviousStep() {},
-  onChange() {},
-  value: {},
-  registerField() {},
-};
-
-describe('InPersonLocationStep', () => {
-  let server: SetupServerApi;
-  before(() => {
-    server = setupServer(
-      rest.post(LOCATIONS_URL, (_req, res, ctx) => res(ctx.json([{ name: 'Baltimore' }]))),
-      rest.post(ADDRESS_SEARCH_URL, (_req, res, ctx) => res(ctx.json(DEFAULT_RESPONSE))),
-      rest.put(LOCATIONS_URL, (_req, res, ctx) => res(ctx.json([{ success: true }]))),
-    );
-    server.listen();
-  });
-
-  after(() => {
-    server.close();
-  });
-
-  it('logs step submission with selected location', async () => {
-    const trackEvent = sinon.stub();
-    function MetadataValue() {
-      return <>{JSON.stringify(useContext(AnalyticsContext).submitEventMetadata)}</>;
-    }
-    const { findByText } = render(
-      <AnalyticsContextProvider trackEvent={trackEvent}>
-        <MetadataValue />
-        <InPersonLocationStep {...DEFAULT_PROPS} />
-      </AnalyticsContextProvider>,
-    );
-
-    const item = await findByText('Baltimore — in_person_proofing.body.location.post_office');
-    const button = getAllByRole(item.closest('.location-collection-item')!, 'button')[0];
-
-    await userEvent.click(button);
-
-    await findByText('{"selected_location":"Baltimore","in_person_cta_variant":""}');
-  });
-});
diff --git a/app/javascript/packages/document-capture/components/in-person-location-step.tsx b/app/javascript/packages/document-capture/components/in-person-location-step.tsx
deleted file mode 100644
index 6712e3b8ef1..00000000000
--- a/app/javascript/packages/document-capture/components/in-person-location-step.tsx
+++ /dev/null
@@ -1,201 +0,0 @@
-import { useState, useEffect, useCallback, useRef, useContext } from 'react';
-import { useI18n } from '@18f/identity-react-i18n';
-import { PageHeading, SpinnerDots } from '@18f/identity-components';
-import { request } from '@18f/identity-request';
-import BackButton from './back-button';
-import LocationCollection from './location-collection';
-import LocationCollectionItem from './location-collection-item';
-import AnalyticsContext from '../context/analytics';
-import { InPersonContext } from '../context';
-
-interface PostOffice {
-  address: string;
-  city: string;
-  name: string;
-  saturday_hours: string;
-  state: string;
-  sunday_hours: string;
-  weekday_hours: string;
-  zip_code_4: string;
-  zip_code_5: string;
-}
-
-interface FormattedLocation {
-  formattedCityStateZip: string;
-  id: number;
-  name: string;
-  saturdayHours: string;
-  streetAddress: string;
-  sundayHours: string;
-  weekdayHours: string;
-}
-interface LocationQuery {
-  streetAddress: string;
-  city: string;
-  state: string;
-  zipCode: string;
-}
-
-export const LOCATIONS_URL = '/verify/in_person/usps_locations';
-
-const getUspsLocations = (address) =>
-  request<PostOffice[]>(LOCATIONS_URL, {
-    method: 'post',
-    json: { address },
-  });
-
-const formatLocation = (postOffices: PostOffice[]) => {
-  const formattedLocations = [] as FormattedLocation[];
-  postOffices.forEach((po: PostOffice, index) => {
-    const location = {
-      formattedCityStateZip: `${po.city}, ${po.state}, ${po.zip_code_5}-${po.zip_code_4}`,
-      id: index,
-      name: po.name,
-      saturdayHours: po.saturday_hours,
-      streetAddress: po.address,
-      sundayHours: po.sunday_hours,
-      weekdayHours: po.weekday_hours,
-    } as FormattedLocation;
-    formattedLocations.push(location);
-  });
-  return formattedLocations;
-};
-
-const snakeCase = (value: string) =>
-  value
-    .split(/(?=[A-Z])/)
-    .join('_')
-    .toLowerCase();
-
-// snake case the keys of the location
-const prepToSend = (location: object) => {
-  const sendObject = {};
-  Object.keys(location).forEach((key) => {
-    sendObject[snakeCase(key)] = location[key];
-  });
-  return sendObject;
-};
-
-function InPersonLocationStep({ onChange, toPreviousStep }) {
-  const { inPersonCtaVariantActive } = useContext(InPersonContext);
-  const { t } = useI18n();
-  const [locationData, setLocationData] = useState([] as FormattedLocation[]);
-  const [foundAddress] = useState({} as LocationQuery);
-  const [inProgress, setInProgress] = useState(false);
-  const [autoSubmit, setAutoSubmit] = useState(false);
-  const [isLoadingComplete, setIsLoadingComplete] = useState(false);
-  const { setSubmitEventMetadata } = useContext(AnalyticsContext);
-
-  // ref allows us to avoid a memory leak
-  const mountedRef = useRef(false);
-
-  useEffect(() => {
-    mountedRef.current = true;
-    return () => {
-      mountedRef.current = false;
-    };
-  }, []);
-
-  // useCallBack here prevents unnecessary rerenders due to changing function identity
-  const handleLocationSelect = useCallback(
-    async (e: any, id: number) => {
-      const selectedLocation = locationData[id];
-      const { name: selectedLocationName } = selectedLocation;
-      setSubmitEventMetadata({
-        selected_location: selectedLocationName,
-        in_person_cta_variant: inPersonCtaVariantActive,
-      });
-      onChange({ selectedLocationName });
-      if (autoSubmit) {
-        return;
-      }
-      // prevent navigation from continuing
-      e.preventDefault();
-      if (inProgress) {
-        return;
-      }
-      const selected = prepToSend(selectedLocation);
-      setInProgress(true);
-      await request(LOCATIONS_URL, {
-        json: selected,
-        method: 'PUT',
-      })
-        .then(() => {
-          if (!mountedRef.current) {
-            return;
-          }
-          setAutoSubmit(true);
-          setImmediate(() => {
-            // continue with navigation
-            e.target.click();
-            // allow process to be re-triggered in case submission did not work as expected
-            setAutoSubmit(false);
-          });
-        })
-        .finally(() => {
-          if (!mountedRef.current) {
-            return;
-          }
-          setInProgress(false);
-        });
-    },
-    [locationData, inProgress],
-  );
-
-  useEffect(() => {
-    let didCancel = false;
-    (async () => {
-      try {
-        const fetchedLocations = await getUspsLocations(prepToSend(foundAddress));
-
-        if (!didCancel) {
-          const formattedLocations = formatLocation(fetchedLocations);
-          setLocationData(formattedLocations);
-        }
-      } finally {
-        if (!didCancel) {
-          setIsLoadingComplete(true);
-        }
-      }
-    })();
-    return () => {
-      didCancel = true;
-    };
-  }, [foundAddress]);
-
-  let locationsContent: React.ReactNode;
-  if (!isLoadingComplete) {
-    locationsContent = <SpinnerDots />;
-  } else if (locationData.length < 1) {
-    locationsContent = <h4>{t('in_person_proofing.body.location.none_found')}</h4>;
-  } else {
-    locationsContent = (
-      <LocationCollection>
-        {locationData.map((item, index) => (
-          <LocationCollectionItem
-            key={`${index}-${item.name}`}
-            handleSelect={handleLocationSelect}
-            name={`${item.name} — ${t('in_person_proofing.body.location.post_office')}`}
-            streetAddress={item.streetAddress}
-            selectId={item.id}
-            formattedCityStateZip={item.formattedCityStateZip}
-            weekdayHours={item.weekdayHours}
-            saturdayHours={item.saturdayHours}
-            sundayHours={item.sundayHours}
-          />
-        ))}
-      </LocationCollection>
-    );
-  }
-
-  return (
-    <>
-      <PageHeading>{t('in_person_proofing.headings.location')}</PageHeading>
-      <p>{t('in_person_proofing.body.location.location_step_about')}</p>
-      {locationsContent}
-      <BackButton onClick={toPreviousStep} />
-    </>
-  );
-}
-
-export default InPersonLocationStep;
diff --git a/app/javascript/packages/document-capture/components/in-person-prepare-step.tsx b/app/javascript/packages/document-capture/components/in-person-prepare-step.tsx
index 1043d3afdcc..91f5bbcf829 100644
--- a/app/javascript/packages/document-capture/components/in-person-prepare-step.tsx
+++ b/app/javascript/packages/document-capture/components/in-person-prepare-step.tsx
@@ -20,8 +20,7 @@ function InPersonPrepareStep({ toPreviousStep, value }) {
   const { flowPath } = useContext(UploadContext);
   const { trackEvent } = useContext(AnalyticsContext);
   const { securityAndPrivacyHowItWorksURL } = useContext(MarketingSiteContext);
-  /* Remove selectedLocationName when request_pilot_facilities removed */
-  const { selectedLocationName, selectedLocationAddress } = value;
+  const { selectedLocationAddress } = value;
 
   const onContinue: MouseEventHandler = async (event) => {
     event.preventDefault();
@@ -36,14 +35,6 @@ function InPersonPrepareStep({ toPreviousStep, value }) {
 
   return (
     <>
-      {/* Remove selectedLocationName version of alert when request_pilot_facilities removed */}
-      {selectedLocationName && (
-        <Alert type="success" className="margin-bottom-4">
-          {t('in_person_proofing.body.prepare.alert_selected_po_name', {
-            name: selectedLocationName,
-          })}
-        </Alert>
-      )}
       {selectedLocationAddress && (
         <Alert type="success" className="margin-bottom-4">
           {t('in_person_proofing.body.prepare.alert_selected_post_office', {
diff --git a/app/javascript/packages/document-capture/context/in-person.ts b/app/javascript/packages/document-capture/context/in-person.ts
index 90e7fdd6ced..f8bb51ba8fd 100644
--- a/app/javascript/packages/document-capture/context/in-person.ts
+++ b/app/javascript/packages/document-capture/context/in-person.ts
@@ -1,11 +1,6 @@
 import { createContext } from 'react';
 
 export interface InPersonContextProps {
-  /**
-   * Feature flag for enabling address search
-   */
-  arcgisSearchEnabled?: boolean;
-
   /**
    * Whether or not A/B testing of the in-person proofing CTA is enabled.
    */
@@ -23,7 +18,6 @@ export interface InPersonContextProps {
 }
 
 const InPersonContext = createContext<InPersonContextProps>({
-  arcgisSearchEnabled: false,
   inPersonCtaVariantTestingEnabled: false,
   inPersonCtaVariantActive: '',
 });
diff --git a/app/javascript/packages/phone-input/index.spec.ts b/app/javascript/packages/phone-input/index.spec.ts
index c8c09d97ec5..75505c5fdb9 100644
--- a/app/javascript/packages/phone-input/index.spec.ts
+++ b/app/javascript/packages/phone-input/index.spec.ts
@@ -80,10 +80,6 @@ describe('PhoneInput', () => {
         ${!isSingleOption && !isNonUSSingleOption ? MULTIPLE_OPTIONS_HTML : ''}
       </div>
       <label class="usa-label" for="phone_form_phone">Phone number</label>
-      <div class="usa-hint">
-        Example:
-        <span class="phone-input__example"></span>
-      </div>
       <lg-validated-field>
         <script type="application/json" class="validated-field__error-strings">
           {
diff --git a/app/javascript/packages/phone-input/index.ts b/app/javascript/packages/phone-input/index.ts
index fce72fca1ac..1919543dee2 100644
--- a/app/javascript/packages/phone-input/index.ts
+++ b/app/javascript/packages/phone-input/index.ts
@@ -2,7 +2,7 @@ import { isValidNumber, isValidNumberForRegion } from 'libphonenumber-js';
 import 'intl-tel-input/build/js/utils.js';
 import intlTelInput from 'intl-tel-input';
 import type { CountryCode } from 'libphonenumber-js';
-import type { Plugin as IntlTelInputPlugin, IntlTelInputGlobals, Options } from 'intl-tel-input';
+import type { Plugin as IntlTelInputPlugin, Options } from 'intl-tel-input';
 import { replaceVariables } from '@18f/identity-i18n';
 import { CAPTCHA_EVENT_NAME } from '@18f/identity-captcha-submit-button/captcha-submit-button-element';
 
@@ -22,8 +22,6 @@ interface IntlTelInput extends IntlTelInputPlugin {
   options: Options;
 }
 
-const { intlTelInputUtils } = window as typeof window & IntlTelInputGlobals;
-
 const isPhoneValid = (phone, countryCode) => {
   let phoneValid = isValidNumber(phone, countryCode);
   if (!phoneValid && countryCode === 'US') {
@@ -48,15 +46,12 @@ export class PhoneInputElement extends HTMLElement {
 
   codeWrapper: Element | null;
 
-  exampleText: Element | null;
-
   iti: IntlTelInput;
 
   connectedCallback() {
     const textInput = this.querySelector<HTMLInputElement>('.phone-input__number');
     const codeInput = this.querySelector<HTMLSelectElement>('.phone-input__international-code');
     this.codeWrapper = this.querySelector('.phone-input__international-code-wrapper');
-    this.exampleText = this.querySelector('.phone-input__example');
 
     try {
       this.deliveryMethods = JSON.parse(this.dataset.deliveryMethods || '');
@@ -74,11 +69,9 @@ export class PhoneInputElement extends HTMLElement {
     this.textInput.addEventListener('countrychange', () => this.syncCountryChangeToCodeInput());
     this.textInput.addEventListener('input', () => this.validate());
     this.codeInput.addEventListener('change', () => this.formatTextInput());
-    this.codeInput.addEventListener('change', () => this.setExampleNumber());
     this.codeInput.addEventListener('change', () => this.validate());
     this.ownerDocument.addEventListener(CAPTCHA_EVENT_NAME, this.handleCaptchaChallenge);
 
-    this.setExampleNumber();
     this.validate();
   }
 
@@ -241,17 +234,6 @@ export class PhoneInputElement extends HTMLElement {
     return this.deliveryMethods.some((delivery) => this.isDeliveryOptionSupported(delivery));
   }
 
-  setExampleNumber() {
-    const { exampleText, iti } = this;
-    const { iso2 = 'us' } = iti.getSelectedCountryData();
-
-    if (exampleText) {
-      const { nationalMode } = iti.options;
-      const numberType = intlTelInputUtils.numberType[iti.options.placeholderNumberType!];
-      exampleText.textContent = intlTelInputUtils.getExampleNumber(iso2, nationalMode!, numberType);
-    }
-  }
-
   handleCaptchaChallenge = (event: Event) => {
     const { iso2 = 'us' } = this.iti.getSelectedCountryData();
     const isExempt =
diff --git a/app/javascript/packs/document-capture.tsx b/app/javascript/packs/document-capture.tsx
index 10466a1416c..53396309284 100644
--- a/app/javascript/packs/document-capture.tsx
+++ b/app/javascript/packs/document-capture.tsx
@@ -120,7 +120,6 @@ const trackEvent: typeof baseTrackEvent = (event, payload) => {
     cancelUrl: cancelURL,
     idvInPersonUrl: inPersonURL,
     securityAndPrivacyHowItWorksUrl: securityAndPrivacyHowItWorksURL,
-    arcgisSearchEnabled,
     inPersonCtaVariantTestingEnabled,
     inPersonCtaVariantActive,
   } = appRoot.dataset as DOMStringMap & AppRootData;
@@ -132,7 +131,6 @@ const trackEvent: typeof baseTrackEvent = (event, payload) => {
       InPersonContext.Provider,
       {
         value: {
-          arcgisSearchEnabled: arcgisSearchEnabled === 'true',
           inPersonCtaVariantTestingEnabled: inPersonCtaVariantTestingEnabled === true,
           inPersonCtaVariantActive,
           inPersonURL,
diff --git a/app/javascript/packs/pw-strength.js b/app/javascript/packs/pw-strength.js
index 17eba2b800a..0e792f1dea2 100644
--- a/app/javascript/packs/pw-strength.js
+++ b/app/javascript/packs/pw-strength.js
@@ -18,19 +18,10 @@ const snakeCase = (string) => string.replace(/[ -]/g, '_').replace(/\W/g, '').to
 // fallback if zxcvbn lookup fails / field is empty
 const fallback = ['pw-na', '...'];
 
-function clearErrors() {
-  const x = document.getElementsByClassName('error-message');
-  if (x.length > 0) {
-    x[0].innerHTML = '';
-  }
-}
-
 function getStrength(z) {
   // override the strength value to 2 if the password is < 12
-  if (!(z && z.password.length && z.password.length >= 12)) {
-    if (z.score >= 3) {
-      z.score = 2;
-    }
+  if (z.password.length < 12 && z.score >= 3) {
+    z.score = 2;
   }
   return z && z.password.length ? scale[z.score] : fallback;
 }
@@ -85,18 +76,6 @@ export function getFeedback(z) {
   return `${suggestions.map((s) => lookup(s)).join('. ')}`;
 }
 
-function disableSubmit(submitEl, length = 0, score = 0) {
-  if (!submitEl) {
-    return;
-  }
-
-  if (score < 3 || length < 12) {
-    submitEl.setAttribute('disabled', true);
-  } else {
-    submitEl.removeAttribute('disabled');
-  }
-}
-
 /**
  * @param {HTMLElement?} element
  *
@@ -115,30 +94,40 @@ function analyzePw() {
   const pwCntnr = document.getElementById('pw-strength-cntnr');
   const pwStrength = document.getElementById('pw-strength-txt');
   const pwFeedback = document.getElementById('pw-strength-feedback');
-  const submit = document.querySelector('[type="submit"]');
   const forbiddenPasswordsElement = document.querySelector('[data-forbidden]');
   const forbiddenPasswords = getForbiddenPasswords(forbiddenPasswordsElement);
 
-  disableSubmit(submit);
-
   // the pw strength module is hidden by default ("display-none" CSS class)
   // (so that javascript disabled browsers won't see it)
   // thus, first step is unhiding it
   pwCntnr.className = '';
 
-  function checkPasswordStrength(e) {
-    const z = zxcvbn(e.target.value, forbiddenPasswords);
-    const [cls, strength] = getStrength(z);
-    const feedback = getFeedback(z);
+  function updatePasswordFeedback(cls, strength, feedback) {
     pwCntnr.className = cls;
     pwStrength.innerHTML = strength;
     pwFeedback.innerHTML = feedback;
+  }
+
+  function validatePasswordField(score) {
+    if (score < 3) {
+      input.setCustomValidity(t('errors.messages.stronger_password'));
+    } else {
+      input.setCustomValidity('');
+    }
+  }
+
+  function checkPasswordStrength(password) {
+    const z = zxcvbn(password, forbiddenPasswords);
+    const [cls, strength] = getStrength(z);
+    const feedback = getFeedback(z);
 
-    clearErrors();
-    disableSubmit(submit, z.password.length, z.score);
+    validatePasswordField(z.score);
+    updatePasswordFeedback(cls, strength, feedback);
   }
 
-  input.addEventListener('input', checkPasswordStrength);
+  input.addEventListener('input', (e) => {
+    checkPasswordStrength(e.target.value);
+  });
 }
 
 document.addEventListener('DOMContentLoaded', analyzePw);
diff --git a/app/jobs/reports/daily_dropoffs_report.rb b/app/jobs/reports/daily_dropoffs_report.rb
index 223c0bdb7b7..a69ec6e6bbc 100644
--- a/app/jobs/reports/daily_dropoffs_report.rb
+++ b/app/jobs/reports/daily_dropoffs_report.rb
@@ -19,11 +19,7 @@ class DailyDropoffsReport < BaseReport
       verified
     ].freeze
 
-    attr_reader :report_date
-
-    def initialize(report_date = nil)
-      @report_date = report_date
-    end
+    attr_accessor :report_date
 
     def perform(report_date)
       @report_date = report_date
diff --git a/app/jobs/reports/duplicate_ssn_report.rb b/app/jobs/reports/duplicate_ssn_report.rb
index e689e8800a4..4d665aca9af 100644
--- a/app/jobs/reports/duplicate_ssn_report.rb
+++ b/app/jobs/reports/duplicate_ssn_report.rb
@@ -4,11 +4,7 @@ module Reports
   class DuplicateSsnReport < BaseReport
     REPORT_NAME = 'duplicate-ssn-report'
 
-    attr_reader :report_date
-
-    def initialize(report_date = nil)
-      @report_date = report_date
-    end
+    attr_accessor :report_date
 
     def perform(report_date)
       @report_date = report_date
@@ -44,7 +40,13 @@ def report_body
 
       profiles_connected_by_ssn.sort_by!(&:id).reverse!
 
-      count_by_ssn = profiles_connected_by_ssn.group_by(&:ssn_signature).transform_values(&:count)
+      count_by_ssn = profiles_connected_by_ssn.
+        group_by(&:ssn_signature).
+        transform_values(&:count)
+      count_by_ssn_active = profiles_connected_by_ssn.
+        select(&:active?).
+        group_by(&:ssn_signature).
+        transform_values(&:count)
 
       CSV.generate do |csv|
         csv << %w[
@@ -52,21 +54,26 @@ def report_body
           uuid
           account_created_at
           identity_verified_at
+          profile_active
           ssn_fingerprint
           count_ssn_fingerprint
+          count_active_ssn_fingerprint
         ]
 
         profiles_connected_by_ssn.each do |profile|
           ssn_count = count_by_ssn[profile.ssn_signature]
+          ssn_count_active = count_by_ssn_active[profile.ssn_signature]
           next if ssn_count < 2
 
           csv << [
             todays_profile_ids.include?(profile.id),
             profile.user.uuid,
             profile.user.created_at.in_time_zone('UTC').iso8601,
-            profile.activated_at.in_time_zone('UTC').iso8601,
+            profile.activated_at&.in_time_zone('UTC')&.iso8601,
+            profile.active,
             profile.ssn_signature,
             ssn_count,
+            ssn_count_active,
           ]
         end
       end
diff --git a/app/jobs/resolution_proofing_job.rb b/app/jobs/resolution_proofing_job.rb
index 32bd50c5cea..df2677bbbc4 100644
--- a/app/jobs/resolution_proofing_job.rb
+++ b/app/jobs/resolution_proofing_job.rb
@@ -138,7 +138,7 @@ def proof_lexisnexis_then_aamva(timer:, applicant_pii:, should_proof_state_id:)
     state_id_result = Proofing::StateIdResult.new(
       success: true, errors: {}, exception: nil, vendor_name: 'UnsupportedJurisdiction',
     )
-    if should_proof_state_id
+    if should_proof_state_id && user_can_pass_after_state_id_check?(resolution_result)
       timer.time('state_id') do
         state_id_result = state_id_proofer.proof(applicant_pii)
       end
@@ -157,6 +157,20 @@ def proof_lexisnexis_then_aamva(timer:, applicant_pii:, should_proof_state_id:)
     )
   end
 
+  def user_can_pass_after_state_id_check?(resolution_result)
+    return true if resolution_result.success?
+    # For failed IV results, this method validates that the user is eligible to pass if the
+    # failed attributes are covered by the same attributes in a successful AAMVA response
+    # aka the Get-to-Yes w/ AAMVA feature.
+    return false unless resolution_result.failed_result_can_pass_with_additional_verification?
+
+    attributes_aamva_can_pass = [:address, :dob, :state_id_number]
+    results_that_cannot_pass_aamva =
+      resolution_result.attributes_requiring_additional_verification - attributes_aamva_can_pass
+
+    results_that_cannot_pass_aamva.blank?
+  end
+
   def resolution_proofer
     @resolution_proofer ||=
       if IdentityConfig.store.proofer_mock_fallback
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index f50ad096a2f..0645399cf6d 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -286,7 +286,7 @@ def in_person_ready_to_verify(enrollment:)
     ).image_data
 
     with_user_locale(user) do
-      @header = t('in_person_proofing.headings.barcode')
+      @header = t('in_person_proofing.headings.barcode', app_name: APP_NAME)
       @presenter = Idv::InPerson::ReadyToVerifyPresenter.new(
         enrollment: enrollment,
         barcode_image_url: attachments['barcode.png'].url,
diff --git a/app/services/analytics.rb b/app/services/analytics.rb
index bd7d1e2459a..9c7f044cc69 100644
--- a/app/services/analytics.rb
+++ b/app/services/analytics.rb
@@ -4,14 +4,15 @@ class Analytics
   include AnalyticsEvents
   prepend Idv::AnalyticsEventsEnhancer
 
-  attr_reader :user, :request, :sp, :ahoy
+  attr_reader :user, :request, :sp, :ahoy, :irs_session_id
 
-  def initialize(user:, request:, sp:, session:, ahoy: nil)
+  def initialize(user:, request:, sp:, session:, ahoy: nil, irs_session_id: nil)
     @user = user
     @request = request
     @sp = sp
     @ahoy = ahoy || Ahoy::Tracker.new(request: request)
     @session = session
+    @irs_session_id = irs_session_id
   end
 
   def track_event(event, attributes = {})
@@ -26,6 +27,7 @@ def track_event(event, attributes = {})
       locale: I18n.locale,
     }
 
+    analytics_hash[:irs_session_id] = irs_session_id if irs_session_id
     analytics_hash.merge!(request_attributes) if request
 
     ahoy.track(event, analytics_hash)
diff --git a/app/services/analytics_events.rb b/app/services/analytics_events.rb
index 445d71961fd..571df55a675 100644
--- a/app/services/analytics_events.rb
+++ b/app/services/analytics_events.rb
@@ -729,10 +729,6 @@ def idv_doc_auth_cancel_link_sent_submitted(**extra)
     track_event('IdV: doc auth cancel_link_sent submitted', **extra)
   end
 
-  def idv_doc_auth_cancel_send_link_submitted(**extra)
-    track_event('IdV: doc auth cancel_send_link submitted', **extra)
-  end
-
   # @identity.idp.previous_event_name IdV: in person proofing cancel_update_ssn submitted
   def idv_doc_auth_cancel_update_ssn_submitted(**extra)
     track_event('IdV: doc auth cancel_update_ssn submitted', **extra)
@@ -783,14 +779,6 @@ def idv_doc_auth_redo_document_capture_submitted(**extra)
     track_event('IdV: doc auth redo_document_capture submitted', **extra)
   end
 
-  def idv_doc_auth_send_link_visited(**extra)
-    track_event('IdV: doc auth send_link visited', **extra)
-  end
-
-  def idv_doc_auth_send_link_submitted(**extra)
-    track_event('IdV: doc auth send_link submitted', **extra)
-  end
-
   # @identity.idp.previous_event_name IdV: in person proofing ssn submitted
   def idv_doc_auth_ssn_submitted(**extra)
     track_event('IdV: doc auth ssn submitted', **extra)
@@ -3504,6 +3492,22 @@ def contact_redirect(redirect_url:, step: nil, location: nil, flow: nil, **extra
     )
   end
 
+  # @param [String] redirect_url URL user was directed to
+  # @param [String, nil] step which step
+  # @param [String, nil] location which part of a step, if applicable
+  # @param ["idv", String, nil] flow which flow
+  # User was redirected to the login.gov policy page
+  def policy_redirect(redirect_url:, step: nil, location: nil, flow: nil, **extra)
+    track_event(
+      'Policy Page Redirect',
+      redirect_url: redirect_url,
+      step: step,
+      location: location,
+      flow: flow,
+      **extra,
+    )
+  end
+
   # Tracks if a user clicks the "Show Password button"
   # @param [String] path URL path where the click occurred
   def show_password_button_clicked(path:, **extra)
diff --git a/app/services/idv/actions/cancel_link_sent_action.rb b/app/services/idv/actions/cancel_link_sent_action.rb
index a1d32d19ae2..b38e6c0b4ee 100644
--- a/app/services/idv/actions/cancel_link_sent_action.rb
+++ b/app/services/idv/actions/cancel_link_sent_action.rb
@@ -6,10 +6,7 @@ def self.analytics_submitted_event
       end
 
       def call
-        mark_step_incomplete(:send_link)
-        if IdentityConfig.store.doc_auth_combined_hybrid_handoff_enabled
-          mark_step_incomplete(:upload)
-        end
+        mark_step_incomplete(:upload)
       end
     end
   end
diff --git a/app/services/idv/actions/cancel_send_link_action.rb b/app/services/idv/actions/cancel_send_link_action.rb
deleted file mode 100644
index 1bf64fefef9..00000000000
--- a/app/services/idv/actions/cancel_send_link_action.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module Idv
-  module Actions
-    class CancelSendLinkAction < Idv::Steps::DocAuthBaseStep
-      def self.analytics_submitted_event
-        :idv_doc_auth_cancel_send_link_submitted
-      end
-
-      def call
-        mark_step_incomplete(:upload)
-      end
-    end
-  end
-end
diff --git a/app/services/idv/flows/doc_auth_flow.rb b/app/services/idv/flows/doc_auth_flow.rb
index 2fdec534840..ff799eb7ebe 100644
--- a/app/services/idv/flows/doc_auth_flow.rb
+++ b/app/services/idv/flows/doc_auth_flow.rb
@@ -5,7 +5,6 @@ class DocAuthFlow < Flow::BaseFlow
         welcome: Idv::Steps::WelcomeStep,
         agreement: Idv::Steps::AgreementStep,
         upload: Idv::Steps::UploadStep,
-        send_link: Idv::Steps::SendLinkStep,
         link_sent: Idv::Steps::LinkSentStep,
         email_sent: Idv::Steps::EmailSentStep,
         document_capture: Idv::Steps::DocumentCaptureStep,
@@ -30,7 +29,6 @@ class DocAuthFlow < Flow::BaseFlow
       OPTIONAL_SHOW_STEPS = {}.freeze
 
       ACTIONS = {
-        cancel_send_link: Idv::Actions::CancelSendLinkAction,
         cancel_link_sent: Idv::Actions::CancelLinkSentAction,
         redo_address: Idv::Actions::RedoAddressAction,
         redo_document_capture: Idv::Actions::RedoDocumentCaptureAction,
diff --git a/app/services/idv/flows/in_person_flow.rb b/app/services/idv/flows/in_person_flow.rb
index ae1a3b074e8..ace2b1beda0 100644
--- a/app/services/idv/flows/in_person_flow.rb
+++ b/app/services/idv/flows/in_person_flow.rb
@@ -58,7 +58,7 @@ def extra_analytics_properties
         return {} if @flow_session[:pii_from_user][:same_address_as_id].nil?
         {
           same_address_as_id: @flow_session[:pii_from_user][:same_address_as_id].to_s == 'true',
-          pii_like_keypaths: [[:same_address_as_id]],
+          pii_like_keypaths: [[:same_address_as_id], [:state_id, :state_id_jurisdiction]],
         }
       end
     end
diff --git a/app/services/idv/session.rb b/app/services/idv/session.rb
index e5c9d65af1c..685969558c4 100644
--- a/app/services/idv/session.rb
+++ b/app/services/idv/session.rb
@@ -169,6 +169,11 @@ def invalidate_verify_info_step!
       session[:profile_confirmation] = nil
     end
 
+    def invalidate_steps_after_verify_info!
+      session[:address_verification_mechanism] = 'phone'
+      invalidate_phone_step!
+    end
+
     def invalidate_phone_step!
       session[:vendor_phone_confirmation] = nil
       session[:user_phone_confirmation] = nil
diff --git a/app/services/idv/steps/send_link_step.rb b/app/services/idv/steps/send_link_step.rb
deleted file mode 100644
index 62295b74dfa..00000000000
--- a/app/services/idv/steps/send_link_step.rb
+++ /dev/null
@@ -1,128 +0,0 @@
-module Idv
-  module Steps
-    class SendLinkStep < DocAuthBaseStep
-      include ActionView::Helpers::DateHelper
-
-      STEP_INDICATOR_STEP = :verify_id
-
-      def self.analytics_visited_event
-        :idv_doc_auth_send_link_visited
-      end
-
-      def self.analytics_submitted_event
-        :idv_doc_auth_send_link_submitted
-      end
-
-      def call
-        throttle.increment!
-        return throttled_failure if throttle.throttled?
-        telephony_result = send_link
-        failure_reason = nil
-        if !telephony_result.success?
-          failure_reason = { telephony: [telephony_result.error.class.name.demodulize] }
-        end
-        idv_session[:phone_for_mobile_flow] = permit(:phone)[:phone]
-        @flow.irs_attempts_api_tracker.idv_phone_upload_link_sent(
-          success: telephony_result.success?,
-          phone_number: formatted_destination_phone,
-          failure_reason: failure_reason,
-        )
-        build_telephony_form_response(telephony_result)
-      end
-
-      def extra_view_variables
-        {
-          idv_phone_form: build_form,
-        }
-      end
-
-      private
-
-      def build_form
-        Idv::PhoneForm.new(
-          previous_params: {},
-          user: current_user,
-          delivery_methods: [:sms],
-        )
-      end
-
-      def build_telephony_form_response(telephony_result)
-        FormResponse.new(
-          success: telephony_result.success?,
-          errors: { message: telephony_result.error&.friendly_message },
-          extra: { telephony_response: telephony_result.to_h },
-        )
-      end
-
-      def throttled_failure
-        @flow.analytics.throttler_rate_limit_triggered(
-          throttle_type: :idv_send_link,
-        )
-        message = I18n.t(
-          'errors.doc_auth.send_link_throttle',
-          timeout: distance_of_time_in_words(
-            Time.zone.now,
-            [throttle.expires_at, Time.zone.now].compact.max,
-            except: :seconds,
-          ),
-        )
-
-        @flow.irs_attempts_api_tracker.idv_phone_send_link_rate_limited(
-          phone_number: formatted_destination_phone,
-        )
-
-        failure(message)
-      end
-
-      def send_link
-        session_uuid = flow_session[:document_capture_session_uuid]
-        update_document_capture_session_requested_at(session_uuid)
-        Telephony.send_doc_auth_link(
-          to: formatted_destination_phone,
-          link: link(session_uuid),
-          country_code: Phonelib.parse(formatted_destination_phone).country,
-          sp_or_app_name: sp_or_app_name,
-        )
-      end
-
-      def sp_or_app_name
-        current_sp&.friendly_name.presence || APP_NAME
-      end
-
-      def form_submit
-        params = permit(:phone)
-        params[:otp_delivery_preference] = 'sms'
-        build_form.submit(params)
-      end
-
-      def formatted_destination_phone
-        raw_phone = permit(:phone)[:phone]
-        PhoneFormatter.format(raw_phone, country_code: 'US')
-      end
-
-      def update_document_capture_session_requested_at(session_uuid)
-        document_capture_session = DocumentCaptureSession.find_by(uuid: session_uuid)
-        return unless document_capture_session
-        document_capture_session.update!(
-          requested_at: Time.zone.now,
-          cancelled_at: nil,
-          issuer: sp_session[:issuer],
-        )
-      end
-
-      def link(session_uuid)
-        idv_capture_doc_dashes_url(
-          'document-capture-session': session_uuid,
-          request_id: sp_session[:request_id],
-        )
-      end
-
-      def throttle
-        @throttle ||= Throttle.new(
-          user: current_user,
-          throttle_type: :idv_send_link,
-        )
-      end
-    end
-  end
-end
diff --git a/app/services/idv/steps/upload_step.rb b/app/services/idv/steps/upload_step.rb
index 4d4ded41f61..718a145b0ca 100644
--- a/app/services/idv/steps/upload_step.rb
+++ b/app/services/idv/steps/upload_step.rb
@@ -21,27 +21,14 @@ def call
         # app/views/idv/doc_auth/upload.html.erb
         if params[:type] == 'desktop'
           handle_desktop_selection
-        elsif params[:combined]
-          # The user was shown the new combined view and
-          # submitted a phone number to this step with feature flag on
-          # OR
-          # The user was originally shown the new combined view,
-          # but has submitted to a step with the feature flag off
-          # (50/50 from new to old)
-          handle_phone_submission
         else
-          handle_mobile_selection
+          return bypass_send_link_steps if mobile_device?
+          handle_phone_submission
         end
       end
 
       def extra_view_variables
-        if IdentityConfig.store.doc_auth_combined_hybrid_handoff_enabled
-          {
-            idv_phone_form: build_form,
-          }
-        else
-          {}
-        end
+        { idv_phone_form: build_form }
       end
 
       private
@@ -63,26 +50,13 @@ def build_form
       end
 
       def form_submit
-        return super if !IdentityConfig.store.doc_auth_combined_hybrid_handoff_enabled
-        return super if params[:type] == 'desktop'
-
-        # Remove after 50/50 deploy w/ flag
-        return super if params[:type] != 'combined'
+        return super unless params[:type] == 'mobile'
 
         params = permit(:phone)
         params[:otp_delivery_preference] = 'sms'
         build_form.submit(params)
       end
 
-      # To be removed after 50/50
-      def handle_mobile_selection
-        if mobile_device?
-          bypass_send_link_steps
-        else
-          send_user_to_send_link_step
-        end
-      end
-
       def handle_phone_submission
         throttle.increment!
         return throttled_failure if throttle.throttled?
@@ -125,13 +99,7 @@ def send_user_to_email_sent_step
         form_response(destination: :email_sent)
       end
 
-      def send_user_to_send_link_step
-        mark_step_complete(:email_sent)
-        form_response(destination: :send_link)
-      end
-
       def bypass_send_link_steps
-        mark_step_complete(:send_link)
         mark_step_complete(:link_sent)
         mark_step_complete(:email_sent)
         form_response(destination: :document_capture)
diff --git a/app/services/idv/steps/verify_base_step.rb b/app/services/idv/steps/verify_base_step.rb
index f28af31beda..902c1cc3eb0 100644
--- a/app/services/idv/steps/verify_base_step.rb
+++ b/app/services/idv/steps/verify_base_step.rb
@@ -251,7 +251,8 @@ def async_state_done(current_async_state)
           # todo: add other edited fields?
           extra: {
             address_edited: !!flow_session['address_edited'],
-            pii_like_keypaths: [[:errors, :ssn], [:response_body, :first_name]],
+            pii_like_keypaths: [[:errors, :ssn], [:response_body, :first_name],
+                                [:state_id, :state_id_jurisdiction]],
           },
         )
         log_idv_verification_submitted_event(
diff --git a/app/services/pii/attributes.rb b/app/services/pii/attributes.rb
index facebec8d23..53119c0949b 100644
--- a/app/services/pii/attributes.rb
+++ b/app/services/pii/attributes.rb
@@ -1,14 +1,17 @@
 module Pii
   DEPRECATED_PII_ATTRIBUTES = [
     :otp, # https://github.com/18F/identity-idp/pull/1661
+    # Address fields that we might be able to remove. We don't think these were ever used in prod
+    :prev_address1, :prev_address2, :prev_city, :prev_state, :prev_zipcode
   ].freeze
 
   Attributes = RedactedStruct.new(
     :first_name, :middle_name, :last_name,
-    :state_id_address1, :state_id_address2, :state_id_city, :state_id_zipcode,
+    # The user's residential address
     :address1, :address2, :city, :state, :zipcode, :same_address_as_id,
+    # The address on a user's state-issued ID, which may be different from their residential address
+    :state_id_address1, :state_id_address2, :state_id_city, :state_id_jurisdiction, :state_id_zipcode, # rubocop:disable Layout/LineLength
     :ssn, :dob, :phone,
-    :prev_address1, :prev_address2, :prev_city, :prev_state, :prev_zipcode,
     *DEPRECATED_PII_ATTRIBUTES
   ) do
     def self.new_from_hash(hash)
diff --git a/app/services/proofing/lexis_nexis/instant_verify/proofer.rb b/app/services/proofing/lexis_nexis/instant_verify/proofer.rb
index 73fe1f63ecf..e156e27b51b 100644
--- a/app/services/proofing/lexis_nexis/instant_verify/proofer.rb
+++ b/app/services/proofing/lexis_nexis/instant_verify/proofer.rb
@@ -50,7 +50,7 @@ def parse_verification_errors(verification_response)
         def failed_result_can_pass_with_additional_verification?(verification_response)
           return false unless verification_response.verification_status == 'failed'
           return false unless verification_response.verification_errors.keys.to_set == Set[:InstantVerify, :base]
-          return false unless verification_response.verification_errors[:base].match?(/total\.scoring\.model\.verification\.fail/)
+          return false unless verification_response.verification_errors[:base].match?(/(total|priority)\.scoring\.model\.verification\.fail/)
           return false unless attributes_requiring_additional_verification(verification_response).any?
           true
         end
diff --git a/app/services/user_event_creator.rb b/app/services/user_event_creator.rb
index c976f6ba8fa..fc90b3ecf77 100644
--- a/app/services/user_event_creator.rb
+++ b/app/services/user_event_creator.rb
@@ -59,13 +59,15 @@ def create_user_event_with_disavowal(event_type, user = current_user, device = n
 
   # @return [Array(Event, String)] an (event, disavowal_token) tuple
   def create_event_for_existing_device(event_type:, user:, device:, disavowal_token:)
-    device.update_last_used_ip(request.remote_ip)
-    create_event_for_device(
-      event_type: event_type,
-      user: user,
-      device: device,
-      disavowal_token: disavowal_token,
-    )
+    Device.transaction do
+      device.update_last_used_ip(request.remote_ip)
+      create_event_for_device(
+        event_type: event_type,
+        user: user,
+        device: device,
+        disavowal_token: disavowal_token,
+      )
+    end
   end
 
   def build_disavowal_token
@@ -76,11 +78,14 @@ def build_disavowal_token
   def create_event_for_new_device(event_type:, user:, disavowal_token:)
     user_has_multiple_devices = UserDecorator.new(user).devices?
 
-    device = create_device_for_user(user)
     if user_has_multiple_devices && disavowal_token.nil?
-      event, disavowal_token = create_user_event_with_disavowal(
-        event_type, user, device
-      )
+      device, event, disavowal_token = Device.transaction do
+        device = create_device_for_user(user)
+        event, disavowal_token = create_user_event_with_disavowal(
+          event_type, user, device
+        )
+        [device, event, disavowal_token]
+      end
       send_new_device_notification(
         user: user,
         device: device,
@@ -88,12 +93,15 @@ def create_event_for_new_device(event_type:, user:, disavowal_token:)
       )
       [event, disavowal_token]
     else
-      create_event_for_device(
-        device: device,
-        event_type: event_type,
-        user: user,
-        disavowal_token: disavowal_token,
-      )
+      Device.transaction do
+        device = create_device_for_user(user)
+        create_event_for_device(
+          device: device,
+          event_type: event_type,
+          user: user,
+          disavowal_token: disavowal_token,
+        )
+      end
     end
   end
 
diff --git a/app/services/usps_in_person_proofing/mock/proofer.rb b/app/services/usps_in_person_proofing/mock/proofer.rb
index f3738f7b6da..69b7d3da0d9 100644
--- a/app/services/usps_in_person_proofing/mock/proofer.rb
+++ b/app/services/usps_in_person_proofing/mock/proofer.rb
@@ -30,17 +30,6 @@ def request_enroll(applicant)
       def request_facilities(_location)
         parse_facilities(JSON.parse(Fixtures.request_facilities_response))
       end
-
-      def request_pilot_facilities
-        parse_facilities(
-          JSON.load_file(
-            Rails.root.join(
-              'config',
-              'ipp_pilot_usps_facilities.json',
-            ),
-          ),
-        )
-      end
     end
   end
 end
diff --git a/app/services/usps_in_person_proofing/proofer.rb b/app/services/usps_in_person_proofing/proofer.rb
index 3f6b660c9f3..192aa05ac85 100644
--- a/app/services/usps_in_person_proofing/proofer.rb
+++ b/app/services/usps_in_person_proofing/proofer.rb
@@ -28,13 +28,6 @@ def request_facilities(location)
       sort_by_ascending_distance(dedupe_facilities)
     end
 
-    # Temporary function to return a static set of facilities
-    # @return [Array<PostOffice>] Facility locations
-    def request_pilot_facilities
-      resp = File.read(Rails.root.join('config', 'ipp_pilot_usps_facilities.json'))
-      parse_facilities(JSON.parse(resp))
-    end
-
     # Makes HTTP request to enroll an applicant in in-person proofing.
     # Requires first name, last name, address, city, state, zip code, email address and a generated
     # unique ID. The unique ID must be no longer than 18 characters.
diff --git a/app/views/idv/doc_auth/_combined_upload.html.erb b/app/views/idv/doc_auth/_combined_upload.html.erb
deleted file mode 100644
index c3a4b6a2127..00000000000
--- a/app/views/idv/doc_auth/_combined_upload.html.erb
+++ /dev/null
@@ -1,74 +0,0 @@
-<% title t('titles.doc_auth.upload') %>
-
-<%= render 'idv/doc_auth/error_messages', flow_session: flow_session %>
-
-<%= render PageHeadingComponent.new do %>
-  <%= t('doc_auth.headings.combined_upload') %>
-<% end %>
-
-<p>
-  <%= t('doc_auth.info.combined_upload') %>
-</p>
-
-<div class="grid-row grid-gap grid-gap-2">
-  <div class="grid-col-12 tablet:grid-col-auto">
-    <%= image_tag(
-          asset_url('idv/phone-icon.svg'),
-          alt: t('image_description.camera_mobile_phone'),
-          width: 88,
-          height: 88,
-        ) %>
-  </div>
-  <div class="grid-col-12 tablet:grid-col-fill">
-    <div class="usa-tag usa-tag--informative">
-      <%= t('doc_auth.info.tag') %>
-    </div>
-    <h2 class="margin-y-105">
-      <%= t('doc_auth.headings.combined_upload_from_phone') %>
-    </h2>
-    <%= t('doc_auth.info.combined_upload_from_phone') %>
-    <%= simple_form_for(
-          idv_phone_form,
-          as: :doc_auth,
-          url: url_for(type: :mobile, combined: true),
-          method: 'PUT',
-          html: { autocomplete: 'off' },
-        ) do |f| %>
-      <%= render PhoneInputComponent.new(
-            form: f,
-            required: true,
-            delivery_methods: [:sms],
-            class: 'margin-bottom-4',
-          ) %>
-      <%= f.submit t('forms.buttons.send_link') %>
-    <% end %>
-  </div>
-</div>
-
-<hr class="margin-y-4" />
-<div class="grid-row grid-gap grid-gap-2">
-  <div class="grid-col-12 tablet:grid-col-auto">
-    <%= image_tag(
-          asset_url('idv/laptop-icon.svg'),
-          alt: t('image_description.laptop'),
-          width: 88,
-          height: 88,
-        ) %>
-  </div>
-  <div class="grid-col-12 tablet:grid-col-fill">
-    <h2 class="margin-y-105">
-      <%= t('doc_auth.headings.combined_upload_from_computer') %>
-    </h2>
-    <%= t('doc_auth.info.combined_upload_from_computer') %>&nbsp;
-    <%= simple_form_for(
-          :doc_auth,
-          url: url_for(type: :desktop),
-          method: 'PUT',
-          class: 'margin-bottom-4',
-        ) do |f| %>
-      <%= f.submit t('forms.buttons.upload_photos'), outline: true %>
-    <% end %>
-  </div>
-</div>
-
-<%= render 'idv/doc_auth/cancel', step: 'upload' %>
diff --git a/app/views/idv/doc_auth/_upload.html.erb b/app/views/idv/doc_auth/_upload.html.erb
deleted file mode 100644
index 860a2c7e252..00000000000
--- a/app/views/idv/doc_auth/_upload.html.erb
+++ /dev/null
@@ -1,55 +0,0 @@
-<% title t('titles.doc_auth.upload') %>
-
-<%= render 'idv/doc_auth/error_messages', flow_session: flow_session %>
-
-<%= render PageHeadingComponent.new do %>
-  <%= t('doc_auth.headings.upload') %>
-<% end %>
-
-<p>
-  <%= t('doc_auth.info.upload') %>
-</p>
-
-<hr class="margin-y-4" />
-
-<div class="grid-row">
-  <div class="grid-col-12 tablet:grid-col-3">
-    <%= image_tag(
-          asset_url('idv/phone-icon.svg'),
-          alt: t('image_description.camera_mobile_phone'),
-          width: 88,
-          height: 88,
-        ) %>
-  </div>
-  <div class="grid-col-12 tablet:grid-col-9">
-    <div class="usa-tag text-ink bg-primary-lighter margin-top-1">
-      <%= t('doc_auth.info.tag') %>
-    </div>
-    <h2 class="margin-y-105">
-        <%= t('doc_auth.headings.upload_from_phone') %>
-    </h2>
-    <%= t('doc_auth.info.upload_from_phone') %>
-    <%= simple_form_for(
-          :doc_auth,
-          url: url_for(type: :mobile),
-          method: 'PUT',
-          html: { autocomplete: 'off', class: 'margin-top-2' },
-        ) do |f| %>
-        <%= f.submit t('doc_auth.buttons.use_phone'), wide: false, class: 'margin-top-05' %>
-    <% end %>
-  </div>
-</div>
-
-<hr class="margin-y-4" />
-
-<%= t('doc_auth.info.upload_from_computer') %>&nbsp;
-<%= simple_form_for(
-      :doc_auth,
-      url: url_for(type: :desktop),
-      method: 'PUT',
-      html: { class: 'display-inline' },
-    ) do |f| %>
-    <%= f.submit t('doc_auth.info.upload_computer_link'), unstyled: true, big: false %>
-<% end %>
-
-<%= render 'idv/doc_auth/cancel', step: 'upload' %>
diff --git a/app/views/idv/doc_auth/send_link.html.erb b/app/views/idv/doc_auth/send_link.html.erb
deleted file mode 100644
index 1e49331ba97..00000000000
--- a/app/views/idv/doc_auth/send_link.html.erb
+++ /dev/null
@@ -1,33 +0,0 @@
-<% title t('titles.doc_auth.take_photo') %>
-
-<% if flow_session[:error_message] %>
-  <%= render AlertComponent.new(
-        type: :error,
-        class: 'margin-bottom-4',
-        message: flow_session[:error_message],
-      ) %>
-<% end %>
-
-<%= render PageHeadingComponent.new.with_content(t('doc_auth.headings.take_picture')) %>
-
-<p><%= t('doc_auth.info.take_picture') %></p>
-
-<p class="margin-y-4"><strong><%= t('doc_auth.info.camera_required') %></strong></p>
-
-<p><%= t('doc_auth.instructions.send_sms') %></p>
-<%= simple_form_for(
-      idv_phone_form,
-      as: :doc_auth,
-      url: url_for,
-      method: 'PUT',
-      html: { autocomplete: 'off' },
-    ) do |f| %>
-  <%= render PhoneInputComponent.new(
-        form: f,
-        required: true,
-        delivery_methods: [:sms],
-        class: 'margin-bottom-4',
-      ) %>
-  <%= f.submit t('forms.buttons.continue'), class: 'margin-top-4' %>
-<% end %>
-<%= render 'idv/shared/back', action: 'cancel_send_link' %>
diff --git a/app/views/idv/doc_auth/upload.html.erb b/app/views/idv/doc_auth/upload.html.erb
index 16061aa99d4..c3a4b6a2127 100644
--- a/app/views/idv/doc_auth/upload.html.erb
+++ b/app/views/idv/doc_auth/upload.html.erb
@@ -1,10 +1,74 @@
-<% if IdentityConfig.store.doc_auth_combined_hybrid_handoff_enabled %>
-    <%= render partial: 'idv/doc_auth/combined_upload', locals: {
-          flow_session: flow_session,
-          idv_phone_form: idv_phone_form,
-        } %>
-<% else %>
-    <%= render partial: 'idv/doc_auth/upload', locals: {
-          flow_session: flow_session,
-        } %>
+<% title t('titles.doc_auth.upload') %>
+
+<%= render 'idv/doc_auth/error_messages', flow_session: flow_session %>
+
+<%= render PageHeadingComponent.new do %>
+  <%= t('doc_auth.headings.combined_upload') %>
 <% end %>
+
+<p>
+  <%= t('doc_auth.info.combined_upload') %>
+</p>
+
+<div class="grid-row grid-gap grid-gap-2">
+  <div class="grid-col-12 tablet:grid-col-auto">
+    <%= image_tag(
+          asset_url('idv/phone-icon.svg'),
+          alt: t('image_description.camera_mobile_phone'),
+          width: 88,
+          height: 88,
+        ) %>
+  </div>
+  <div class="grid-col-12 tablet:grid-col-fill">
+    <div class="usa-tag usa-tag--informative">
+      <%= t('doc_auth.info.tag') %>
+    </div>
+    <h2 class="margin-y-105">
+      <%= t('doc_auth.headings.combined_upload_from_phone') %>
+    </h2>
+    <%= t('doc_auth.info.combined_upload_from_phone') %>
+    <%= simple_form_for(
+          idv_phone_form,
+          as: :doc_auth,
+          url: url_for(type: :mobile, combined: true),
+          method: 'PUT',
+          html: { autocomplete: 'off' },
+        ) do |f| %>
+      <%= render PhoneInputComponent.new(
+            form: f,
+            required: true,
+            delivery_methods: [:sms],
+            class: 'margin-bottom-4',
+          ) %>
+      <%= f.submit t('forms.buttons.send_link') %>
+    <% end %>
+  </div>
+</div>
+
+<hr class="margin-y-4" />
+<div class="grid-row grid-gap grid-gap-2">
+  <div class="grid-col-12 tablet:grid-col-auto">
+    <%= image_tag(
+          asset_url('idv/laptop-icon.svg'),
+          alt: t('image_description.laptop'),
+          width: 88,
+          height: 88,
+        ) %>
+  </div>
+  <div class="grid-col-12 tablet:grid-col-fill">
+    <h2 class="margin-y-105">
+      <%= t('doc_auth.headings.combined_upload_from_computer') %>
+    </h2>
+    <%= t('doc_auth.info.combined_upload_from_computer') %>&nbsp;
+    <%= simple_form_for(
+          :doc_auth,
+          url: url_for(type: :desktop),
+          method: 'PUT',
+          class: 'margin-bottom-4',
+        ) do |f| %>
+      <%= f.submit t('forms.buttons.upload_photos'), outline: true %>
+    <% end %>
+  </div>
+</div>
+
+<%= render 'idv/doc_auth/cancel', step: 'upload' %>
diff --git a/app/views/idv/in_person/ready_to_verify/show.html.erb b/app/views/idv/in_person/ready_to_verify/show.html.erb
index 4367928cfe1..240532438b3 100644
--- a/app/views/idv/in_person/ready_to_verify/show.html.erb
+++ b/app/views/idv/in_person/ready_to_verify/show.html.erb
@@ -18,7 +18,7 @@
     ) %>
 
 <%= render PageHeadingComponent.new(class: 'text-center') do %>
-  <%= t('in_person_proofing.headings.barcode') %>
+  <%= t('in_person_proofing.headings.barcode', app_name: APP_NAME) %>
 <% end %>
 
 <%= render AlertComponent.new(class: 'margin-y-4', text_tag: :div) do %>
diff --git a/app/views/idv/shared/_document_capture.html.erb b/app/views/idv/shared/_document_capture.html.erb
index 362654929d0..de0f2f514fc 100644
--- a/app/views/idv/shared/_document_capture.html.erb
+++ b/app/views/idv/shared/_document_capture.html.erb
@@ -43,7 +43,6 @@
       keep_alive_endpoint: sessions_keepalive_url,
       idv_in_person_url: Idv::InPersonConfig.enabled_for_issuer?(decorated_session.sp_issuer) ? idv_in_person_url : nil,
       security_and_privacy_how_it_works_url: MarketingSite.security_and_privacy_how_it_works_url,
-      arcgis_search_enabled: IdentityConfig.store.arcgis_search_enabled,
       in_person_cta_variant_testing_enabled: IdentityConfig.store.in_person_cta_variant_testing_enabled,
       in_person_cta_variant_active: in_person_cta_variant_active,
     } %>
diff --git a/app/views/idv/shared/_ssn.html.erb b/app/views/idv/shared/_ssn.html.erb
index 52c8ec52e10..869a02044d4 100644
--- a/app/views/idv/shared/_ssn.html.erb
+++ b/app/views/idv/shared/_ssn.html.erb
@@ -25,10 +25,9 @@ locals:
 
 <p>
   <%= t('doc_auth.info.ssn') %>
-</p>
-
-<p>
-  <%= new_window_link_to(t('doc_auth.instructions.learn_more'), MarketingSite.security_and_privacy_practices_url) %>
+  <%= new_window_link_to(MarketingSite.security_and_privacy_practices_url, class: 'display-inline') do %>
+    <%= t('doc_auth.info.learn_more') %>
+  <% end %>
 </p>
 
 <% if FeatureManagement.proofing_device_profiling_collecting_enabled? %>
diff --git a/app/views/idv/ssn/show.html.erb b/app/views/idv/ssn/show.html.erb
index 3d15e363595..e7bc914d943 100644
--- a/app/views/idv/ssn/show.html.erb
+++ b/app/views/idv/ssn/show.html.erb
@@ -34,7 +34,9 @@ locals:
 
 <p>
   <%= t('doc_auth.info.ssn') %>
-  <%= new_window_link_to(t('doc_auth.instructions.learn_more'), MarketingSite.security_and_privacy_practices_url) %>
+  <%= new_window_link_to(MarketingSite.security_and_privacy_practices_url, class: 'display-inline') do %>
+    <%= t('doc_auth.info.learn_more') %>
+  <% end %>
 </p>
 
 <% if FeatureManagement.proofing_device_profiling_collecting_enabled? %>
diff --git a/config/application.yml.default b/config/application.yml.default
index c421f959f4a..a6fb60f88cf 100644
--- a/config/application.yml.default
+++ b/config/application.yml.default
@@ -44,7 +44,6 @@ address_identity_proofing_supported_country_codes: '["AS", "GU", "MP", "PR", "US
 allow_otp_countdown_expired_redirect: false
 arcgis_api_username: ''
 arcgis_api_password: ''
-arcgis_search_enabled: true
 arcgis_mock_fallback: true
 arcgis_api_generate_token_url: 'https://gis.gsa.gov/portal/sharing/rest/generateToken'
 arcgis_api_suggest_url: 'https://gis.gsa.gov/servernh/rest/services/GSA/USA/GeocodeServer/suggest'
@@ -67,7 +66,6 @@ broken_personal_key_window_start: '2021-07-29T00:00:00Z'
 broken_personal_key_window_finish: '2021-09-22T00:00:00Z'
 component_previews_enabled: false
 country_phone_number_overrides: '{}'
-doc_auth_combined_hybrid_handoff_enabled: false
 doc_auth_error_dpi_threshold: 290
 doc_auth_error_sharpness_threshold: 40
 doc_auth_error_glare_threshold: 40
diff --git a/config/database.yml b/config/database.yml
index c9e9cd9efd1..0ecc4244307 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -81,6 +81,8 @@ production:
     host: <%= IdentityConfig.store.database_socket.present? ?  IdentityConfig.store.database_socket : IdentityConfig.store.database_host %>
     password: <%= IdentityConfig.store.database_password %>
     pool: <%= primary_pool %>
+    advisory_locks: <%= !IdentityConfig.store.database_socket.present? %>
+    prepared_statements: <%= !IdentityConfig.store.database_socket.present? %>
     sslmode: 'verify-full'
     sslrootcert: '/usr/local/share/aws/rds-combined-ca-bundle.pem'
     migrations_paths: db/primary_migrate
diff --git a/config/ipp_pilot_usps_facilities.json b/config/ipp_pilot_usps_facilities.json
deleted file mode 100644
index 0654787c472..00000000000
--- a/config/ipp_pilot_usps_facilities.json
+++ /dev/null
@@ -1,165 +0,0 @@
-{
-  "postOffices": [
-    {
-      "parking": "Lot",
-      "hours": [
-        {
-          "weekdayHours": "8:30 AM - 7:00 PM"
-        },
-        {
-          "saturdayHours": "8:30 AM - 5:00 PM"
-        },
-        {
-          "sundayHours": "Closed"
-        }
-      ],
-      "distance": null,
-      "streetAddress": "900 E FAYETTE ST RM 118",
-      "city": "BALTIMORE",
-      "phone": "410-347-4202",
-      "name": "BALTIMORE",
-      "zip4": "9715",
-      "state": "MD",
-      "zip5": "21233",
-      "isPilot": true
-    },
-    {
-      "parking": "Street",
-      "hours": [
-        {
-          "weekdayHours": "9:00 AM - 5:00 PM"
-        },
-        {
-          "saturdayHours": "9:00 AM - 4:00 PM"
-        },
-        {
-          "sundayHours": "Closed"
-        }
-      ],
-      "distance": null,
-      "streetAddress": "6900 WISCONSIN AVE STE 100",
-      "city": "CHEVY CHASE",
-      "phone": "301-941-2670",
-      "name": "BETHESDA",
-      "zip4": "9996",
-      "state": "MD",
-      "zip5": "20815",
-      "isPilot": true
-    },
-    {
-      "parking": "Lot",
-      "hours": [
-        {
-          "weekdayHours": "8:00 AM - 6:00 PM"
-        },
-        {
-          "saturdayHours": "8:00 AM - 4:00 PM"
-        },
-        {
-          "sundayHours": "10:00 AM - 4:00 PM"
-        }
-      ],
-      "distance": null,
-      "streetAddress": "4005 WISCONSIN AVE NW",
-      "city": "WASHINGTON",
-      "phone": "202-842-3332",
-      "name": "FRIENDSHIP",
-      "zip4": "9997",
-      "state": "DC",
-      "zip5": "20016",
-      "isPilot": true
-    },
-    {
-      "parking": "Lot",
-      "hours": [
-        {
-          "weekdayHours": "9:00 AM - 5:00 PM"
-        },
-        {
-          "saturdayHours": "9:00 AM - 4:00 PM"
-        },
-        {
-          "sundayHours": "Closed"
-        }
-      ],
-      "distance": null,
-      "streetAddress": "900 BRENTWOOD RD NE",
-      "city": "WASHINGTON",
-      "phone": "202-636-1259",
-      "name": "WASHINGTON",
-      "zip4": "9998",
-      "state": "DC",
-      "zip5": "20066",
-      "isPilot": true
-    },
-    {
-      "parking": "Street",
-      "hours": [
-        {
-          "weekdayHours": "9:00 AM - 5:00 PM"
-        },
-        {
-          "saturdayHours": "9:00 AM - 1:00 PM"
-        },
-        {
-          "sundayHours": "Closed"
-        }
-      ],
-      "distance": null,
-      "streetAddress": "3118 WASHINGTON BLVD",
-      "city": "ARLINGTON",
-      "phone": "703-993-0072",
-      "name": "ARLINGTON",
-      "zip4": "9998",
-      "state": "VA",
-      "zip5": "22201",
-      "isPilot": true
-    },
-    {
-      "parking": "Lot",
-      "hours": [
-        {
-          "weekdayHours": "9:00 AM - 6:00 PM"
-        },
-        {
-          "saturdayHours": "9:00 AM - 1:00 PM"
-        },
-        {
-          "sundayHours": "Closed"
-        }
-      ],
-      "distance": null,
-      "streetAddress": "44715 PRENTICE DR",
-      "city": "DULLES",
-      "phone": "703-406-6291",
-      "name": "ASHBURN",
-      "zip4": "9996",
-      "state": "VA",
-      "zip5": "20101",
-      "isPilot": true
-    },
-    {
-      "parking": "Lot",
-      "hours": [
-        {
-          "weekdayHours": "9:00 AM - 8:00 PM"
-        },
-        {
-          "saturdayHours": "9:00 AM - 5:00 PM"
-        },
-        {
-          "sundayHours": "9:00 AM - 5:00 PM"
-        }
-      ],
-      "distance": null,
-      "streetAddress": "8409 LEE HWY",
-      "city": "MERRIFIELD",
-      "phone": "703-698-6377",
-      "name": "MERRIFIELD",
-      "zip4": "9998",
-      "state": "VA",
-      "zip5": "22116",
-      "isPilot": true
-    }
-  ]
-}
diff --git a/config/locales/doc_auth/en.yml b/config/locales/doc_auth/en.yml
index 23fe39ad651..b1bb7d6f29f 100644
--- a/config/locales/doc_auth/en.yml
+++ b/config/locales/doc_auth/en.yml
@@ -13,7 +13,6 @@ en:
       take_picture: Take photo
       take_picture_retry: Retake photo
       upload_picture: Upload photo
-      use_phone: Use your phone
     errors:
       alerts:
         barcode_content_check: We couldn’t read the barcode on the back of your ID. It
@@ -126,10 +125,7 @@ en:
       secure_account: Secure your account
       ssn: Enter your Social Security number
       ssn_update: Update your Social Security number
-      take_picture: Take a photo with a phone
       text_message: We sent a message to your phone
-      upload: How would you like to upload your state-issued ID?
-      upload_from_phone: Take a photo with a mobile phone to upload your ID
       verify_identity: Verify your identity
       welcome: Get started verifying your identity
     hybrid_flow_warning:
@@ -145,7 +141,6 @@ en:
     info:
       address_guidance_puerto_rico_html: For Puerto Rico residents:<br><br>Please
         enter urbanization or condominium on address line 2.
-      camera_required: Your mobile phone must have a camera and a web browser.
       capture_status_big_document: Too Close
       capture_status_capturing: Capturing
       capture_status_none: Align
@@ -167,6 +162,7 @@ en:
       interstitial_thanks: Thanks for your patience!
       irs_reproofing_explanation: As an extra security measure, you must verify your identity again for IRS
       keep_window_open: Do not close this window.
+      learn_more: Learn more about how we protect your sensitive information
       lets_go: 'Identity verification happens in two parts:'
       link_sent: Please check your phone and follow instructions to take a photo of
         your state-issued ID.
@@ -179,17 +175,10 @@ en:
       secure_account: We’ll encrypt your account with your password. Encryption means
         your data is protected and only you will be able to access or change
         your information.
-      ssn: We need your Social Security number to validate your name, date of birth
-        and address.  Your Social Security number is encrypted.  With your
-        consent, we share this information with the government agency you are
-        trying to access to verify your identity.
+      ssn: We need your Social Security number to verify your name, date of birth and
+        address.
       tag: Recommended
-      take_picture: Use the camera on your mobile phone and upload images of your
-        ID.  We only use the images to verify your identity.
       upload: We’ll collect information about you by reading your state-issued ID.
-      upload_computer_link: Upload from your computer
-      upload_from_computer: Don’t have a phone?
-      upload_from_phone: Upload pictures directly from your phone camera
       verify_identity: We’ll ask for your personal information to verify your identity
         against public records.
       welcome_html: '%{sp_name} needs to make sure you are you — not someone
@@ -206,8 +195,6 @@ en:
         instructions to verify your identity.
       learn_more: Learn more about our privacy and security measures
       privacy: Our privacy and security standards
-      send_sms: We’ll send a text message to your device with a link.  Follow that
-        link to your browser to take photos of the front and back of your ID.
       switch_back: Switch back to your computer to finish verifying your identity.
       switch_back_image: Arrow pointing from phone to computer
       test_ssn: In the test environment only SSNs that begin with “900-” or “666-” are
diff --git a/config/locales/doc_auth/es.yml b/config/locales/doc_auth/es.yml
index 9b0cbad34db..7947eb82664 100644
--- a/config/locales/doc_auth/es.yml
+++ b/config/locales/doc_auth/es.yml
@@ -13,7 +13,6 @@ es:
       take_picture: Tomar una foto
       take_picture_retry: Retirar la foto
       upload_picture: Subir foto
-      use_phone: Usa tu telefono
     errors:
       alerts:
         barcode_content_check: No pudimos leer el código de barras en el reverso de su
@@ -152,11 +151,7 @@ es:
       secure_account: Asegure su cuenta
       ssn: Ingresa tu número de Seguro Social
       ssn_update: Actualice su número de Seguro Social
-      take_picture: Toma una foto con un teléfono
       text_message: Enviamos un mensaje a su teléfono
-      upload: '¿Cómo le gustaría subir su documento de identidad expedido por el
-        estado?'
-      upload_from_phone: Tome una foto con un teléfono móvil para cargar su identificación
       verify_identity: Verifique su identidad
       welcome: Comience a verificar su identidad
     hybrid_flow_warning:
@@ -175,7 +170,6 @@ es:
       address_guidance_puerto_rico_html: Para residentes de Puerto
         Rico:<br><br>Incluyan en su dirección la urbanización o departamento en
         la línea de dirección 2.
-      camera_required: Su teléfono móvil debe tener una cámara y un navegador web.
       capture_status_big_document: Demasiado cerca
       capture_status_capturing: Capturando
       capture_status_none: Alinea
@@ -200,6 +194,7 @@ es:
       irs_reproofing_explanation: Como medida adicional de seguridad, tiene que
         verificar su identidad de nuevo para el Servicio Interno de Impuestos.
       keep_window_open: No cierres esta ventana.
+      learn_more: Obtenga más información sobre cómo protegemos sus datos confidenciales
       lets_go: 'La verificación de la identidad se realiza en dos partes:'
       link_sent: Verifique su teléfono y siga las instrucciones para tomar una
         fotografía de la identificación emitida por su estado.
@@ -214,19 +209,11 @@ es:
       secure_account: Vamos a encriptar su cuenta con su contraseña. La encriptación
         significa que sus datos están protegidos y solo usted podrá acceder o
         modificar su información.
-      ssn: Necesitamos su número de Seguro Social para validar su nombre, fecha de
-        nacimiento y habla a. Su número de Seguro Social está encriptado. Con su
-        consentimiento, compartimos este información con la agencia
-        gubernamental a la que está intentando acceder para verificar su
-        identidad.
+      ssn: Necesitamos tu número de Seguro Social para validar tu nombre, fecha de
+        nacimiento y dirección.
       tag: Recomendado
-      take_picture: Use la cámara en su teléfono móvil y cargue imágenes de su
-        identificación. Solo usamos las imágenes para verificar su identidad.
       upload: Recopilaremos información sobre usted leyendo su documento de identidad
         expedido por el estado.
-      upload_computer_link: Sube desde tu computadora
-      upload_from_computer: '¿No tiene un teléfono?'
-      upload_from_phone: Sube imágenes directamente desde la cámara de tu teléfono
       verify_identity: Le preguntaremos sus datos personales para verificar su
         identidad comparándola con los registros públicos.
       welcome_html: '%{sp_name} necesita asegurarse de que es usted y no es alguien
@@ -243,9 +230,6 @@ es:
         escritorio y siga las instrucciones para verificar su identidad.
       learn_more: Obtenga más información sobre nuestras medidas de privacidad y seguridad
       privacy: Nuestras normas de privacidad y seguridad
-      send_sms: Le enviaremos un mensaje de texto a su dispositivo con un enlace. Siga
-        ese enlace a su navegador para tomar fotografías de la parte delantera y
-        trasera de su identificación.
       switch_back: Regrese a su computadora para continuar con la verificación de su
         identidad.
       switch_back_image: Flecha que apunta del teléfono a la computadora
diff --git a/config/locales/doc_auth/fr.yml b/config/locales/doc_auth/fr.yml
index 6bb17c70dee..8b0b4c90aed 100644
--- a/config/locales/doc_auth/fr.yml
+++ b/config/locales/doc_auth/fr.yml
@@ -13,7 +13,6 @@ fr:
       take_picture: Prendre une photo
       take_picture_retry: Reprendre la photo
       upload_picture: Télécharger une photo
-      use_phone: Utilisez votre téléphone
     errors:
       alerts:
         barcode_content_check: Nous n’avons pas pu lire le code-barres au verso de votre
@@ -158,12 +157,7 @@ fr:
       secure_account: Sécuriser votre compte
       ssn: Saisissez votre numéro de sécurité sociale
       ssn_update: Mettre à jour votre numéro de Sécurité Sociale
-      take_picture: Prendre une photo avec un téléphone
       text_message: Nous avons envoyé un message à votre téléphone
-      upload: Comment souhaitez-vous télécharger votre carte d’identité délivrée par
-        l’État?
-      upload_from_phone: Prenez une photo avec un téléphone portable pour télécharger
-        votre pièce d’identité
       verify_identity: Vérifier votre identité
       welcome: Commencez à vérifier votre identité
     hybrid_flow_warning:
@@ -181,7 +175,6 @@ fr:
       address_guidance_puerto_rico_html: Pour les résidents de Porto
         Rico:<br><br>Veuillez indiquer l’urbanisation ou la copropriété à la
         ligne 2 de votre adresse.
-      camera_required: Votre téléphone portable doit avoir une caméra et un navigateur Web.
       capture_status_big_document: Trop près
       capture_status_capturing: Prendre la photo
       capture_status_none: Alignez
@@ -206,6 +199,8 @@ fr:
       irs_reproofing_explanation: Comme mesure de sécurité supplémentaire, vous devez
         vérifier à nouveau votre identité pour l’IRS.
       keep_window_open: Ne fermez pas cette fenêtre.
+      learn_more: En savoir plus sur la façon dont nous protégeons vos informations
+        confidentielles
       lets_go: La vérification de l’identité se fait en deux temps
       link_sent: Veuillez vérifier votre téléphone et suivre les instructions pour
         prendre une photo de votre identité émise par l’État.
@@ -221,21 +216,11 @@ fr:
       secure_account: Nous chiffrerons votre compte avec votre mot de passe. Le
         chiffrage signifie que vos données sont protégées et que vous êtes le/la
         seul(e) à pouvoir accéder à vos informations ou les modifier.
-      ssn: Nous avons besoin de votre numéro de sécurité sociale pour valider votre
-        nom, date de naissance et adresse. Votre numéro de sécurité sociale est
-        crypté. Avec votre accord, nous partageons ce informations auprès de
-        l’agence gouvernementale à laquelle vous essayez d’accéder pour vérifier
-        votre identité.
+      ssn: Nous avons besoin de votre numéro de sécurité sociale pour vérifier votre
+        nom, date de naissance et adresse.
       tag: Recommandation
-      take_picture: Utilisez l’appareil photo sur votre téléphone portable et
-        téléchargez des images de votre identifiant. Nous utilisons uniquement
-        les images pour vérifier votre identité.
       upload: Nous recueillons des informations sur vous en lisant votre carte
         d’identité délivrée par l’État.
-      upload_computer_link: Téléchargez depuis votre ordinateur
-      upload_from_computer: Vous n’avez pas de téléphone?
-      upload_from_phone: Téléchargez des images directement depuis l’appareil photo de
-        votre téléphone
       verify_identity: Nous vous demanderons vos informations personnelles afin de
         vérifier votre identité par rapport aux registres publics.
       welcome_html: '%{sp_name} doit s’assurer que vous êtes bien vous, et non
@@ -252,9 +237,6 @@ fr:
         suivez les instructions pour vérifier votre identité.
       learn_more: En savoir plus sur nos mesures de confidentialité et de sécurité
       privacy: Nos normes de confidentialité et de sécurité
-      send_sms: Nous enverrons un message texte à votre appareil avec un lien. Suivez
-        ce lien vers votre navigateur pour prendre des photos du recto et du
-        verso de votre identifiant.
       switch_back: Retournez sur votre ordinateur pour continuer à vérifier votre identité.
       switch_back_image: Flèche pointant du téléphone vers l’ordinateur
       test_ssn: Dans l’environnement de test seuls les SSN commençant par “900-” ou
diff --git a/config/locales/errors/en.yml b/config/locales/errors/en.yml
index cb1d6c92a8a..2abeb0cee11 100644
--- a/config/locales/errors/en.yml
+++ b/config/locales/errors/en.yml
@@ -77,6 +77,7 @@ en:
         select a different number and try again.
       pwned_password: The password you entered is not safe. It’s in a list of known
         passwords exposed in data breaches.
+      stronger_password: Enter a stronger password
       too_long:
         one: is too long (maximum is 1 character)
         other: is too long (maximum is %{count} characters)
diff --git a/config/locales/errors/es.yml b/config/locales/errors/es.yml
index eb5aa277e49..ba7ec77acd0 100644
--- a/config/locales/errors/es.yml
+++ b/config/locales/errors/es.yml
@@ -81,6 +81,7 @@ es:
         premium. Por favor, seleccione otro número e inténtelo de nuevo.
       pwned_password: La contraseña que ingresaste no es segura. Está en una lista de
         contraseñas conocidas expuestas en violaciones de datos.
+      stronger_password: Introduzca una contraseña más segura
       too_long:
         one: es demasiado largo (el máximo es 1 carácter)
         other: es demasiado largo (el máximo es %{count} caracteres)
diff --git a/config/locales/errors/fr.yml b/config/locales/errors/fr.yml
index b1649a805d0..96ef1c445db 100644
--- a/config/locales/errors/fr.yml
+++ b/config/locales/errors/fr.yml
@@ -91,6 +91,7 @@ fr:
       pwned_password: Le mot de passe que vous avez entré n’est pas sécurisé. C’est
         dans une liste de mots de passe connus exposés dans les violations de
         données.
+      stronger_password: Entrez un mot de passe plus fort
       too_long:
         one: Est trop long (maximum de 1 caractère)
         other: est trop long (le maximum est de %{count} caractères)
diff --git a/config/locales/in_person_proofing/en.yml b/config/locales/in_person_proofing/en.yml
index b332767ad65..d68dc2e3007 100644
--- a/config/locales/in_person_proofing/en.yml
+++ b/config/locales/in_person_proofing/en.yml
@@ -13,7 +13,7 @@ en:
         deadline_restart: If you go after the deadline, your information will not be
           saved and you will need to restart the process.
         email_sent: We have sent this information to the email you used to log in.
-        items_to_bring: 'Remember to bring these items with you to the Post Office:'
+        items_to_bring: 'Show the following items to any Post Office associate:'
         learn_more: Learn more about what to bring
         location_details: Location details
         questions: Question?
@@ -37,10 +37,6 @@ en:
           other: '%{count} miles away'
         inline_error: Enter a valid address with city, state, and ZIP code
         location_button: Select
-        location_step_about: If you are having trouble adding your ID, you may be able
-          to verify in person at a local United States Post Office in select
-          locations.
-        none_found: No locations found.
         po_search:
           address_search_hint: 'Example: 1234 N Example St., Allentown, PA 12345'
           address_search_label: Enter an address to find a Post Office near you
@@ -58,13 +54,11 @@ en:
           results_instructions: Select a Post Office location below, or search again using
             a different address.
           search_button: Search
-        post_office: Post Office ™
         retail_hours_heading: Retail Hours
         retail_hours_sat: 'Sat:'
         retail_hours_sun: 'Sun:'
         retail_hours_weekday: 'Monday to Friday:'
       prepare:
-        alert_selected_po_name: You’ve selected the %{name} Post Office.
         alert_selected_post_office: You’ve selected the Post Office at %{full_address}.
         privacy_disclaimer: '%{app_name} is a secure, government website. We and the
           U.S. Postal Service use your data to verify your identity.'
@@ -126,10 +120,9 @@ en:
         zipcode: ZIP Code
     headings:
       address: Enter your current address
-      barcode: You’re ready to verify your identity in person
+      barcode: You’re ready to verify your identity in person with %{app_name}
       cta: Having trouble verifying your ID online?
       cta_variant: Try verifying your ID in person
-      location: Select a location to verify your ID
       po_search:
         location: Find a participating Post Office
       prepare: Verify your identity in person
@@ -158,7 +151,7 @@ en:
         acceptable_documents:
           - State Driver’s License
           - State Non-Driver’s Identification Card
-        heading: Your state-issued ID
+        heading: Your State Driver’s License or State Non-Driver’s Identification Card
         info: 'Your ID must not be expired. Acceptable forms of ID are:'
         no_other_documents: We do not currently accept any other forms of
           identification, such as passports and military IDs.
diff --git a/config/locales/in_person_proofing/es.yml b/config/locales/in_person_proofing/es.yml
index 28278be9204..149ebc55754 100644
--- a/config/locales/in_person_proofing/es.yml
+++ b/config/locales/in_person_proofing/es.yml
@@ -15,7 +15,8 @@ es:
           tendrá que reiniciar el proceso.
         email_sent: Hemos enviado esta información al correo electrónico que usó para
           iniciar sesión.
-        items_to_bring: 'Recuerde traer con usted estos elementos a la Oficina de correos:'
+        items_to_bring: 'Muestre los siguientes documentos a cualquier empleado de la
+          Oficina de correos:'
         learn_more: Entérese más sobre qué debe traer.
         location_details: Detalles de la ubicación
         questions: '¿Tiene alguna pregunta?'
@@ -40,10 +41,6 @@ es:
           other: '%{count} millas de distancia'
         inline_error: Ingrese una dirección válida que incluya ciudad, estado y código postal
         location_button: Seleccionar
-        location_step_about: Si tiene problemas para añadir su cédula de identidad, es
-          posible que pueda realizar la verificación en persona en una oficina
-          de correos local de los Estados Unidos en determinadas localidades.
-        none_found: No se encontraron localidades.
         po_search:
           address_search_hint: 'Ejemplo: 1234 N Example St., Allentown, PA 12345'
           address_search_label: Introduzca una dirección para encontrar una Oficina de
@@ -65,13 +62,11 @@ es:
           results_instructions: Seleccione una ubicación de la Oficina de Correos a
             continuación, o busque de nuevo utilizando una dirección diferente.
           search_button: Búsqueda
-        post_office: Oficina de Correos
         retail_hours_heading: Horario de atención al público
         retail_hours_sat: 'Sáb:'
         retail_hours_sun: 'Dom:'
         retail_hours_weekday: 'De Lunes a Viernes:'
       prepare:
-        alert_selected_po_name: Ha seleccionado la oficina de correos %{name}.
         alert_selected_post_office: Ha seleccionado la oficina de correos a %{full_address}.
         privacy_disclaimer: '%{app_name} es un sitio web seguro del gobierno. Nosotros y
           el Servicio Postal de los Estados Unidos utilizamos sus datos para
@@ -141,10 +136,9 @@ es:
         zipcode: Código postal
     headings:
       address: Ingrese su dirección actual
-      barcode: Está listo para verificar su identidad en persona
+      barcode: Está listo para verificar su identidad en persona con %{app_name}
       cta: ¿Tiene problemas para verificar su documento de identidad en línea?
       cta_variant: Intente verificar su ID en persona
-      location: Seleccione un lugar para verificar su cédula
       po_search:
         location: Encuentre una oficina de correos participante
       prepare: Verifique su identidad en persona
@@ -175,7 +169,8 @@ es:
         acceptable_documents:
           - Licencia de conducir estatal
           - Tarjeta de identificación estatal para no conductores.
-        heading: Su cédula emitida por el estado
+        heading: Su licencia de conducir estatal o documento de identidad estatal para
+          no conductores
         info: 'Su cédula de identidad no debe estar caducada. Las formas de
           identificación aceptables son:'
         no_other_documents: Actualmente no aceptamos otras formas de identificación,
diff --git a/config/locales/in_person_proofing/fr.yml b/config/locales/in_person_proofing/fr.yml
index d54eb1ceb35..18e46b0be1b 100644
--- a/config/locales/in_person_proofing/fr.yml
+++ b/config/locales/in_person_proofing/fr.yml
@@ -15,8 +15,8 @@ fr:
           seront pas sauvegardées et vous devrez recommencer le processus.
         email_sent: Nous avons envoyé ces informations à l’adresse électronique que vous
           avez utilisée pour vous connecter.
-        items_to_bring: 'N’oubliez pas d’apporter les articles suivants avec vous au
-          bureau de poste:'
+        items_to_bring: 'Présentez les éléments suivants à n’importe quel collaborateur
+          d’un bureau de Poste:'
         learn_more: En savoir davantage sur ce qu’il faut apporter.
         location_details: Détails de l’emplacement
         questions: Des questions?
@@ -42,10 +42,6 @@ fr:
           other: 'à %{count} miles'
         inline_error: Saisissez une adresse valide avec la ville, l’état et le code postal
         location_button: Sélectionner
-        location_step_about: Si vous ne parvenez pas à ajouter votre pièce d’identité,
-          vous pourrez peut-être vérifier en personne dans un bureau de poste
-          américain local dans certains endroits.
-        none_found: Aucun endroit trouvé.
         po_search:
           address_search_hint: 'Exemple : 1234 N Example St., Allentown, PA 12345'
           address_search_label: Entrez une adresse pour trouver un bureau de poste près de chez vous.
@@ -66,13 +62,11 @@ fr:
           results_instructions: Sélectionnez un emplacement de bureau de poste ci-dessous,
             ou effectuez une nouvelle recherche en utilisant une autre adresse.
           search_button: Rechercher
-        post_office: Bureau de Poste
         retail_hours_heading: Heures de vente au détail
         retail_hours_sat: 'Sam:'
         retail_hours_sun: 'Dim:'
         retail_hours_weekday: 'Lundi à Vendredi:'
       prepare:
-        alert_selected_po_name: Vous avez sélectionné le bureau de poste de %{name}.
         alert_selected_post_office: Vous avez sélectionné le bureau de poste à %{full_address}.
         privacy_disclaimer: '%{app_name} est un site gouvernemental sécurisé. Nous et le
           service postal américain utilisons vos données pour vérifier votre
@@ -143,10 +137,9 @@ fr:
         zipcode: Code postal
     headings:
       address: Entrez votre adresse actuelle
-      barcode: Vous êtes prêt à vérifier votre identité en personne
+      barcode: Vous êtes prêt à vérifier votre identité en personne avec %{app_name}
       cta: Vous avez des difficultés à vérifier votre identité en ligne?
       cta_variant: Essayez de vérifier votre identité en personne
-      location: Sélectionnez un lieu pour vérifier votre identité
       po_search:
         location: Trouver un bureau de poste participant
       prepare: Vérifiez votre identité en personne
@@ -178,7 +171,8 @@ fr:
         acceptable_documents:
           - Permis de conduire d’État
           - Document d’identité de non-conducteur d’État
-        heading: Votre document d’identité délivré par l’État
+        heading: Votre permis de conduire ou votre permis d’État Carte d’identité de
+          non-conducteur
         info: 'Votre pièce d’identité ne doit pas être expirée. Les formes
           d’identification acceptables sont:'
         no_other_documents: Nous n’acceptons actuellement aucune autre forme
diff --git a/config/locales/titles/en.yml b/config/locales/titles/en.yml
index 2d898e0715e..69b0502a0ca 100644
--- a/config/locales/titles/en.yml
+++ b/config/locales/titles/en.yml
@@ -16,7 +16,6 @@ en:
       processing_images: Processing your images
       ssn: Enter your Social Security number
       switch_back: Switch back to your computer
-      take_photo: Take photos of your ID with a phone
       upload: Verify your ID
       verify: Verify your identity
     edit_info:
diff --git a/config/locales/titles/es.yml b/config/locales/titles/es.yml
index 27a3c09aa19..d16b719cb1e 100644
--- a/config/locales/titles/es.yml
+++ b/config/locales/titles/es.yml
@@ -16,7 +16,6 @@ es:
       processing_images: Procesando tus imágenes
       ssn: Ingresa tu número del seguro social
       switch_back: Regresar a tu computadora
-      take_photo: Toma fotos de tu identificación con un teléfono
       upload: Verifica tu identificación
       verify: Verifica tu identidad
     edit_info:
diff --git a/config/locales/titles/fr.yml b/config/locales/titles/fr.yml
index 0718e36a78d..086c69e29eb 100644
--- a/config/locales/titles/fr.yml
+++ b/config/locales/titles/fr.yml
@@ -16,7 +16,6 @@ fr:
       processing_images: Traitement de vos images
       ssn: Entrez votre numéro de sécurité sociale
       switch_back: Retournez sur votre ordinateur
-      take_photo: Prenez des photos de votre pièce d’identité avec un téléphone
       upload: Vérifiez votre pièce d’identité
       verify: Vérifiez votre identité
     edit_info:
diff --git a/config/routes.rb b/config/routes.rb
index b4d4e9db409..22d549d501a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -291,6 +291,7 @@
     get '/redirect/return_to_sp/failure_to_proof' => 'redirect/return_to_sp#failure_to_proof', as: :return_to_sp_failure_to_proof
     get '/redirect/help_center' => 'redirect/help_center#show', as: :help_center_redirect
     get '/redirect/contact/' => 'redirect/contact#show', as: :contact_redirect
+    get '/redirect/policy/' => 'redirect/policy#show', as: :policy_redirect
 
     match '/sign_out' => 'sign_out#destroy', via: %i[get post delete]
 
diff --git a/config/service_providers.localdev.yml b/config/service_providers.localdev.yml
index 8d2e10798b8..0387078d9ec 100644
--- a/config/service_providers.localdev.yml
+++ b/config/service_providers.localdev.yml
@@ -445,6 +445,55 @@ development:
     certs:
       - 'sp_sinatra_demo'
     friendly_name: 'Login Mock IRS'
+    help_text: 
+      sign_in:
+        en: <p>
+              This is a U.S. government service. You consent to the monitoring, recording, 
+              and reviewing of your activity using this service. 
+              <a href="/redirect/policy/?location=irs_sp_alert">Learn more about our privacy policies</a>.
+            </p>
+        es: <p>
+              Este es un servicio del gobierno de EE. UU. Usted acepta que su actividad sea monitoreada, 
+              registrada y revisada al utilizar este servicio. 
+              <a href="/redirect/policy/?location=irs_sp_alert" target="_blank">Obtenga más información sobre nuestras políticas de privacidad</a>.
+            </p>
+        fr: <p>
+              Il s’agit d’un service du gouvernement américain. Vous consentez à la surveillance, 
+              à l’enregistrement et à l’examen de votre activité en utilisant ce service. 
+              <a href="/redirect/policy/?location=irs_sp_alert" target="_blank">En savoir plus sur nos politiques de confidentialité</a>.
+            </p>
+      sign_up:
+        en: <p>
+              This is a U.S. government service. You consent to the monitoring, recording, 
+              and reviewing of your activity using this service. 
+              <a href="/redirect/policy/?location=irs_sp_alert" target="_blank">Learn more about our privacy policies</a>.
+            </p>
+        es: <p>
+              Este es un servicio del gobierno de EE. UU. Usted acepta que su actividad sea monitoreada, 
+              registrada y revisada al utilizar este servicio. 
+              <a href="/redirect/policy/?location=irs_sp_alert" target="_blank">Obtenga más información sobre nuestras políticas de privacidad</a>.
+            </p>
+        fr: <p>
+              Il s’agit d’un service du gouvernement américain. Vous consentez à la surveillance, 
+              à l’enregistrement et à l’examen de votre activité en utilisant ce service. 
+              <a href="/redirect/policy/?location=irs_sp_alert" target="_blank">En savoir plus sur nos politiques de confidentialité</a>.
+            </p>
+      forgot_password:
+        en: <p>
+              This is a U.S. government service. You consent to the monitoring, recording, 
+              and reviewing of your activity using this service. 
+              <a href="/redirect/policy/?location=irs_sp_alert" target="_blank">Learn more about our privacy policies</a>.
+            </p>
+        es: <p>
+              Este es un servicio del gobierno de EE. UU. Usted acepta que su actividad sea monitoreada, 
+              registrada y revisada al utilizar este servicio. 
+              <a href="/redirect/policy/?location=irs_sp_alert" target="_blank">Obtenga más información sobre nuestras políticas de privacidad</a>.
+            </p>
+        fr: <p>
+              Il s’agit d’un service du gouvernement américain. Vous consentez à la surveillance, 
+              à l’enregistrement et à l’examen de votre activité en utilisant ce service. 
+              <a href="/redirect/policy/?location=irs_sp_alert" target="_blank">En savoir plus sur nos politiques de confidentialité</a>.
+            </p>
 
   'urn:gov:gsa:openidconnect:sp:expressjs':
     agency: 'GSA'
diff --git a/lib/identity_config.rb b/lib/identity_config.rb
index 3b100b9cb70..ff82beba802 100644
--- a/lib/identity_config.rb
+++ b/lib/identity_config.rb
@@ -108,7 +108,6 @@ def self.build_store(config_map)
     config.add(:attribute_encryption_key_queue, type: :json)
     config.add(:arcgis_api_username, type: :string)
     config.add(:arcgis_api_password, type: :string)
-    config.add(:arcgis_search_enabled, type: :boolean)
     config.add(:arcgis_mock_fallback, type: :boolean)
     config.add(:arcgis_api_generate_token_url, type: :string)
     config.add(:arcgis_api_suggest_url, type: :string)
@@ -157,7 +156,6 @@ def self.build_store(config_map)
     config.add(:doc_auth_attempt_window_in_minutes, type: :integer)
     config.add(:doc_auth_client_glare_threshold, type: :integer)
     config.add(:doc_auth_client_sharpness_threshold, type: :integer)
-    config.add(:doc_auth_combined_hybrid_handoff_enabled, type: :boolean)
     config.add(:doc_auth_document_capture_controller_enabled, type: :boolean)
     config.add(:doc_auth_enable_presigned_s3_urls, type: :boolean)
     config.add(:doc_auth_error_dpi_threshold, type: :integer)
diff --git a/lib/session_encryptor.rb b/lib/session_encryptor.rb
index 2ac918f8f7d..a33bf8df85e 100644
--- a/lib/session_encryptor.rb
+++ b/lib/session_encryptor.rb
@@ -8,9 +8,11 @@ class SensitiveValueError < StandardError; end
   MINIMUM_COMPRESS_LIMIT = 300
   SENSITIVE_KEYS = [
     'first_name', 'middle_name', 'last_name', 'address1', 'address2', 'city', 'state', 'zipcode',
-    'zip_code', 'same_address_as_id', 'dob', 'phone_number', 'phone', 'ssn', 'prev_address1',
-    'prev_address2', 'prev_city', 'prev_state', 'prev_zipcode', 'pii', 'pii_from_doc',
-    'pii_from_user', 'password', 'personal_key', 'email', 'email_address', 'unconfirmed_phone'
+    'zip_code', 'state_id_address1', 'state_id_address2', 'state_id_city', 'state_id_jurisdiction',
+    'state_id_zipcode', 'same_address_as_id', 'dob', 'phone_number', 'phone', 'ssn',
+    'prev_address1', 'prev_address2', 'prev_city', 'prev_state', 'prev_zipcode', 'pii',
+    'pii_from_doc', 'pii_from_user', 'password', 'personal_key', 'email', 'email_address',
+    'unconfirmed_phone'
   ].to_set.freeze
   CIPHERTEXT_KEY = 't'
   COMPRESSED_KEY = 'c'
diff --git a/lib/tasks/review_profile.rake b/lib/tasks/review_profile.rake
index 11dd01f2c72..66f92778099 100644
--- a/lib/tasks/review_profile.rake
+++ b/lib/tasks/review_profile.rake
@@ -4,7 +4,16 @@ namespace :users do
   namespace :review do
     desc 'Pass a user that has a pending review'
     task pass: :environment do |_task, args|
-      user_uuid = STDIN.getpass('Enter the User UUID to pass (input will be hidden):')
+      STDOUT.sync = true
+      print 'Enter the name of the investigator: '
+      investigator_name = STDIN.gets.chomp
+      print 'Enter the issue/ticket/reason for the investigation: '
+      investigation_number = STDIN.gets.chomp
+      print 'Enter the User UUID to pass: '
+      user_uuid = STDIN.gets.chomp
+      puts "investigator name: #{investigator_name}"
+      puts "investigation reason: #{investigation_number}"
+      puts "uuid: #{user_uuid}"
       user = User.find_by(uuid: user_uuid)
 
       if user.fraud_review_pending? && user.proofing_component.review_eligible?
@@ -35,14 +44,22 @@ namespace :users do
 
     desc 'Reject a user that has a pending review'
     task reject: :environment do |_task, args|
-      user_uuid = STDIN.getpass('Enter the User UUID to reject (input will be hidden):')
+      STDOUT.sync = true
+      print 'Enter the name of the investigator: '
+      investigator_name = STDIN.gets.chomp
+      print 'Enter the issue/ticket/reason for the investigation: '
+      investigation_number = STDIN.gets.chomp
+      print 'Enter the User UUID to reject: '
+      user_uuid = STDIN.gets.chomp
+      puts "investigator name: #{investigator_name}"
+      puts "investigation reason: #{investigation_number}"
+      puts "uuid: #{user_uuid}"
       user = User.find_by(uuid: user_uuid)
 
       if user.fraud_review_pending? && user.proofing_component.review_eligible?
         profile = user.fraud_review_pending_profile
 
         profile.reject_for_fraud(notify_user: true)
-
         puts "User's profile has been deactivated due to fraud rejection."
       elsif !user.proofing_component.review_eligible?
         puts 'User is past the 30 day review eligibility'
diff --git a/lib/tasks/users_lookup.rake b/lib/tasks/users_lookup.rake
index 5e67bef6d42..a80cf82a8fa 100644
--- a/lib/tasks/users_lookup.rake
+++ b/lib/tasks/users_lookup.rake
@@ -2,12 +2,19 @@ namespace :users do
   desc 'Look up a user by email address'
   task lookup_by_email: :environment do |_task, args|
     require 'io/console'
+    STDOUT.sync = true
+    print 'Enter the name of the investigator: '
+    investigator_name = STDIN.gets.chomp
+    print 'Enter the issue/ticket/reason for the investigation: '
+    investigation_number = STDIN.gets.chomp
     email = STDIN.getpass('Enter the email address to look up (input will be hidden): ')
+    puts "investigator name: #{investigator_name}"
+    puts "investigation reason: #{investigation_number}"
     user = User.find_with_email(email)
     if user.present?
       puts "uuid: #{user.uuid}"
     else
-      puts 'No user found'
+      puts 'uuid: Not Found'
     end
   end
 end
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index f3fd32a8f97..6ac9d6990cf 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -237,7 +237,7 @@ def index
 
         expect(Analytics).to receive(:new).
           with(user: user, request: request, sp: sp.issuer, session: match_array({}),
-               ahoy: controller.ahoy)
+               ahoy: controller.ahoy, irs_session_id: nil)
 
         controller.analytics
       end
@@ -252,7 +252,7 @@ def index
 
         expect(Analytics).to receive(:new).
           with(user: user, request: request, sp: nil, session: match_array({}),
-               ahoy: controller.ahoy)
+               ahoy: controller.ahoy, irs_session_id: nil)
 
         controller.analytics
       end
diff --git a/spec/controllers/idv/doc_auth_controller_spec.rb b/spec/controllers/idv/doc_auth_controller_spec.rb
index 7170c1abfd5..552020d5227 100644
--- a/spec/controllers/idv/doc_auth_controller_spec.rb
+++ b/spec/controllers/idv/doc_auth_controller_spec.rb
@@ -454,7 +454,6 @@ def mock_document_capture_step
       receive(:flow_session).and_return(
         'document_capture_session_uuid' => document_capture_session_uuid,
         'Idv::Steps::WelcomeStep' => true,
-        'Idv::Steps::SendLinkStep' => true,
         'Idv::Steps::LinkSentStep' => true,
         'Idv::Steps::EmailSentStep' => true,
         'Idv::Steps::UploadStep' => true,
diff --git a/spec/controllers/idv/in_person/address_search_controller_spec.rb b/spec/controllers/idv/in_person/address_search_controller_spec.rb
index d7f6d82f780..085eba72b2d 100644
--- a/spec/controllers/idv/in_person/address_search_controller_spec.rb
+++ b/spec/controllers/idv/in_person/address_search_controller_spec.rb
@@ -5,13 +5,10 @@
 
   let(:user) { create(:user) }
   let(:sp) { nil }
-  let(:arcgis_search_enabled) { true }
 
   before do
     stub_analytics
     stub_sign_in(user) if user
-    allow(IdentityConfig.store).to receive(:arcgis_search_enabled).
-      and_return(arcgis_search_enabled)
     allow(controller).to receive(:current_sp).and_return(sp)
   end
 
@@ -184,13 +181,5 @@
         )
       end
     end
-
-    context 'with feature disabled' do
-      let(:arcgis_search_enabled) { false }
-
-      it 'renders 404' do
-        expect(response.status).to eq(404)
-      end
-    end
   end
 end
diff --git a/spec/controllers/idv/in_person/usps_locations_controller_spec.rb b/spec/controllers/idv/in_person/usps_locations_controller_spec.rb
index b97ab2dc175..5a7480b59e1 100644
--- a/spec/controllers/idv/in_person/usps_locations_controller_spec.rb
+++ b/spec/controllers/idv/in_person/usps_locations_controller_spec.rb
@@ -6,7 +6,6 @@
   let(:user) { create(:user) }
   let(:sp) { nil }
   let(:in_person_proofing_enabled) { true }
-  let(:arcgis_search_enabled) { true }
   let(:empty_locations) { [] }
   let(:address) do
     UspsInPersonProofing::Applicant.new(
@@ -38,8 +37,6 @@
     stub_sign_in(user) if user
     allow(IdentityConfig.store).to receive(:in_person_proofing_enabled).
       and_return(in_person_proofing_enabled)
-    allow(IdentityConfig.store).to receive(:arcgis_search_enabled).
-      and_return(arcgis_search_enabled)
     allow(controller).to receive(:current_sp).and_return(sp)
   end
 
@@ -98,161 +95,144 @@
       allow(UspsInPersonProofing::Proofer).to receive(:new).and_return(proofer)
     end
 
-    context 'with arcgis search enabled' do
-      context 'with a nil address in params' do
-        let(:param_error) { ActionController::ParameterMissing.new(param: address) }
+    context 'with a nil address in params' do
+      let(:param_error) { ActionController::ParameterMissing.new(param: address) }
 
-        before do
-          allow(proofer).to receive(:request_facilities).with(address).and_raise(param_error)
-        end
+      before do
+        allow(proofer).to receive(:request_facilities).with(address).and_raise(param_error)
+      end
 
-        subject(:response) do
-          post :index, params: { address: nil }
-        end
+      subject(:response) do
+        post :index, params: { address: nil }
+      end
 
-        it 'returns no locations' do
-          subject
-          json = response.body
-          facilities = JSON.parse(json)
-          expect(facilities.length).to eq 0
-        end
+      it 'returns no locations' do
+        subject
+        json = response.body
+        facilities = JSON.parse(json)
+        expect(facilities.length).to eq 0
       end
+    end
 
-      context 'no addresses found by usps' do
-        before do
-          allow(proofer).to receive(:request_facilities).with(address).and_return(empty_locations)
-        end
-
-        it 'logs analytics with error when successful response is empty' do
-          response
-          expect(@analytics).to have_logged_event(
-            'IdV: in person proofing location search submitted',
-            success: false,
-            errors: 'No USPS locations found',
-            result_total: 0,
-            exception_class: nil,
-            exception_message: nil,
-            response_status_code: nil,
-          )
-        end
+    context 'no addresses found by usps' do
+      before do
+        allow(proofer).to receive(:request_facilities).with(address).and_return(empty_locations)
       end
 
-      context 'with successful fetch' do
-        before do
-          allow(proofer).to receive(:request_facilities).with(address).and_return(locations)
-        end
-
-        it 'returns a successful response' do
-          json = response.body
-          facilities = JSON.parse(json)
-          expect(facilities.length).to eq 3
-          expect(@analytics).to have_logged_event(
-            'IdV: in person proofing location search submitted',
-            success: true,
-            errors: nil,
-            result_total: 3,
-            exception_class: nil,
-            exception_message: nil,
-            response_status_code: nil,
-          )
-        end
+      it 'logs analytics with error when successful response is empty' do
+        response
+        expect(@analytics).to have_logged_event(
+          'IdV: in person proofing location search submitted',
+          success: false,
+          errors: 'No USPS locations found',
+          result_total: 0,
+          exception_class: nil,
+          exception_message: nil,
+          response_status_code: nil,
+        )
       end
+    end
 
-      context 'with a timeout from Faraday' do
-        let(:timeout_error) { Faraday::TimeoutError.new }
-
-        before do
-          allow(proofer).to receive(:request_facilities).with(address).and_raise(timeout_error)
-        end
-
-        it 'returns an unprocessible entity client error' do
-          subject
-          expect(@analytics).to have_logged_event(
-            'Request USPS IPP locations: request failed',
-            api_status_code: 422,
-            exception_class: timeout_error.class,
-            exception_message: timeout_error.message,
-            response_body_present:
-            timeout_error.response_body.present?,
-            response_body: timeout_error.response_body,
-            response_status_code: timeout_error.response_status,
-          )
-
-          status = response.status
-          expect(status).to eq 422
-        end
+    context 'with successful fetch' do
+      before do
+        allow(proofer).to receive(:request_facilities).with(address).and_return(locations)
       end
 
-      context 'with a 500 error from USPS' do
-        let(:server_error) { Faraday::ServerError.new }
-
-        before do
-          allow(proofer).to receive(:request_facilities).with(address).and_raise(server_error)
-        end
-
-        it 'returns an internal server error' do
-          subject
-          expect(@analytics).to have_logged_event(
-            'Request USPS IPP locations: request failed',
-            api_status_code: 500,
-            exception_class: server_error.class,
-            exception_message: server_error.message,
-            response_body_present:
-            server_error.response_body.present?,
-            response_body: server_error.response_body,
-            response_status_code: server_error.response_status,
-          )
-
-          status = response.status
-          expect(status).to eq 500
-        end
+      it 'returns a successful response' do
+        json = response.body
+        facilities = JSON.parse(json)
+        expect(facilities.length).to eq 3
+        expect(@analytics).to have_logged_event(
+          'IdV: in person proofing location search submitted',
+          success: true,
+          errors: nil,
+          result_total: 3,
+          exception_class: nil,
+          exception_message: nil,
+          response_status_code: nil,
+        )
+      end
+    end
+
+    context 'with a timeout from Faraday' do
+      let(:timeout_error) { Faraday::TimeoutError.new }
+
+      before do
+        allow(proofer).to receive(:request_facilities).with(address).and_raise(timeout_error)
       end
 
-      context 'with failed connection to Faraday' do
-        let(:exception) { Faraday::ConnectionFailed.new }
-        subject(:response) do
-          post :index,
-               params: { address: { street_address: '742 Evergreen Terrace',
-                                    city: 'Springfield',
-                                    state: 'MO',
-                                    zip_code: '89011' } }
-        end
-
-        before do
-          allow(proofer).to receive(:request_facilities).with(fake_address).and_raise(exception)
-        end
-
-        it 'returns no locations' do
-          subject
-          expect(@analytics).to have_logged_event(
-            'Request USPS IPP locations: request failed',
-            api_status_code: 500,
-            exception_class: exception.class,
-            exception_message: exception.message,
-            response_body_present:
-            exception.response_body.present?,
-            response_body: exception.response_body,
-            response_status_code: exception.response_status,
-          )
-
-          facilities = JSON.parse(response.body)
-          expect(facilities.length).to eq 0
-        end
+      it 'returns an unprocessible entity client error' do
+        subject
+        expect(@analytics).to have_logged_event(
+          'Request USPS IPP locations: request failed',
+          api_status_code: 422,
+          exception_class: timeout_error.class,
+          exception_message: timeout_error.message,
+          response_body_present:
+          timeout_error.response_body.present?,
+          response_body: timeout_error.response_body,
+          response_status_code: timeout_error.response_status,
+        )
+
+        status = response.status
+        expect(status).to eq 422
       end
     end
 
-    context 'with arcgis search disabled' do
-      let(:arcgis_search_enabled) { false }
-      context 'with successful fetch' do
-        before do
-          allow(proofer).to receive(:request_pilot_facilities).and_return(pilot_locations)
-        end
-
-        it 'returns a successful response' do
-          json = response.body
-          facilities = JSON.parse(json)
-          expect(facilities.length).to eq 4
-        end
+    context 'with a 500 error from USPS' do
+      let(:server_error) { Faraday::ServerError.new }
+
+      before do
+        allow(proofer).to receive(:request_facilities).with(address).and_raise(server_error)
+      end
+
+      it 'returns an internal server error' do
+        subject
+        expect(@analytics).to have_logged_event(
+          'Request USPS IPP locations: request failed',
+          api_status_code: 500,
+          exception_class: server_error.class,
+          exception_message: server_error.message,
+          response_body_present:
+          server_error.response_body.present?,
+          response_body: server_error.response_body,
+          response_status_code: server_error.response_status,
+        )
+
+        status = response.status
+        expect(status).to eq 500
+      end
+    end
+
+    context 'with failed connection to Faraday' do
+      let(:exception) { Faraday::ConnectionFailed.new }
+      subject(:response) do
+        post :index,
+             params: { address: { street_address: '742 Evergreen Terrace',
+                                  city: 'Springfield',
+                                  state: 'MO',
+                                  zip_code: '89011' } }
+      end
+
+      before do
+        allow(proofer).to receive(:request_facilities).with(fake_address).and_raise(exception)
+      end
+
+      it 'returns no locations' do
+        subject
+        expect(@analytics).to have_logged_event(
+          'Request USPS IPP locations: request failed',
+          api_status_code: 500,
+          exception_class: exception.class,
+          exception_message: exception.message,
+          response_body_present:
+          exception.response_body.present?,
+          response_body: exception.response_body,
+          response_status_code: exception.response_status,
+        )
+
+        facilities = JSON.parse(response.body)
+        expect(facilities.length).to eq 0
       end
     end
 
diff --git a/spec/controllers/redirect/contact_controller_spec.rb b/spec/controllers/redirect/contact_controller_spec.rb
index c9e35137817..26e90e11a7c 100644
--- a/spec/controllers/redirect/contact_controller_spec.rb
+++ b/spec/controllers/redirect/contact_controller_spec.rb
@@ -10,7 +10,7 @@
     it 'redirects to contact page' do
       redirect_url = IdentityConfig.store.idv_contact_url
 
-      get :show, params: { **location_params }
+      get :show, params: location_params
 
       expect(response).to redirect_to redirect_url
       expect(@analytics).to have_logged_event(
diff --git a/spec/controllers/redirect/policy_controller_spec.rb b/spec/controllers/redirect/policy_controller_spec.rb
new file mode 100644
index 00000000000..eb90b536887
--- /dev/null
+++ b/spec/controllers/redirect/policy_controller_spec.rb
@@ -0,0 +1,25 @@
+require 'rails_helper'
+
+describe Redirect::PolicyController do
+  before do
+    stub_analytics
+  end
+
+  describe '#show' do
+    let(:location_params) { { flow: 'flow', step: 'step', location: 'location', foo: 'bar' } }
+    it 'redirects to policy page' do
+      redirect_url = MarketingSite.security_and_privacy_practices_url
+
+      get :show, params: location_params
+
+      expect(response).to redirect_to redirect_url
+      expect(@analytics).to have_logged_event(
+        'Policy Page Redirect',
+        flow: 'flow',
+        location: 'location',
+        redirect_url: redirect_url,
+        step: 'step',
+      )
+    end
+  end
+end
diff --git a/spec/features/idv/actions/cancel_link_sent_action_spec.rb b/spec/features/idv/actions/cancel_link_sent_action_spec.rb
index 8b6b1d80398..88b9ec4dd04 100644
--- a/spec/features/idv/actions/cancel_link_sent_action_spec.rb
+++ b/spec/features/idv/actions/cancel_link_sent_action_spec.rb
@@ -9,9 +9,9 @@
     complete_doc_auth_steps_before_link_sent_step
   end
 
-  it 'returns to send link step' do
+  it 'returns to link sent step', js: true do
     click_doc_auth_back_link
 
-    expect(page).to have_current_path(idv_doc_auth_send_link_step)
+    expect(page).to have_current_path(idv_doc_auth_upload_step)
   end
 end
diff --git a/spec/features/idv/actions/cancel_send_link_action_spec.rb b/spec/features/idv/actions/cancel_send_link_action_spec.rb
deleted file mode 100644
index 82bd3e79bf4..00000000000
--- a/spec/features/idv/actions/cancel_send_link_action_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require 'rails_helper'
-
-feature 'doc auth cancel send link action' do
-  include IdvStepHelper
-  include DocAuthHelper
-
-  before do
-    sign_in_and_2fa_user
-    complete_doc_auth_steps_before_send_link_step
-  end
-
-  it 'returns to upload step' do
-    click_doc_auth_back_link
-
-    expect(page).to have_current_path(idv_doc_auth_upload_step)
-  end
-end
diff --git a/spec/features/idv/analytics_spec.rb b/spec/features/idv/analytics_spec.rb
index eadab798730..e1306cc6825 100644
--- a/spec/features/idv/analytics_spec.rb
+++ b/spec/features/idv/analytics_spec.rb
@@ -158,7 +158,7 @@
 
       aggregate_failures 'populates data for each step of the Daily Dropoff Report' do
         row = CSV.parse(
-          Reports::DailyDropoffsReport.new(Time.zone.now).report_body,
+          Reports::DailyDropoffsReport.new.tap { |r| r.report_date = Time.zone.now }.report_body,
           headers: true,
         ).first
 
diff --git a/spec/features/idv/doc_auth/agreement_step_spec.rb b/spec/features/idv/doc_auth/agreement_step_spec.rb
index 4a1ff8ce46b..5846655fc07 100644
--- a/spec/features/idv/doc_auth/agreement_step_spec.rb
+++ b/spec/features/idv/doc_auth/agreement_step_spec.rb
@@ -62,8 +62,7 @@ def expect_doc_auth_first_step
 
       sign_in_and_2fa_user
       complete_doc_auth_steps_before_agreement_step
-      check t('doc_auth.instructions.consent', app_name: APP_NAME)
-      click_continue
+      complete_agreement_step
     end
 
     it 'progresses to document capture' do
diff --git a/spec/features/idv/doc_auth/link_sent_step_spec.rb b/spec/features/idv/doc_auth/link_sent_step_spec.rb
index 157a3ef8fe1..b87e2b3ce35 100644
--- a/spec/features/idv/doc_auth/link_sent_step_spec.rb
+++ b/spec/features/idv/doc_auth/link_sent_step_spec.rb
@@ -5,128 +5,12 @@
   include DocAuthHelper
   include DocCaptureHelper
 
-  context 'with combined upload step disabled' do
-    let(:user) { sign_in_and_2fa_user }
-    let(:doc_capture_polling_enabled) { false }
-
-    before do
-      allow(FeatureManagement).to receive(:doc_capture_polling_enabled?).
-        and_return(doc_capture_polling_enabled)
-      user
-      complete_doc_auth_steps_before_link_sent_step
-    end
-
-    it 'proceeds to the next page with valid info' do
-      expect_step_indicator_current_step(t('step_indicator.flows.idv.verify_id'))
-
-      mock_doc_captured(user.id)
-      click_idv_continue
-
-      expect(page).to have_current_path(idv_ssn_path)
-    end
-
-    it 'proceeds to the next page if the user does not have a phone' do
-      user = create(:user, :with_authentication_app, :with_piv_or_cac)
-      sign_in_and_2fa_user(user)
-      complete_doc_auth_steps_before_link_sent_step
-      mock_doc_captured(user.id)
-      click_idv_continue
-
-      expect(page).to have_current_path(idv_ssn_path)
-    end
-
-    it 'does not proceed to the next page if the capture flow is incomplete' do
-      click_idv_continue
-
-      expect(page).to have_current_path(idv_doc_auth_link_sent_step)
-    end
-
-    it 'does not proceed to the next page if the capture flow is unsuccessful' do
-      mock_doc_captured(user.id, DocAuth::Response.new(success: false))
-
-      click_idv_continue
-
-      expect(page).to have_current_path(idv_doc_auth_link_sent_step)
-    end
-
-    context 'cancelled' do
-      before do
-        document_capture_session = user.document_capture_sessions.last
-        document_capture_session.cancelled_at = Time.zone.now
-        document_capture_session.save!
-      end
-
-      it 'redirects to before hybrid flow started and shows alert text' do
-        click_idv_continue
-
-        expect(page).to have_current_path(idv_doc_auth_upload_step)
-        expect(page).to have_css(
-          '.usa-alert--error',
-          text: t('errors.doc_auth.document_capture_cancelled'),
-        )
-      end
-    end
-
-    shared_examples 'with doc capture polling enabled' do
-      metadata[:js] = true
-      let(:doc_capture_polling_enabled) { true }
-
-      it 'automatically advances when the mobile flow is complete' do
-        expect(page).to_not have_css 'meta[http-equiv="refresh"]', visible: false
-        expect(page).to_not have_button(t('forms.buttons.continue'))
-        expect(page).to_not have_content(t('doc_auth.info.link_sent_complete_no_polling'))
-        expect(page).to have_content(t('doc_auth.info.link_sent_complete_polling'))
-
-        mock_doc_captured(user.id)
-
-        expect(page).to have_content(t('doc_auth.headings.ssn'), wait: 6)
-        expect(page).to have_current_path(idv_ssn_path)
-      end
-    end
-
-    shared_examples 'with doc capture polling disabled' do
-      let(:doc_capture_polling_enabled) { false }
-
-      context 'clicks back link' do
-        before do
-          click_doc_auth_back_link
-
-          visit idv_doc_auth_link_sent_step
-        end
-
-        it 'redirects to send link step' do
-          expect(page).to have_current_path(idv_doc_auth_send_link_step)
-        end
-      end
-
-      it 'refreshes page 4x with meta refresh extending timeout by 40 min and can start over' do
-        4.times do
-          expect(page).to have_css 'meta[http-equiv="refresh"]', visible: false
-          visit idv_doc_auth_link_sent_step
-        end
-        expect(page).to_not have_css 'meta[http-equiv="refresh"]', visible: false
-
-        click_doc_auth_back_link
-        click_doc_auth_back_link
-        click_link t('links.cancel')
-        click_on t('idv.cancel.actions.start_over')
-        complete_doc_auth_steps_before_link_sent_step
-        expect(page).to have_css 'meta[http-equiv="refresh"]', visible: false
-      end
-    end
-
-    it_behaves_like 'with doc capture polling enabled'
-    it_behaves_like 'with doc capture polling disabled'
-  end
-
   context 'with combined upload step enabled', js: true do
     let(:user) { sign_in_and_2fa_user }
     let(:doc_capture_polling_enabled) { false }
     let(:phone_number) { '415-555-0199' }
 
     before do
-      allow(IdentityConfig.store).
-        to(receive(:doc_auth_combined_hybrid_handoff_enabled).and_return(true))
       allow(FeatureManagement).
         to(receive(:doc_capture_polling_enabled?).and_return(doc_capture_polling_enabled))
       user
diff --git a/spec/features/idv/doc_auth/send_link_step_spec.rb b/spec/features/idv/doc_auth/send_link_step_spec.rb
deleted file mode 100644
index e6d6f04df58..00000000000
--- a/spec/features/idv/doc_auth/send_link_step_spec.rb
+++ /dev/null
@@ -1,212 +0,0 @@
-require 'rails_helper'
-
-feature 'doc auth send link step' do
-  include IdvStepHelper
-  include DocAuthHelper
-  include ActionView::Helpers::DateHelper
-
-  before do
-    sign_in_and_2fa_user(user)
-    complete_doc_auth_steps_before_send_link_step
-  end
-
-  let(:idv_send_link_max_attempts) { IdentityConfig.store.idv_send_link_max_attempts }
-  let(:idv_send_link_attempt_window_in_minutes) do
-    IdentityConfig.store.idv_send_link_attempt_window_in_minutes
-  end
-  let(:document_capture_session) { DocumentCaptureSession.create! }
-  let(:fake_analytics) { FakeAnalytics.new }
-  let(:fake_attempts_tracker) { IrsAttemptsApiTrackingHelper::FakeAttemptsTracker.new }
-  let(:user) { user_with_2fa }
-
-  it "defaults phone to user's 2fa phone numebr" do
-    field = page.find_field(t('two_factor_authentication.phone_label'))
-    expect(field.value).to eq('+1 202-555-1212')
-  end
-
-  it 'proceeds to the next page with valid info' do
-    expect_any_instance_of(IrsAttemptsApi::Tracker).to receive(:track_event).with(
-      :idv_phone_upload_link_sent,
-      success: true,
-      phone_number: '+1 415-555-0199',
-      failure_reason: nil,
-    )
-    expect(Telephony).to receive(:send_doc_auth_link).
-      with(hash_including(to: '+1 415-555-0199')).
-      and_call_original
-
-    expect_step_indicator_current_step(t('step_indicator.flows.idv.verify_id'))
-
-    fill_in :doc_auth_phone, with: '415-555-0199'
-    click_idv_continue
-
-    expect(page).to have_current_path(idv_doc_auth_link_sent_step)
-  end
-
-  it 'sends a link that does not contain any underscores' do
-    # because URLs with underscores sometimes get messed up by carriers
-    expect(Telephony).to receive(:send_doc_auth_link).and_wrap_original do |impl, config|
-      expect(config[:link]).to_not include('_')
-
-      impl.call(**config)
-    end
-    expect_any_instance_of(IrsAttemptsApi::Tracker).to receive(:track_event).with(
-      :idv_phone_upload_link_sent,
-      success: true,
-      phone_number: '+1 415-555-0199',
-      failure_reason: nil,
-    )
-    fill_in :doc_auth_phone, with: '415-555-0199'
-    click_idv_continue
-
-    expect(page).to have_current_path(idv_doc_auth_link_sent_step)
-  end
-
-  it 'does not proceed to the next page with invalid info' do
-    fill_in :doc_auth_phone, with: ''
-    click_idv_continue
-
-    expect(page).to have_current_path(idv_doc_auth_send_link_step)
-  end
-
-  it 'does not proceed if Telephony raises an error' do
-    expect_any_instance_of(IrsAttemptsApi::Tracker).to receive(:track_event).with(
-      :idv_phone_upload_link_sent,
-      success: false,
-      phone_number: '+1 225-555-1000',
-      failure_reason: { telephony: ['TelephonyError'] },
-    )
-    fill_in :doc_auth_phone, with: '225-555-1000'
-    click_idv_continue
-
-    expect(page).to have_current_path(idv_doc_auth_send_link_step)
-    expect(page).to have_content I18n.t('telephony.error.friendly_message.generic')
-  end
-
-  it 'displays error if user selects a country to which we cannot send SMS', js: true do
-    page.find('div[aria-label="Country code"]').click
-    within(page.find('.iti__flag-container', visible: :all)) do
-      find('span', text: 'Sri Lanka').click
-    end
-    focused_input = page.find('.phone-input__number:focus')
-
-    error_message_id = focused_input[:'aria-describedby']&.split(' ')&.find do |id|
-      page.has_css?(".usa-error-message##{id}")
-    end
-    expect(error_message_id).to_not be_empty
-
-    error_message = page.find_by_id(error_message_id)
-    expect(error_message).to have_content(
-      t(
-        'two_factor_authentication.otp_delivery_preference.sms_unsupported',
-        location: 'Sri Lanka',
-      ),
-    )
-    click_continue
-    expect(page.find(':focus')).to match_css('.phone-input__number')
-  end
-
-  it 'throttles sending the link' do
-    allow_any_instance_of(ApplicationController).to receive(:analytics).and_return(fake_analytics)
-    allow_any_instance_of(ApplicationController).to receive(
-      :irs_attempts_api_tracker,
-    ).and_return(fake_attempts_tracker)
-
-    user = user_with_2fa
-    sign_in_and_2fa_user(user)
-    complete_doc_auth_steps_before_send_link_step
-    timeout = distance_of_time_in_words(
-      Throttle.attempt_window_in_minutes(:idv_send_link).minutes,
-    )
-
-    expect(fake_attempts_tracker).to receive(
-      :idv_phone_send_link_rate_limited,
-    ).with({ phone_number: '+1 415-555-0199' })
-
-    freeze_time do
-      (idv_send_link_max_attempts - 1).times do
-        expect(page).to_not have_content(
-          I18n.t('errors.doc_auth.send_link_throttle', timeout: timeout),
-        )
-
-        fill_in :doc_auth_phone, with: '415-555-0199'
-        click_idv_continue
-
-        expect(page).to have_current_path(idv_doc_auth_link_sent_step)
-        click_doc_auth_back_link
-      end
-
-      fill_in :doc_auth_phone, with: '415-555-0199'
-      click_idv_continue
-      expect(page).to have_current_path(idv_doc_auth_send_link_step)
-      expect(page).to have_content(I18n.t('errors.doc_auth.send_link_throttle', timeout: timeout))
-    end
-    expect(fake_analytics).to have_logged_event(
-      'Throttler Rate Limit Triggered',
-      throttle_type: :idv_send_link,
-    )
-
-    # Manual expiration is needed for now since the Throttle uses Redis ttl instead of expiretime
-    Throttle.new(throttle_type: :idv_send_link, user: user).reset!
-    travel_to(Time.zone.now + idv_send_link_attempt_window_in_minutes.minutes) do
-      fill_in :doc_auth_phone, with: '415-555-0199'
-      click_idv_continue
-      expect(page).to have_current_path(idv_doc_auth_link_sent_step)
-    end
-  end
-
-  it 'includes expected URL parameters' do
-    allow_any_instance_of(Flow::BaseFlow).to receive(:flow_session).and_return(
-      document_capture_session_uuid: document_capture_session.uuid,
-    )
-    expect_any_instance_of(IrsAttemptsApi::Tracker).to receive(:track_event).with(
-      :idv_phone_upload_link_sent,
-      success: true,
-      phone_number: '+1 415-555-0199',
-      failure_reason: nil,
-    )
-    expect(Telephony).to receive(:send_doc_auth_link).and_wrap_original do |impl, config|
-      params = Rack::Utils.parse_nested_query URI(config[:link]).query
-      expect(params).to eq('document-capture-session' => document_capture_session.uuid)
-
-      impl.call(**config)
-    end
-
-    fill_in :doc_auth_phone, with: '415-555-0199'
-    click_idv_continue
-  end
-
-  it 'sets requested_at on the capture session' do
-    allow_any_instance_of(Flow::BaseFlow).to receive(:flow_session).and_return(
-      document_capture_session_uuid: document_capture_session.uuid,
-    )
-
-    fill_in :doc_auth_phone, with: '415-555-0199'
-    click_idv_continue
-
-    document_capture_session.reload
-    expect(document_capture_session).to have_attributes(requested_at: a_kind_of(Time))
-  end
-
-  context 'when user is from Puerto Rico' do
-    let(:phone) { '+1 787-555-1212' }
-    let(:formatted_phone) { '(787) 555-1212' }
-    let(:user) do
-      create(
-        :user,
-        :signed_up,
-        with: { phone: phone },
-        password: Features::SessionHelper::VALID_PASSWORD,
-      )
-    end
-
-    it "defaults phone to user's 2fa phone number", :js do
-      field = page.find_field(t('two_factor_authentication.phone_label'))
-      expect(field.value).to eq(formatted_phone)
-    end
-    it "allows submitting to user's 2fa phone number", :js do
-      click_idv_continue
-      expect(page).to have_current_path(idv_doc_auth_link_sent_step)
-    end
-  end
-end
diff --git a/spec/features/idv/doc_auth/upload_step_spec.rb b/spec/features/idv/doc_auth/upload_step_spec.rb
index 47f00985e9a..45034434ac0 100644
--- a/spec/features/idv/doc_auth/upload_step_spec.rb
+++ b/spec/features/idv/doc_auth/upload_step_spec.rb
@@ -5,279 +5,227 @@
   include DocAuthHelper
   include ActionView::Helpers::DateHelper
 
-  context 'with combined hybrid handoff disabled', js: true do
-    let(:fake_analytics) { FakeAnalytics.new }
-    let(:fake_attempts_tracker) { IrsAttemptsApiTrackingHelper::FakeAttemptsTracker.new }
+  let(:fake_analytics) { FakeAnalytics.new }
+  let(:fake_attempts_tracker) { IrsAttemptsApiTrackingHelper::FakeAttemptsTracker.new }
+  let(:document_capture_session) { DocumentCaptureSession.create! }
+  let(:idv_send_link_max_attempts) { 3 }
+  let(:idv_send_link_attempt_window_in_minutes) do
+    IdentityConfig.store.idv_send_link_attempt_window_in_minutes
+  end
+
+  before do
+    sign_in_and_2fa_user
+    allow_any_instance_of(Idv::Steps::UploadStep).to receive(:mobile_device?).and_return(true)
+    complete_doc_auth_steps_before_upload_step
+    allow_any_instance_of(ApplicationController).to receive(:analytics).and_return(fake_analytics)
+    allow_any_instance_of(ApplicationController).to receive(:irs_attempts_api_tracker).
+      and_return(fake_attempts_tracker)
+  end
 
+  context 'on a desktop device', js: true do
     before do
-      allow(IdentityConfig.store).
-        to receive(:doc_auth_combined_hybrid_handoff_enabled).
-        and_return(false)
-      sign_in_and_2fa_user
-      allow_any_instance_of(Idv::Steps::UploadStep).to receive(:mobile_device?).and_return(true)
-      complete_doc_auth_steps_before_upload_step
-      allow_any_instance_of(ApplicationController).to receive(:analytics).and_return(fake_analytics)
-      allow_any_instance_of(ApplicationController).to receive(:irs_attempts_api_tracker).
-        and_return(fake_attempts_tracker)
+      allow_any_instance_of(Idv::Steps::UploadStep).to receive(:mobile_device?).and_return(false)
     end
 
-    context 'on a desktop device' do
-      before do
-        allow_any_instance_of(Idv::Steps::UploadStep).to receive(:mobile_device?).and_return(false)
-      end
-
-      it 'proceeds to document capture when user chooses to upload from computer' do
-        expect(fake_attempts_tracker).to receive(
-          :idv_document_upload_method_selected,
-        ).with({ upload_method: 'desktop' })
-
-        expect_step_indicator_current_step(t('step_indicator.flows.idv.verify_id'))
-
-        click_on t('doc_auth.info.upload_computer_link')
+    it 'displays with the expected content' do
+      expect(page).to have_content(t('doc_auth.headings.combined_upload_from_computer'))
+      expect(page).to have_content(t('doc_auth.info.combined_upload_from_computer'))
+      expect(page).to have_content(t('doc_auth.headings.combined_upload_from_phone'))
+    end
 
-        expect(page).to have_current_path(idv_doc_auth_document_capture_step)
-        expect(fake_analytics).to have_logged_event(
-          'IdV: doc auth upload submitted',
-          hash_including(step: 'upload', destination: :document_capture),
-        )
-      end
+    it 'proceeds to document capture when user chooses to upload from computer' do
+      expect(fake_attempts_tracker).to receive(
+        :idv_document_upload_method_selected,
+      ).with({ upload_method: 'desktop' })
 
-      it 'proceeds to send link to phone page when user chooses to use phone' do
-        expect(fake_attempts_tracker).to receive(
-          :idv_document_upload_method_selected,
-        ).with({ upload_method: 'mobile' })
+      expect_step_indicator_current_step(t('step_indicator.flows.idv.verify_id'))
 
-        click_on t('doc_auth.buttons.use_phone')
+      click_upload_from_computer
 
-        expect(page).to have_current_path(idv_doc_auth_send_link_step)
-        expect(fake_analytics).to have_logged_event(
-          'IdV: doc auth upload submitted',
-          hash_including(step: 'upload', destination: :send_link),
-        )
-      end
+      expect(page).to have_current_path(idv_doc_auth_document_capture_step)
+      expect(fake_analytics).to have_logged_event(
+        'IdV: doc auth upload submitted',
+        hash_including(step: 'upload', destination: :document_capture),
+      )
     end
-  end
 
-  context 'with combined hybrid handoff enabled' do
-    let(:fake_analytics) { FakeAnalytics.new }
-    let(:fake_attempts_tracker) { IrsAttemptsApiTrackingHelper::FakeAttemptsTracker.new }
-    let(:document_capture_session) { DocumentCaptureSession.create! }
-    let(:idv_send_link_max_attempts) { 3 }
-    let(:idv_send_link_attempt_window_in_minutes) do
-      IdentityConfig.store.idv_send_link_attempt_window_in_minutes
+    it "defaults phone to user's 2fa phone number" do
+      field = page.find_field(t('two_factor_authentication.phone_label'))
+      expect(field.value).to eq('(202) 555-1212')
     end
 
-    before do
-      allow(IdentityConfig.store).
-        to receive(:doc_auth_combined_hybrid_handoff_enabled).
-        and_return(true)
-      sign_in_and_2fa_user
-      allow_any_instance_of(Idv::Steps::UploadStep).to receive(:mobile_device?).and_return(true)
-      complete_doc_auth_steps_before_upload_step
-      allow_any_instance_of(ApplicationController).to receive(:analytics).and_return(fake_analytics)
-      allow_any_instance_of(ApplicationController).to receive(:irs_attempts_api_tracker).
-        and_return(fake_attempts_tracker)
+    it 'proceeds to link sent page when user chooses to use phone' do
+      expect(fake_attempts_tracker).to receive(
+        :idv_document_upload_method_selected,
+      ).with({ upload_method: 'mobile' })
+
+      click_send_link
+
+      expect(page).to have_current_path(idv_doc_auth_link_sent_step)
+      expect(fake_analytics).to have_logged_event(
+        'IdV: doc auth upload submitted',
+        hash_including(step: 'upload', destination: :link_sent),
+      )
     end
 
-    context 'on a desktop device', js: true do
-      before do
-        allow_any_instance_of(Idv::Steps::UploadStep).to receive(:mobile_device?).and_return(false)
-      end
+    it 'proceeds to the next page with valid info' do
+      expect(fake_attempts_tracker).to receive(
+        :idv_phone_upload_link_sent,
+      ).with(
+        success: true,
+        phone_number: '+1 415-555-0199',
+        failure_reason: nil,
+      )
 
-      it 'proceeds to document capture when user chooses to upload from computer' do
-        expect(fake_attempts_tracker).to receive(
-          :idv_document_upload_method_selected,
-        ).with({ upload_method: 'desktop' })
+      expect(Telephony).to receive(:send_doc_auth_link).
+        with(hash_including(to: '+1 415-555-0199')).
+        and_call_original
 
-        expect_step_indicator_current_step(t('step_indicator.flows.idv.verify_id'))
+      expect_step_indicator_current_step(t('step_indicator.flows.idv.verify_id'))
 
-        click_upload_from_computer
+      fill_in :doc_auth_phone, with: '415-555-0199'
+      click_send_link
 
-        expect(page).to have_current_path(idv_doc_auth_document_capture_step)
-        expect(fake_analytics).to have_logged_event(
-          'IdV: doc auth upload submitted',
-          hash_including(step: 'upload', destination: :document_capture),
-        )
-      end
+      expect(page).to have_current_path(idv_doc_auth_link_sent_step)
+    end
 
-      it "defaults phone to user's 2fa phone number" do
-        field = page.find_field(t('two_factor_authentication.phone_label'))
-        expect(field.value).to eq('(202) 555-1212')
-      end
+    it 'does not proceed to the next page with invalid info' do
+      fill_in :doc_auth_phone, with: ''
+      click_send_link
 
-      it 'proceeds to link sent page when user chooses to use phone' do
-        expect(fake_attempts_tracker).to receive(
-          :idv_document_upload_method_selected,
-        ).with({ upload_method: 'mobile' })
+      expect(page).to have_current_path(idv_doc_auth_upload_step, ignore_query: true)
+    end
 
-        click_send_link
+    it 'sends a link that does not contain any underscores' do
+      # because URLs with underscores sometimes get messed up by carriers
+      expect(Telephony).to receive(:send_doc_auth_link).and_wrap_original do |impl, config|
+        expect(config[:link]).to_not include('_')
 
-        expect(page).to have_current_path(idv_doc_auth_link_sent_step)
-        expect(fake_analytics).to have_logged_event(
-          'IdV: doc auth upload submitted',
-          hash_including(step: 'upload', destination: :link_sent),
-        )
+        impl.call(**config)
       end
 
-      it 'proceeds to the next page with valid info' do
-        expect(fake_attempts_tracker).to receive(
-          :idv_phone_upload_link_sent,
-        ).with(
-          success: true,
-          phone_number: '+1 415-555-0199',
-          failure_reason: nil,
-        )
+      fill_in :doc_auth_phone, with: '415-555-0199'
+      click_send_link
 
-        expect(Telephony).to receive(:send_doc_auth_link).
-          with(hash_including(to: '+1 415-555-0199')).
-          and_call_original
+      expect(page).to have_current_path(idv_doc_auth_link_sent_step)
+    end
 
-        expect_step_indicator_current_step(t('step_indicator.flows.idv.verify_id'))
+    it 'does not proceed if Telephony raises an error', js: true do
+      expect(fake_attempts_tracker).to receive(:idv_phone_upload_link_sent).with(
+        success: false,
+        phone_number: '+1 225-555-1000',
+        failure_reason: { telephony: ['TelephonyError'] },
+      )
+      fill_in :doc_auth_phone, with: '225-555-1000'
+      click_send_link
+
+      expect(page).to have_current_path(idv_doc_auth_upload_step, ignore_query: true)
+      expect(page).to have_content I18n.t('telephony.error.friendly_message.generic')
+    end
 
-        fill_in :doc_auth_phone, with: '415-555-0199'
-        click_send_link
+    it 'displays error if user selects a country to which we cannot send SMS', js: true do
+      page.find('div[aria-label="Country code"]').click
+      within(page.find('.iti__flag-container', visible: :all)) do
+        find('span', text: 'Sri Lanka').click
+      end
+      focused_input = page.find('.phone-input__number:focus')
 
-        expect(page).to have_current_path(idv_doc_auth_link_sent_step)
+      error_message_id = focused_input[:'aria-describedby']&.split(' ')&.find do |id|
+        page.has_css?(".usa-error-message##{id}")
       end
+      expect(error_message_id).to_not be_empty
+
+      error_message = page.find_by_id(error_message_id)
+      expect(error_message).to have_content(
+        t(
+          'two_factor_authentication.otp_delivery_preference.sms_unsupported',
+          location: 'Sri Lanka',
+        ),
+      )
+      click_send_link
+      expect(page.find(':focus')).to match_css('.phone-input__number')
+    end
 
-      it 'does not proceed to the next page with invalid info' do
-        fill_in :doc_auth_phone, with: ''
-        click_send_link
+    it 'throttles sending the link', js: true do
+      user = user_with_2fa
+      sign_in_and_2fa_user(user)
+      complete_doc_auth_steps_before_upload_step
+      timeout = distance_of_time_in_words(
+        Throttle.attempt_window_in_minutes(:idv_send_link).minutes,
+      )
+      allow(IdentityConfig.store).to receive(:idv_send_link_max_attempts).
+        and_return(idv_send_link_max_attempts)
+
+      expect(fake_attempts_tracker).to receive(
+        :idv_phone_send_link_rate_limited,
+      ).with({ phone_number: '+1 415-555-0199' })
+
+      freeze_time do
+        (idv_send_link_max_attempts - 1).times do
+          expect(page).to_not have_content(
+            I18n.t('errors.doc_auth.send_link_throttle', timeout: timeout),
+          )
 
-        expect(page).to have_current_path(idv_doc_auth_upload_step, ignore_query: true)
-      end
+          fill_in :doc_auth_phone, with: '415-555-0199'
+          click_send_link
 
-      it 'sends a link that does not contain any underscores' do
-        # because URLs with underscores sometimes get messed up by carriers
-        expect(Telephony).to receive(:send_doc_auth_link).and_wrap_original do |impl, config|
-          expect(config[:link]).to_not include('_')
+          expect(page).to have_current_path(idv_doc_auth_link_sent_step)
 
-          impl.call(**config)
+          click_doc_auth_back_link
         end
 
         fill_in :doc_auth_phone, with: '415-555-0199'
-        click_send_link
 
-        expect(page).to have_current_path(idv_doc_auth_link_sent_step)
-      end
-
-      it 'does not proceed if Telephony raises an error', js: true do
-        expect(fake_attempts_tracker).to receive(:idv_phone_upload_link_sent).with(
-          success: false,
-          phone_number: '+1 225-555-1000',
-          failure_reason: { telephony: ['TelephonyError'] },
-        )
-        fill_in :doc_auth_phone, with: '225-555-1000'
         click_send_link
-
         expect(page).to have_current_path(idv_doc_auth_upload_step, ignore_query: true)
-        expect(page).to have_content I18n.t('telephony.error.friendly_message.generic')
-      end
-
-      it 'displays error if user selects a country to which we cannot send SMS', js: true do
-        page.find('div[aria-label="Country code"]').click
-        within(page.find('.iti__flag-container', visible: :all)) do
-          find('span', text: 'Sri Lanka').click
-        end
-        focused_input = page.find('.phone-input__number:focus')
-
-        error_message_id = focused_input[:'aria-describedby']&.split(' ')&.find do |id|
-          page.has_css?(".usa-error-message##{id}")
-        end
-        expect(error_message_id).to_not be_empty
-
-        error_message = page.find_by_id(error_message_id)
-        expect(error_message).to have_content(
-          t(
-            'two_factor_authentication.otp_delivery_preference.sms_unsupported',
-            location: 'Sri Lanka',
+        expect(page).to have_content(
+          I18n.t(
+            'errors.doc_auth.send_link_throttle',
+            timeout: timeout,
           ),
         )
+      end
+      expect(fake_analytics).to have_logged_event(
+        'Throttler Rate Limit Triggered',
+        throttle_type: :idv_send_link,
+      )
+
+      # Manual expiration is needed for now since the Throttle uses
+      # Redis ttl instead of expiretime
+      Throttle.new(throttle_type: :idv_send_link, user: user).reset!
+      travel_to(Time.zone.now + idv_send_link_attempt_window_in_minutes.minutes) do
+        fill_in :doc_auth_phone, with: '415-555-0199'
         click_send_link
-        expect(page.find(':focus')).to match_css('.phone-input__number')
+        expect(page).to have_current_path(idv_doc_auth_link_sent_step)
       end
+    end
 
-      it 'throttles sending the link', js: true do
-        user = user_with_2fa
-        sign_in_and_2fa_user(user)
-        complete_doc_auth_steps_before_upload_step
-        timeout = distance_of_time_in_words(
-          Throttle.attempt_window_in_minutes(:idv_send_link).minutes,
-        )
-        allow(IdentityConfig.store).to receive(:idv_send_link_max_attempts).
-          and_return(idv_send_link_max_attempts)
-
-        expect(fake_attempts_tracker).to receive(
-          :idv_phone_send_link_rate_limited,
-        ).with({ phone_number: '+1 415-555-0199' })
-
-        freeze_time do
-          (idv_send_link_max_attempts - 1).times do
-            expect(page).to_not have_content(
-              I18n.t('errors.doc_auth.send_link_throttle', timeout: timeout),
-            )
-
-            fill_in :doc_auth_phone, with: '415-555-0199'
-            click_send_link
-
-            expect(page).to have_current_path(idv_doc_auth_link_sent_step)
-
-            click_doc_auth_back_link
-          end
-
-          fill_in :doc_auth_phone, with: '415-555-0199'
+    it 'includes expected URL parameters' do
+      allow_any_instance_of(Flow::BaseFlow).to receive(:flow_session).and_return(
+        document_capture_session_uuid: document_capture_session.uuid,
+      )
 
-          click_send_link
-          expect(page).to have_current_path(idv_doc_auth_upload_step, ignore_query: true)
-          expect(page).to have_content(
-            I18n.t(
-              'errors.doc_auth.send_link_throttle',
-              timeout: timeout,
-            ),
-          )
-        end
-        expect(fake_analytics).to have_logged_event(
-          'Throttler Rate Limit Triggered',
-          throttle_type: :idv_send_link,
-        )
+      expect(Telephony).to receive(:send_doc_auth_link).and_wrap_original do |impl, config|
+        params = Rack::Utils.parse_nested_query URI(config[:link]).query
+        expect(params).to eq('document-capture-session' => document_capture_session.uuid)
 
-        # Manual expiration is needed for now since the Throttle uses
-        # Redis ttl instead of expiretime
-        Throttle.new(throttle_type: :idv_send_link, user: user).reset!
-        travel_to(Time.zone.now + idv_send_link_attempt_window_in_minutes.minutes) do
-          fill_in :doc_auth_phone, with: '415-555-0199'
-          click_send_link
-          expect(page).to have_current_path(idv_doc_auth_link_sent_step)
-        end
+        impl.call(**config)
       end
 
-      it 'includes expected URL parameters' do
-        allow_any_instance_of(Flow::BaseFlow).to receive(:flow_session).and_return(
-          document_capture_session_uuid: document_capture_session.uuid,
-        )
-
-        expect(Telephony).to receive(:send_doc_auth_link).and_wrap_original do |impl, config|
-          params = Rack::Utils.parse_nested_query URI(config[:link]).query
-          expect(params).to eq('document-capture-session' => document_capture_session.uuid)
-
-          impl.call(**config)
-        end
-
-        fill_in :doc_auth_phone, with: '415-555-0199'
-        click_send_link
-      end
+      fill_in :doc_auth_phone, with: '415-555-0199'
+      click_send_link
+    end
 
-      it 'sets requested_at on the capture session' do
-        allow_any_instance_of(Flow::BaseFlow).to receive(:flow_session).and_return(
-          document_capture_session_uuid: document_capture_session.uuid,
-        )
+    it 'sets requested_at on the capture session' do
+      allow_any_instance_of(Flow::BaseFlow).to receive(:flow_session).and_return(
+        document_capture_session_uuid: document_capture_session.uuid,
+      )
 
-        fill_in :doc_auth_phone, with: '415-555-0199'
-        click_send_link
+      fill_in :doc_auth_phone, with: '415-555-0199'
+      click_send_link
 
-        document_capture_session.reload
-        expect(document_capture_session).to have_attributes(requested_at: a_kind_of(Time))
-      end
+      document_capture_session.reload
+      expect(document_capture_session).to have_attributes(requested_at: a_kind_of(Time))
     end
   end
 end
diff --git a/spec/features/idv/hybrid_flow_spec.rb b/spec/features/idv/hybrid_flow_spec.rb
index a1e2049191c..e1f5b6638f4 100644
--- a/spec/features/idv/hybrid_flow_spec.rb
+++ b/spec/features/idv/hybrid_flow_spec.rb
@@ -4,6 +4,8 @@
   include IdvHelper
   include DocAuthHelper
 
+  let(:phone_number) { '415-555-0199' }
+
   before do
     allow(FeatureManagement).to receive(:doc_capture_polling_enabled?).and_return(true)
     allow(IdentityConfig.store).to receive(:doc_auth_enable_presigned_s3_urls).and_return(true)
@@ -23,9 +25,9 @@
 
     perform_in_browser(:desktop) do
       user = sign_in_and_2fa_user
-      complete_doc_auth_steps_before_send_link_step
-      fill_in :doc_auth_phone, with: '415-555-0199'
-      click_idv_continue
+      complete_doc_auth_steps_before_upload_step
+      clear_and_fill_in(:doc_auth_phone, phone_number)
+      click_send_link
 
       expect(page).to have_content(t('doc_auth.headings.text_message'))
     end
@@ -66,9 +68,9 @@
 
     perform_in_browser(:desktop) do
       user = sign_in_and_2fa_user
-      complete_doc_auth_steps_before_send_link_step
-      fill_in :doc_auth_phone, with: '415-555-0199'
-      click_idv_continue
+      complete_doc_auth_steps_before_upload_step
+      clear_and_fill_in(:doc_auth_phone, phone_number)
+      click_send_link
 
       expect(page).to have_content(t('doc_auth.headings.text_message'))
     end
@@ -83,9 +85,8 @@
 
     perform_in_browser(:desktop) do
       expect(page).to_not have_content(t('doc_auth.headings.text_message'), wait: 10)
-      click_on t('doc_auth.buttons.use_phone')
-      fill_in :doc_auth_phone, with: '415-555-0199'
-      click_idv_continue
+      clear_and_fill_in(:doc_auth_phone, phone_number)
+      click_send_link
 
       expect(page).to have_content(t('doc_auth.headings.text_message'))
     end
diff --git a/spec/features/idv/in_person_spec.rb b/spec/features/idv/in_person_spec.rb
index 4b5af8607eb..3bd9a6e52c8 100644
--- a/spec/features/idv/in_person_spec.rb
+++ b/spec/features/idv/in_person_spec.rb
@@ -98,7 +98,7 @@
       enrollment_code = JSON.parse(
         UspsInPersonProofing::Mock::Fixtures.request_enroll_response,
       )['enrollmentCode']
-      expect(page).to have_content(t('in_person_proofing.headings.barcode'))
+      expect(page).to have_content(t('in_person_proofing.headings.barcode', app_name: APP_NAME))
       expect(page).to have_content(Idv::InPerson::EnrollmentCodeFormatter.format(enrollment_code))
       expect(page).to have_content(
         t('in_person_proofing.body.barcode.deadline', deadline: deadline),
@@ -226,7 +226,7 @@
     enrollment_code = JSON.parse(
       UspsInPersonProofing::Mock::Fixtures.request_enroll_response,
     )['enrollmentCode']
-    expect(page).to have_content(t('in_person_proofing.headings.barcode'))
+    expect(page).to have_content(t('in_person_proofing.headings.barcode', app_name: APP_NAME))
     expect(page).to have_content(Idv::InPerson::EnrollmentCodeFormatter.format(enrollment_code))
     expect(page).to have_content(t('in_person_proofing.body.barcode.deadline', deadline: deadline))
     expect(page).to have_content('MILWAUKEE')
@@ -321,12 +321,12 @@
 
     it 'resumes desktop session with in-person proofing', allow_browser_log: true do
       user = nil
-
+      phone_number = '415-555-0199'
       perform_in_browser(:desktop) do
         user = sign_in_and_2fa_user
-        complete_doc_auth_steps_before_send_link_step
-        fill_in :doc_auth_phone, with: '415-555-0199'
-        click_idv_continue
+        complete_doc_auth_steps_before_upload_step
+        clear_and_fill_in(:doc_auth_phone, phone_number)
+        click_send_link
 
         expect(page).to have_content(t('doc_auth.headings.text_message'))
       end
diff --git a/spec/features/two_factor_authentication/sign_in_spec.rb b/spec/features/two_factor_authentication/sign_in_spec.rb
index 593d9cbc9d8..e36b6943acb 100644
--- a/spec/features/two_factor_authentication/sign_in_spec.rb
+++ b/spec/features/two_factor_authentication/sign_in_spec.rb
@@ -64,14 +64,11 @@
         sign_in_before_2fa
         select_2fa_option(:phone)
 
-        expect(page).to have_css('.phone-input__example', text: '(201) 555-0123')
-
         click_send_one_time_code
         expect(page.find(':focus')).to match_css('.phone-input__number')
         expect(page).to have_content(t('errors.messages.phone_required'))
 
         fill_in 'new_phone_form_phone', with: '+81 54 354 3643'
-        expect(page).to have_css('.phone-input__example', text: '090-1234-5678')
         expect(page.find('#new_phone_form_international_code', visible: false).value).to eq 'JP'
 
         fill_in 'new_phone_form_phone', with: '+81 54 354 364'
@@ -87,7 +84,6 @@
         expect(page).to have_content(t('errors.messages.phone_required'))
 
         fill_in 'new_phone_form_phone', with: '+353 537'
-        expect(page).to have_css('.phone-input__example', text: '085 012 3456')
 
         click_send_one_time_code
         expect(page.find(':focus')).to match_css('.phone-input__number')
@@ -105,7 +101,6 @@
         expect(page.find(':focus')).to match_css('.phone-input__number')
         expect(page).to have_content(t('errors.messages.invalid_phone_number'))
 
-        expect(page).to have_css('.phone-input__example', text: '090-1234-5678')
         expect(page.find('#new_phone_form_international_code', visible: false).value).to eq 'JP'
       end
 
diff --git a/spec/features/visitors/password_recovery_spec.rb b/spec/features/visitors/password_recovery_spec.rb
index d057fc2a36c..660eada0d6b 100644
--- a/spec/features/visitors/password_recovery_spec.rb
+++ b/spec/features/visitors/password_recovery_spec.rb
@@ -178,13 +178,9 @@
     context 'when password form values are invalid' do
       it 'does not allow the user to submit until password score is good', js: true do
         fill_in t('forms.passwords.edit.labels.password'), with: 'invalid'
-        expect(page).not_to have_button(t('forms.passwords.edit.buttons.submit'))
-
-        fill_in t('forms.passwords.edit.labels.password'), with: 'password@132!'
-        expect(page).not_to have_button(t('forms.passwords.edit.buttons.submit'))
+        click_button t('forms.passwords.edit.buttons.submit')
 
-        fill_in t('forms.passwords.edit.labels.password'), with: 'a unique and exciting zxjsahfas'
-        expect(page).to have_button(t('forms.passwords.edit.buttons.submit'))
+        expect(page).to have_css('.usa-error-message', text: t('errors.messages.stronger_password'))
       end
 
       it 'displays field validation error when password fields are empty' do
diff --git a/spec/features/visitors/set_password_spec.rb b/spec/features/visitors/set_password_spec.rb
index 2b505cd909d..d87fdaf0777 100644
--- a/spec/features/visitors/set_password_spec.rb
+++ b/spec/features/visitors/set_password_spec.rb
@@ -17,10 +17,10 @@
       confirm_last_user
     end
 
-    it 'does not allow the user to submit the form' do
+    it 'visitor gets field is required message' do
       fill_in t('forms.password'), with: ''
-
-      expect(page).to_not have_button(t('forms.buttons.continue'))
+      click_button t('forms.buttons.continue')
+      expect(page).to have_content t('simple_form.required.text')
     end
   end
 
@@ -64,9 +64,12 @@
   end
 
   context 'password is invalid' do
-    scenario 'visitor is redirected back to password form' do
+    before do
       create(:user, :unconfirmed)
       confirm_last_user
+    end
+
+    scenario 'visitor is redirected back to password form' do
       fill_in t('forms.password'), with: 'Q!2e'
 
       click_button t('forms.buttons.continue')
@@ -76,8 +79,6 @@
     end
 
     scenario 'visitor gets password help message' do
-      create(:user, :unconfirmed)
-      confirm_last_user
       fill_in t('forms.password'), with: '1234567891011'
 
       click_button t('forms.buttons.continue')
@@ -86,13 +87,18 @@
     end
 
     scenario 'visitor gets password pwned message' do
-      create(:user, :unconfirmed)
-      confirm_last_user
       fill_in t('forms.password'), with: '3.1415926535'
 
       click_button t('forms.buttons.continue')
 
       expect(page).to have_content t('errors.messages.pwned_password')
     end
+
+    scenario 'visitor gets enter a stronger password message', js: true do
+      fill_in t('forms.password'), with: 'badpwd'
+      click_button t('forms.buttons.continue')
+
+      expect(page).to have_css('.usa-error-message', text: t('errors.messages.stronger_password'))
+    end
   end
 end
diff --git a/spec/fixtures/proofing/lexis_nexis/instant_verify/date_of_birth_failure_response.json b/spec/fixtures/proofing/lexis_nexis/instant_verify/date_of_birth_failure_response.json
index d9caa607828..d413b002ecb 100644
--- a/spec/fixtures/proofing/lexis_nexis/instant_verify/date_of_birth_failure_response.json
+++ b/spec/fixtures/proofing/lexis_nexis/instant_verify/date_of_birth_failure_response.json
@@ -4,7 +4,7 @@
     "RequestId": "7890",
     "TransactionStatus": "failed",
     "TransactionReasonCode": {
-      "Code": "total.scoring.model.verification.fail"
+      "Code": "priority.scoring.model.verification.fail"
     },
     "Reference": "0987:1234-abcd"
   },
@@ -15,7 +15,7 @@
       "ProductConfigurationName": "REDACTED_CONFIGURATION",
       "ProductStatus": "fail",
       "ProductReason": {
-        "Code": "total.scoring.model.verification.fail"
+        "Code": "priority.scoring.model.verification.fail"
       },
       "Items": [
         {
diff --git a/spec/jobs/reports/duplicate_ssn_report_spec.rb b/spec/jobs/reports/duplicate_ssn_report_spec.rb
index ed1885a0072..271790e7830 100644
--- a/spec/jobs/reports/duplicate_ssn_report_spec.rb
+++ b/spec/jobs/reports/duplicate_ssn_report_spec.rb
@@ -4,9 +4,9 @@
 RSpec.describe Reports::DuplicateSsnReport do
   let(:report_date) { Date.new(2022, 2, 2) }
 
-  describe '#perform' do
-    subject(:report) { described_class.new }
+  subject(:report) { described_class.new.tap { |r| r.report_date = report_date } }
 
+  describe '#perform' do
     it 'runs the report and uploads to S3' do
       expect(report).to receive(:save_report)
 
@@ -15,7 +15,7 @@
   end
 
   describe '#report_body' do
-    subject(:report_body) { described_class.new(report_date).report_body }
+    subject(:report_body) { report.report_body }
 
     context 'with no data' do
       it 'is an empty report' do
@@ -48,14 +48,20 @@
       end
 
       let!(:fingerprint2_previous_profiles) do
-        2.times.map do
+        [
           create(
             :profile,
-            :active,
+            active: false,
             ssn_signature: ssn_fingerprint2,
             activated_at: report_date - 10.days,
-          ).tap(&:reload)
-        end
+          ),
+          create(
+            :profile,
+            active: false,
+            ssn_signature: ssn_fingerprint2,
+            activated_at: nil,
+          ),
+        ].map(&:reload)
       end
 
       it 'creates csv with corresponding data', aggregate_failures: true do
@@ -83,9 +89,13 @@ def expect_row_matches_profile(row:, profile:)
         expect(row).to be
         expect(row['uuid']).to eq(profile.user.uuid)
         expect(Time.zone.parse(row['account_created_at']).to_i).to eq(profile.user.created_at.to_i)
-        expect(Time.zone.parse(row['identity_verified_at']).to_i).to eq(profile.activated_at.to_i)
+        if profile.activated_at
+          expect(Time.zone.parse(row['identity_verified_at']).to_i).to eq(profile.activated_at.to_i)
+        end
+        expect(row['profile_active']).to eq(profile.active.to_s)
         expect(row['ssn_fingerprint']).to eq(ssn_fingerprint2)
         expect(row['count_ssn_fingerprint']).to eq('3')
+        expect(row['count_active_ssn_fingerprint']).to eq('1')
       end
     end
   end
diff --git a/spec/jobs/resolution_proofing_job_spec.rb b/spec/jobs/resolution_proofing_job_spec.rb
index 05df70d10bd..586c2ae2ccc 100644
--- a/spec/jobs/resolution_proofing_job_spec.rb
+++ b/spec/jobs/resolution_proofing_job_spec.rb
@@ -24,50 +24,15 @@
   end
   let(:document_capture_session) { DocumentCaptureSession.new(result_id: SecureRandom.hex) }
   let(:should_proof_state_id) { true }
-
-  let(:lexisnexis_transaction_id) { SecureRandom.uuid }
-  let(:lexisnexis_reference) { SecureRandom.uuid }
-  let(:aamva_transaction_id) { '1234-abcd-efgh' }
-  let(:resolution_proofer) do
-    instance_double(
-      Proofing::LexisNexis::InstantVerify::Proofer,
-      class: Proofing::LexisNexis::InstantVerify::Proofer,
-    )
-  end
-  let(:state_id_proofer) do
-    Proofing::Aamva::Proofer.new(AamvaFixtures.example_config.to_h)
-  end
-  let(:ddp_proofer) do
-    Proofing::LexisNexis::Ddp::Proofer.new(
-      LexisNexisFixtures.example_ddp_config.to_h,
-    )
-  end
   let(:trace_id) { SecureRandom.uuid }
   let(:user) { create(:user, :signed_up) }
-  let(:threatmetrix_session_id) { SecureRandom.uuid }
-  let(:threatmetrix_request_id) { Proofing::Mock::DdpMockClient::TRANSACTION_ID }
   let(:request_ip) { Faker::Internet.ip_v4_address }
-  let(:friendly_name) { 'fake-name' }
-  let(:app_id) { 'fake-app-id' }
-  let(:ddp_response_body) do
-    JSON.parse(LexisNexisFixtures.ddp_success_redacted_response_json, symbolize_names: true)
-  end
-
-  describe '.perform_later' do
-    it 'stores results' do
-      ResolutionProofingJob.perform_later(
-        result_id: document_capture_session.result_id,
-        should_proof_state_id: should_proof_state_id,
-        encrypted_arguments: encrypted_arguments,
-        trace_id: trace_id,
-        user_id: user.id,
-        threatmetrix_session_id: threatmetrix_session_id,
-        request_ip: request_ip,
-      )
+  let(:threatmetrix_session_id) { SecureRandom.uuid }
+  let(:proofing_device_profiling) { :enabled }
 
-      result = document_capture_session.load_proofing_result[:result]
-      expect(result).to be_present
-    end
+  before do
+    allow(IdentityConfig.store).to receive(:proofing_device_profiling).
+      and_return(proofing_device_profiling)
   end
 
   describe '#perform' do
@@ -85,61 +50,13 @@
       )
     end
 
-    context 'webmock lexisnexis, threatmetrix, and AAMVA' do
-      before do
-        stub_request(
-          :post,
-          'https://lexisnexis.example.com/restws/identity/v2/abc123/aaa/conversation',
-        ).to_return(body: lexisnexis_response.to_json)
-
-        stub_request(
-          :post,
-          'https://www.example.com/api/session-query',
-        ).to_return(body: LexisNexisFixtures.ddp_success_response_json)
-
-        stub_request(:post, AamvaFixtures.example_config.auth_url).
-          to_return(
-            { body: AamvaFixtures.security_token_response },
-            { body: AamvaFixtures.authentication_token_response },
-          )
-        stub_request(:post, AamvaFixtures.example_config.verification_url).
-          to_return(body: AamvaFixtures.verification_response)
-
-        allow(IdentityConfig.store).to receive(:proofer_mock_fallback).and_return(false)
-        allow(IdentityConfig.store).to receive(:proofing_device_profiling).and_return(:enabled)
-
-        allow(IdentityConfig.store).to receive(:lexisnexis_account_id).and_return('abc123')
-        allow(IdentityConfig.store).to receive(:lexisnexis_request_mode).and_return('aaa')
-        allow(IdentityConfig.store).to receive(:lexisnexis_username).and_return('aaa')
-        allow(IdentityConfig.store).to receive(:lexisnexis_password).and_return('aaa')
-        allow(IdentityConfig.store).to receive(:lexisnexis_base_url).
-          and_return('https://lexisnexis.example.com/')
-        allow(IdentityConfig.store).to receive(:lexisnexis_instant_verify_workflow).
-          and_return('aaa')
-
-        allow(instance).to receive(:state_id_proofer).and_return(state_id_proofer)
-
-        Proofing::Mock::DeviceProfilingBackend.new.record_profiling_result(
-          session_id: threatmetrix_session_id,
-          result: 'pass',
-        )
-      end
+    context 'all of the vendor requests pass' do
+      it 'stores a successful result' do
+        stub_vendor_requests
 
-      let(:lexisnexis_response) do
-        {
-          'Status' => {
-            'TransactionStatus' => 'passed',
-            'ConversationId' => lexisnexis_transaction_id,
-            'Reference' => lexisnexis_reference,
-          },
-        }
-      end
-
-      it 'returns results and adds threatmetrix proofing components' do
         perform
 
         result = document_capture_session.load_proofing_result[:result]
-
         result_context = result[:context]
         result_context_stages = result_context[:stages]
         result_context_stages_resolution = result_context_stages[:resolution]
@@ -147,7 +64,7 @@
         result_context_stages_threatmetrix = result_context_stages[:threatmetrix]
 
         expect(result[:exception]).to be_nil
-        expect(result[:errors]).to eq({})
+        expect(result[:errors].keys).to eq([:InstantVerify])
         expect(result[:success]).to be true
         expect(result[:timed_out]).to be false
 
@@ -157,12 +74,12 @@
         # result[:context][:stages][:resolution]
         expect(result_context_stages_resolution[:vendor_name]).
           to eq('lexisnexis:instant_verify')
-        expect(result_context_stages_resolution[:errors]).to eq({})
+        expect(result_context_stages_resolution[:errors]).to include(:InstantVerify)
         expect(result_context_stages_resolution[:exception]).to eq(nil)
         expect(result_context_stages_resolution[:success]).to eq(true)
         expect(result_context_stages_resolution[:timed_out]).to eq(false)
-        expect(result_context_stages_resolution[:transaction_id]).to eq(lexisnexis_transaction_id)
-        expect(result_context_stages_resolution[:reference]).to eq(lexisnexis_reference)
+        expect(result_context_stages_resolution[:transaction_id]).to eq('123456')
+        expect(result_context_stages_resolution[:reference]).to eq('Reference1')
         expect(result_context_stages_resolution[:can_pass_with_additional_verification]).
           to eq(false)
         expect(result_context_stages_resolution[:attributes_requiring_additional_verification]).
@@ -174,7 +91,7 @@
         expect(result_context_stages_state_id[:exception]).to eq(nil)
         expect(result_context_stages_state_id[:success]).to eq(true)
         expect(result_context_stages_state_id[:timed_out]).to eq(false)
-        expect(result_context_stages_state_id[:transaction_id]).to eq(aamva_transaction_id)
+        expect(result_context_stages_state_id[:transaction_id]).to eq('1234-abcd-efgh')
         expect(result_context_stages_state_id[:verified_attributes]).to eq(
           %w[address state_id_number state_id_type dob last_name first_name],
         )
@@ -185,232 +102,285 @@
         expect(result_context_stages_threatmetrix[:exception]).to eq(nil)
         expect(result_context_stages_threatmetrix[:success]).to eq(true)
         expect(result_context_stages_threatmetrix[:timed_out]).to eq(false)
-        expect(result_context_stages_threatmetrix[:transaction_id]).to eq(threatmetrix_request_id)
+        expect(result_context_stages_threatmetrix[:transaction_id]).to eq(
+          'ddp-mock-transaction-id-123',
+        )
         expect(result_context_stages_threatmetrix[:review_status]).to eq('pass')
-        expect(result_context_stages_threatmetrix[:response_body]).to eq(ddp_response_body)
+        expect(result_context_stages_threatmetrix[:response_body]).to eq(
+          JSON.parse(LexisNexisFixtures.ddp_success_redacted_response_json, symbolize_names: true),
+        )
 
         proofing_component = user.proofing_component
         expect(proofing_component.threatmetrix).to equal(true)
         expect(proofing_component.threatmetrix_review_status).to eq('pass')
       end
+    end
 
-      context 'failed response from lexisnexis' do
-        let(:should_proof_state_id) { true }
-        let(:lexisnexis_response) do
-          {
-            'Status' => {
-              'ConversationId' => lexisnexis_transaction_id,
-              'Reference' => lexisnexis_reference,
-              'Workflow' => 'foobar.baz',
-              'TransactionStatus' => 'error',
-              'TransactionReasonCode' => {
-                'Code' => 'invalid_transaction_initiate',
-              },
-            },
-            'Information' => {
-              'InformationType' => 'error-details',
-              'Code' => 'invalid_transaction_initiate',
-              'Description' => 'Error: Invalid Transaction Initiate',
-              'DetailDescription' => [
-                { 'Text' => 'Date of Birth is not a valid date' },
-              ],
-            },
-          }
-        end
-
-        it 'has a failed response' do
-          perform
-
-          result = document_capture_session.load_proofing_result[:result]
-
-          result_context = result[:context]
-          result_context_stages = result_context[:stages]
-          result_context_stages_resolution = result_context_stages[:resolution]
-          result_context_stages_state_id = result_context_stages[:state_id]
-          result_context_stages_threatmetrix = result_context_stages[:threatmetrix]
-
-          expect(result[:exception]).to be_nil
-          expect(result[:errors]).to match(
-            base: [
-              a_string_starting_with(
-                'Response error with code \'invalid_transaction_initiate\':',
-              ),
-            ],
-          )
-          expect(result[:success]).to be false
-          expect(result[:timed_out]).to be false
-
-          # result[:context]
-          expect(result_context[:should_proof_state_id])
-
-          # result[:context][:stages][:resolution]
-          expect(result_context_stages_resolution[:vendor_name]).
-            to eq('lexisnexis:instant_verify')
-          expect(result_context_stages_resolution[:errors][:base].first).to match(
-            a_string_starting_with('Response error with code \'invalid_transaction_initiate\':'),
-          )
-          expect(result_context_stages_resolution[:exception]).to eq(nil)
-          expect(result_context_stages_resolution[:success]).to eq(false)
-          expect(result_context_stages_resolution[:timed_out]).to eq(false)
-          expect(result_context_stages_resolution[:transaction_id]).
-            to eq(lexisnexis_transaction_id)
-          expect(result_context_stages_resolution[:reference]).to eq(lexisnexis_reference)
-          expect(result_context_stages_resolution[:can_pass_with_additional_verification]).
-            to eq(false)
-          expect(result_context_stages_resolution[:attributes_requiring_additional_verification]).
-            to eq([])
-
-          # result[:context][:stages][:state_id]
-          expect(result_context_stages_state_id[:vendor_name]).to eq('aamva:state_id')
-          expect(result_context_stages_state_id[:errors]).to eq({})
-          expect(result_context_stages_state_id[:exception]).to eq(nil)
-          expect(result_context_stages_state_id[:success]).to eq(true)
-          expect(result_context_stages_state_id[:timed_out]).to eq(false)
-          expect(result_context_stages_state_id[:transaction_id]).to eq('1234-abcd-efgh')
-          expect(result_context_stages_state_id[:verified_attributes]).to eq(
-            ['address', 'state_id_number', 'state_id_type', 'dob', 'last_name', 'first_name'],
-          )
-
-          # result[:context][:stages][:threatmetrix]
-          expect(result_context_stages_threatmetrix[:client]).to eq('DdpMock')
-          expect(result_context_stages_threatmetrix[:errors]).to eq({})
-          expect(result_context_stages_threatmetrix[:exception]).to eq(nil)
-          expect(result_context_stages_threatmetrix[:success]).to eq(true)
-          expect(result_context_stages_threatmetrix[:timed_out]).to eq(false)
-          expect(result_context_stages_threatmetrix[:transaction_id]).
-            to eq(threatmetrix_request_id)
-          expect(result_context_stages_threatmetrix[:response_body]).to eq(ddp_response_body)
-        end
+    context 'with a failed InstantVerify result' do
+      it 'stores an unsuccessful result' do
+        stub_vendor_requests(
+          instant_verify_response:
+            LexisNexisFixtures.instant_verify_identity_not_found_response_json,
+        )
+
+        perform
+
+        result = document_capture_session.load_proofing_result[:result]
+        result_context = result[:context]
+        result_context_stages = result_context[:stages]
+        result_context_stages_resolution = result_context_stages[:resolution]
+
+        expect(result[:success]).to be false
+        expect(result[:errors].keys).to eq([:base, :InstantVerify])
+        expect(result[:exception]).to be_nil
+        expect(result[:timed_out]).to be false
+
+        # result[:context][:stages][:resolution]
+        expect(result_context_stages_resolution[:success]).to eq(false)
+        expect(result_context_stages_resolution[:errors]).to include(:base, :InstantVerify)
+        expect(result_context_stages_resolution[:exception]).to eq(nil)
+        expect(result_context_stages_resolution[:timed_out]).to eq(false)
       end
+    end
 
-      context 'no threatmetrix_session_id' do
-        let(:threatmetrix_session_id) { nil }
-        it 'does not attempt to create a ddp proofer' do
-          perform
+    context 'with a InstantVerify result with failed attributes covered by the AAMVA result' do
+      it 'stores a successful result' do
+        stub_vendor_requests(
+          instant_verify_response: LexisNexisFixtures.instant_verify_address_fail_response_json,
+          aamva_response: AamvaFixtures.verification_response,
+        )
+
+        perform
+
+        result = document_capture_session.load_proofing_result[:result]
+        result_context = result[:context]
+        result_context_stages = result_context[:stages]
+        result_context_stages_resolution = result_context_stages[:resolution]
+        result_context_stages_state_id = result_context_stages[:state_id]
+
+        expect(result[:success]).to be true
+        expect(result[:errors].keys).to eq([:base, :InstantVerify])
+        expect(result[:exception]).to be_nil
+        expect(result[:timed_out]).to be false
 
-          expect(instance).not_to receive(:lexisnexis_ddp_proofer)
-        end
+        # result[:context][:stages][:resolution]
+        expect(result_context_stages_resolution[:vendor_name]).
+          to eq('lexisnexis:instant_verify')
+        expect(result_context_stages_resolution[:success]).to eq(false)
+        expect(result_context_stages_resolution[:can_pass_with_additional_verification]).
+          to eq(true)
+        expect(result_context_stages_resolution[:attributes_requiring_additional_verification]).
+          to eq(['address'])
+
+        # result[:context][:stages][:state_id]
+        expect(result_context_stages_state_id[:vendor_name]).to eq('aamva:state_id')
+        expect(result_context_stages_state_id[:success]).to eq(true)
+        expect(result_context_stages_state_id[:verified_attributes]).to eq(
+          %w[address state_id_number state_id_type dob last_name first_name],
+        )
       end
     end
 
-    context 'stubbing vendors and threatmetrix' do
-      before do
-        allow(instance).to receive(:resolution_proofer).and_return(resolution_proofer)
-        allow(instance).to receive(:state_id_proofer).and_return(state_id_proofer)
-        allow(instance).to receive(:lexisnexis_ddp_proofer).and_return(ddp_proofer)
-        allow(IdentityConfig.store).to receive(:proofing_device_profiling).and_return(:enabled)
-        stub_request(:post, 'https://example.com/api/session-query').
-          with(
-            body: hash_including('api_key' => 'test_api_key'),
-            headers: {
-              'Accept' => '*/*',
-              'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-              'Authorization' => 'Basic Og==',
-              'Content-Type' => 'application/json',
-              'User-Agent' => 'Faraday v2.6.0',
-            },
-          ).
-          to_return(
-            status: 200,
-            body: LexisNexisFixtures.ddp_success_response_json,
-            headers: {},
-          )
+    context 'with a InstantVerify result with failed attributes that cannot be covered by AAMVA' do
+      it 'stores an unsuccessful result and does not make an AAMVA request' do
+        stub_vendor_requests(
+          instant_verify_response:
+            LexisNexisFixtures.instant_verify_identity_not_found_response_json,
+        )
+
+        perform
+
+        result = document_capture_session.load_proofing_result[:result]
+        result_context = result[:context]
+        result_context_stages = result_context[:stages]
+        result_context_stages_resolution = result_context_stages[:resolution]
+        result_context_stages_state_id = result_context_stages[:state_id]
+
+        expect(result[:success]).to be false
+        expect(result[:errors].keys).to eq([:base, :InstantVerify])
+        expect(result[:exception]).to be_nil
+        expect(result[:timed_out]).to be false
+
+        # result[:context][:stages][:resolution]
+        expect(result_context_stages_resolution[:vendor_name]).
+          to eq('lexisnexis:instant_verify')
+        expect(result_context_stages_resolution[:success]).to eq(false)
+        expect(result_context_stages_resolution[:can_pass_with_additional_verification]).
+          to eq(true)
+        expect(result_context_stages_resolution[:attributes_requiring_additional_verification]).
+          to match(['address', 'dead', 'dob', 'ssn'])
+
+        # result[:context][:stages][:state_id]
+        expect(result_context_stages_state_id[:vendor_name]).to eq('UnsupportedJurisdiction')
+        expect(result_context_stages_state_id[:success]).to eq(true)
+
+        expect(@aamva_stub).to_not have_been_requested
       end
+    end
+
+    context 'with a failed AAMVA result' do
+      it 'stores an unsuccessful result' do
+        stub_vendor_requests(aamva_response: AamvaFixtures.verification_response_namespaced_failure)
+
+        perform
+
+        result = document_capture_session.load_proofing_result[:result]
+        result_context = result[:context]
+        result_context_stages = result_context[:stages]
+        result_context_stages_state_id = result_context_stages[:state_id]
+
+        expect(result[:success]).to be false
+        expect(result[:errors]).to include(
+          :state_id_number, :state_id_type, :dob, :last_name, :first_name, :address1, :address2,
+          :city, :state, :zipcode
+        )
+        expect(result[:exception]).to be_nil
+        expect(result[:timed_out]).to be false
+
+        # result[:context][:stages][:state_id]
+        expect(result_context_stages_state_id[:vendor_name]).to eq('aamva:state_id')
+        expect(result_context_stages_state_id[:success]).to eq(false)
+        expect(result_context_stages_state_id[:errors]).to include(
+          :state_id_number, :state_id_type, :dob, :last_name, :first_name, :address1, :address2,
+          :city, :state, :zipcode
+        )
+        expect(result_context_stages_state_id[:exception]).to eq(nil)
 
-      context 'with a successful response from the proofer' do
-        before do
-          expect(resolution_proofer).to receive(:proof).
-            and_return(Proofing::ResolutionResult.new)
-          expect(state_id_proofer).to receive(:proof).
-            and_return(Proofing::StateIdResult.new)
-          Proofing::Mock::DeviceProfilingBackend.new.record_profiling_result(
-            session_id: threatmetrix_session_id,
-            result: 'pass',
-          )
-        end
-
-        it 'logs the trace_id and timing info for ProofResolution and the Threatmetrix info' do
-          expect(instance).to receive(:logger_info_hash).ordered.with(
-            hash_including(
-              name: 'ThreatMetrix',
-              threatmetrix_request_id: '1234',
-              threatmetrix_success: true,
-              user_id: user.uuid,
-            ),
-          )
-
-          expect(instance).to receive(:logger_info_hash).ordered.with(
-            hash_including(
-              :timing,
-              name: 'ProofResolution',
-              trace_id: trace_id,
-            ),
-          )
-
-          perform
-
-          proofing_component = user.proofing_component
-          expect(proofing_component.threatmetrix).to equal(true)
-          expect(proofing_component.threatmetrix_review_status).to eq('pass')
-        end
-
-        context 'nil response body from ddp' do
-          let(:ddp_result) { Proofing::DdpResult.new(response_body: nil) }
-
-          before do
-            expect(ddp_proofer).to receive(:proof).and_return(ddp_result)
-          end
-
-          it 'does not blow up' do
-            perform
-
-            result = document_capture_session.load_proofing_result[:result]
-
-            result_context = result[:context]
-            result_context_stages = result_context[:stages]
-            result_context_stages_threatmetrix = result_context_stages[:threatmetrix]
-
-            # result[:context][:stages][:threatmetrix]
-            expect(result_context_stages_threatmetrix[:response_body]).to eq(
-              error: 'TMx response body was empty',
-            )
-          end
-        end
+        expect(result_context_stages_state_id[:timed_out]).to eq(false)
       end
+    end
+
+    context 'in a state where AAMVA is not supported' do
+      let(:should_proof_state_id) { false }
 
-      context 'does call state id with an unsuccessful response from the proofer' do
-        it 'posts back to the callback url' do
-          expect(resolution_proofer).to receive(:proof).
-            and_return(Proofing::ResolutionResult.new(exception: 'error'))
-          expect(state_id_proofer).to receive(:proof).
-            and_return(Proofing::StateIdResult.new)
+      it 'does not make an AAMVA request' do
+        stub_vendor_requests
 
-          perform
-        end
+        perform
+
+        result = document_capture_session.load_proofing_result[:result]
+        result_context = result[:context]
+        result_context_stages = result_context[:stages]
+        result_context_stages_state_id = result_context_stages[:state_id]
+
+        expect(result[:success]).to be true
+        expect(result[:exception]).to be_nil
+        expect(result[:timed_out]).to be false
+
+        # result[:context][:stages][:state_id]
+        expect(result_context_stages_state_id[:vendor_name]).to eq('UnsupportedJurisdiction')
+        expect(result_context_stages_state_id[:success]).to eq(true)
+
+        expect(@aamva_stub).to_not have_been_requested
       end
+    end
 
-      context 'no state_id proof' do
-        let(:should_proof_state_id) { false }
+    context 'with threatmetrix disabled' do
+      let(:proofing_device_profiling) { :disabled }
 
-        it 'does not call state_id proof if resolution proof is successful' do
-          expect(resolution_proofer).to receive(:proof).
-            and_return(Proofing::ResolutionResult.new)
+      it 'does not make a request to threatmetrix' do
+        stub_vendor_requests
 
-          expect(state_id_proofer).not_to receive(:proof)
-          perform
-        end
+        perform
+
+        result = document_capture_session.load_proofing_result[:result]
+        result_context = result[:context]
+        result_context_stages = result_context[:stages]
+        result_context_stages_threatmetrix = result_context_stages[:threatmetrix]
+
+        expect(result[:success]).to be true
+        expect(result[:exception]).to be_nil
+        expect(result[:timed_out]).to be false
+
+        # result[:context][:stages][:threatmetrix]
+        expect(result_context_stages_threatmetrix).to be_nil
+
+        expect(@threatmetrix_stub).to_not have_been_requested
       end
     end
 
-    context 'a stale job' do
-      before { instance.enqueued_at = 10.minutes.ago }
+    context 'without a threatmetrix session ID' do
+      let(:threatmetrix_session_id) { nil }
+
+      it 'does not make a request to threatmetrix' do
+        stub_vendor_requests
+
+        perform
+
+        result = document_capture_session.load_proofing_result[:result]
+        result_context = result[:context]
+        result_context_stages = result_context[:stages]
+        result_context_stages_threatmetrix = result_context_stages[:threatmetrix]
+
+        expect(result[:success]).to be true
+        expect(result[:exception]).to be_nil
+        expect(result[:timed_out]).to be false
+
+        # result[:context][:stages][:threatmetrix]
+        expect(result_context_stages_threatmetrix).to be_nil
 
+        expect(@threatmetrix_stub).to_not have_been_requested
+      end
+    end
+
+    context 'a stale job' do
       it 'bails and does not do any proofing' do
-        expect(instance).to_not receive(:resolution_proofer)
-        expect(instance).to_not receive(:state_id_proofer)
+        stub_vendor_requests
+
+        instance.enqueued_at = 10.minutes.ago
+
+        expect(@aamva_stub).to_not have_been_requested
+        expect(@instant_verify_stub).to_not have_been_requested
+        expect(@threatmetrix_stub).to_not have_been_requested
 
         expect { perform }.to raise_error(JobHelpers::StaleJobHelper::StaleJobError)
       end
     end
+
+    def stub_vendor_requests(
+      instant_verify_response: LexisNexisFixtures.instant_verify_success_response_json,
+      threatmetrix_response: LexisNexisFixtures.ddp_success_response_json,
+      aamva_response: AamvaFixtures.verification_response
+    )
+      allow(IdentityConfig.store).to receive(:proofer_mock_fallback).and_return(false)
+      @instant_verify_stub = stub_instant_verify_request(instant_verify_response)
+      @threatmetrix_stub = stub_threatmetrix_request(threatmetrix_response)
+      @aamva_stub = stub_aamva_request(aamva_response)
+    end
+
+    def stub_instant_verify_request(instant_verify_response)
+      instant_verify_url = URI.join(
+        IdentityConfig.store.lexisnexis_base_url,
+        '/restws/identity/v2/',
+        IdentityConfig.store.lexisnexis_account_id + '/',
+        IdentityConfig.store.lexisnexis_instant_verify_workflow + '/',
+        'conversation',
+      )
+      stub_request(
+        :post,
+        instant_verify_url,
+      ).to_return(body: instant_verify_response)
+    end
+
+    def stub_threatmetrix_request(threatmetrix_response)
+      stub_request(
+        :post,
+        'https://www.example.com/api/session-query',
+      ).to_return(body: threatmetrix_response)
+    end
+
+    def stub_aamva_request(aamva_response)
+      allow(IdentityConfig.store).to receive(:aamva_private_key).
+        and_return(AamvaFixtures.example_config.private_key)
+      allow(IdentityConfig.store).to receive(:aamva_public_key).
+        and_return(AamvaFixtures.example_config.public_key)
+      stub_request(:post, IdentityConfig.store.aamva_auth_url).
+        to_return(
+          { body: AamvaFixtures.security_token_response },
+          { body: AamvaFixtures.authentication_token_response },
+        )
+      stub_request(:post, IdentityConfig.store.aamva_verification_url).
+        to_return(body: aamva_response)
+    end
   end
 end
diff --git a/spec/lib/tasks/review_profile_spec.rb b/spec/lib/tasks/review_profile_spec.rb
index 39be1a9b826..b12b5d98c2f 100644
--- a/spec/lib/tasks/review_profile_spec.rb
+++ b/spec/lib/tasks/review_profile_spec.rb
@@ -13,7 +13,11 @@
   before do
     Rake.application.rake_require('lib/tasks/review_profile', [Rails.root.to_s])
     Rake::Task.define_task(:environment)
-    allow(STDIN).to receive(:getpass) { user.uuid }
+    allow(STDIN).to receive(:gets).and_return(
+      "John Doe\n",
+      "Rspec Test\n",
+      user.uuid,
+    )
   end
 
   describe 'users:review:pass' do
diff --git a/spec/services/analytics_spec.rb b/spec/services/analytics_spec.rb
index 818a0b87db6..70ca8e2f667 100644
--- a/spec/services/analytics_spec.rb
+++ b/spec/services/analytics_spec.rb
@@ -37,6 +37,7 @@
   let(:request) { FakeRequest.new }
   let(:path) { 'fake_path' }
   let(:success_state) { 'GET|fake_path|Trackable Event' }
+  let(:irs_session_id) { nil }
 
   subject(:analytics) do
     Analytics.new(
@@ -45,6 +46,7 @@
       sp: 'http://localhost:3000',
       session: {},
       ahoy: ahoy,
+      irs_session_id: irs_session_id,
     )
   end
 
@@ -83,6 +85,31 @@
       analytics.track_event('Trackable Event', user_id: tracked_user.uuid)
     end
 
+    context 'with an irs_session_id' do
+      let(:irs_session_id) { 'abc123' }
+
+      it 'includes irs_session_id' do
+        expect(ahoy).to receive(:track).with(
+          'Trackable Event',
+          analytics_attributes.merge(irs_session_id: irs_session_id),
+        )
+
+        analytics.track_event('Trackable Event')
+      end
+    end
+
+    context 'without an irs_session_id' do
+      let(:irs_session_id) { nil }
+
+      it 'omits the irs_session_id key entirely' do
+        expect(ahoy).to receive(:track).with(
+          'Trackable Event',
+          hash_excluding(irs_session_id: irs_session_id),
+        )
+        analytics.track_event('Trackable Event')
+      end
+    end
+
     context 'tracing headers' do
       let(:amazon_trace_id) { SecureRandom.hex }
       let(:request) do
diff --git a/spec/services/idv/agent_spec.rb b/spec/services/idv/agent_spec.rb
index 26235999684..72baae98c94 100644
--- a/spec/services/idv/agent_spec.rb
+++ b/spec/services/idv/agent_spec.rb
@@ -32,7 +32,7 @@
       let(:document_capture_session) { DocumentCaptureSession.new(result_id: SecureRandom.hex) }
 
       context 'proofing state_id enabled' do
-        it 'still proofs state_id if resolution fails' do
+        it 'does not proof state_id if resolution fails' do
           agent = Idv::Agent.new(
             Idp::Constants::MOCK_IDV_APPLICANT.merge(uuid: user.uuid, ssn: '444-55-6666'),
           )
@@ -47,7 +47,7 @@
 
           result = document_capture_session.load_proofing_result.result
           expect(result[:errors][:ssn]).to eq ['Unverified SSN.']
-          expect(result[:context][:stages][:state_id][:vendor_name]).to eq 'StateIdMock'
+          expect(result[:context][:stages][:state_id][:vendor_name]).to eq 'UnsupportedJurisdiction'
         end
 
         it 'does proof state_id if resolution succeeds' do
diff --git a/spec/services/idv/steps/send_link_step_spec.rb b/spec/services/idv/steps/send_link_step_spec.rb
deleted file mode 100644
index dcf7b0bbed7..00000000000
--- a/spec/services/idv/steps/send_link_step_spec.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-require 'rails_helper'
-
-describe Idv::Steps::SendLinkStep do
-  let(:user) { build(:user) }
-
-  let(:service_provider) do
-    create(
-      :service_provider,
-      issuer: 'http://sp.example.com',
-      app_id: '123',
-    )
-  end
-
-  let(:request) do
-    double(
-      'request',
-      remote_ip: Faker::Internet.ip_v4_address,
-      headers: { 'X-Amzn-Trace-Id' => amzn_trace_id },
-    )
-  end
-
-  let(:params) do
-    ActionController::Parameters.new(
-      {
-        doc_auth: { phone: '(201) 555-1212' },
-      },
-    )
-  end
-
-  let(:controller) do
-    instance_double(
-      'controller',
-      session: { sp: { issuer: service_provider.issuer } },
-      params: params,
-      current_user: user,
-      current_sp: service_provider,
-      analytics: FakeAnalytics.new,
-      url_options: {},
-      request: request,
-    )
-  end
-
-  let(:amzn_trace_id) { SecureRandom.uuid }
-
-  let(:pii_from_doc) do
-    {
-      ssn: '123-45-6789',
-      first_name: 'bob',
-    }
-  end
-
-  let(:flow) do
-    Idv::Flows::DocAuthFlow.new(controller, {}, 'idv/doc_auth').tap do |flow|
-      flow.flow_session = { pii_from_doc: pii_from_doc }
-    end
-  end
-
-  let(:irs_attempts_api_tracker) do
-    IrsAttemptsApiTrackingHelper::FakeAttemptsTracker.new
-  end
-
-  subject(:step) do
-    Idv::Steps::SendLinkStep.new(flow)
-  end
-
-  before do
-    allow(controller).to receive(:irs_attempts_api_tracker).
-      and_return(irs_attempts_api_tracker)
-  end
-
-  describe '#extra_view_variables' do
-    it 'includes form' do
-      expect(step.extra_view_variables).to include(
-        {
-          idv_phone_form: be_an_instance_of(Idv::PhoneForm),
-        },
-      )
-    end
-  end
-
-  describe 'the return value from #call' do
-    let(:response) { step.call }
-
-    it 'includes the telephony response' do
-      expect(response.extra[:telephony_response]).to eq(
-        {
-          errors: {},
-          message_id: 'fake-message-id',
-          request_id: 'fake-message-request-id',
-          success: true,
-        },
-      )
-    end
-  end
-end
diff --git a/spec/services/idv/steps/upload_step_spec.rb b/spec/services/idv/steps/upload_step_spec.rb
index 5d3beba11de..151d395acd2 100644
--- a/spec/services/idv/steps/upload_step_spec.rb
+++ b/spec/services/idv/steps/upload_step_spec.rb
@@ -61,15 +61,12 @@
     end
 
     subject(:step) do
-      Idv::Steps::SendLinkStep.new(flow)
+      Idv::Steps::UploadStep.new(flow)
     end
 
     before do
       allow(controller).to receive(:irs_attempts_api_tracker).
         and_return(irs_attempts_api_tracker)
-      allow(IdentityConfig.store).
-        to receive(:doc_auth_combined_hybrid_handoff_enabled).
-        and_return(true)
     end
 
     describe '#extra_view_variables' do
diff --git a/spec/services/pii/attributes_spec.rb b/spec/services/pii/attributes_spec.rb
index e84ad7ae39d..73deb5a7241 100644
--- a/spec/services/pii/attributes_spec.rb
+++ b/spec/services/pii/attributes_spec.rb
@@ -35,6 +35,22 @@
 
       expect(pii.first_name).to eq('Test')
     end
+
+    it 'parses state ID address keys' do
+      pii = described_class.new_from_hash(
+        state_id_address1: '1600 Pennsylvania Avenue',
+        state_id_address2: 'Apt 2',
+        state_id_city: 'Washington',
+        state_id_jurisdiction: 'DC',
+        state_id_zipcode: '20005',
+      )
+
+      expect(pii.state_id_address1).to eq('1600 Pennsylvania Avenue')
+      expect(pii.state_id_address2).to eq('Apt 2')
+      expect(pii.state_id_city).to eq('Washington')
+      expect(pii.state_id_jurisdiction).to eq('DC')
+      expect(pii.state_id_zipcode).to eq('20005')
+    end
   end
 
   describe '#new_from_json' do
diff --git a/spec/services/usps_in_person_proofing/proofer_spec.rb b/spec/services/usps_in_person_proofing/proofer_spec.rb
index d29b18dbbaa..0d15d014e6e 100644
--- a/spec/services/usps_in_person_proofing/proofer_spec.rb
+++ b/spec/services/usps_in_person_proofing/proofer_spec.rb
@@ -205,15 +205,6 @@ def check_for_token_refresh_and_method_call(cache, redis)
     end
   end
 
-  describe '#request_pilot_facilities' do
-    it 'returns facilities' do
-      facilities = subject.request_pilot_facilities
-      expect(facilities.length).to eq(7)
-
-      check_facility(facilities[0])
-    end
-  end
-
   describe '#request_enroll' do
     let(:cache) { double(ActiveSupport::Cache::MemoryStore) }
     let(:redis) { double(Redis) }
diff --git a/spec/support/features/doc_auth_helper.rb b/spec/support/features/doc_auth_helper.rb
index f1e35464b2f..9b2f061cbfb 100644
--- a/spec/support/features/doc_auth_helper.rb
+++ b/spec/support/features/doc_auth_helper.rb
@@ -18,6 +18,11 @@ def session_from_completed_flow_steps(finished_step)
     session
   end
 
+  def clear_and_fill_in(field_name, text)
+    fill_in field_name, with: ''
+    fill_in field_name, with: text
+  end
+
   def fill_out_ssn_form_with_ssn_that_fails_resolution
     fill_in t('idv.form.ssn_label_html'), with: SSN_THAT_FAILS_RESOLUTION
   end
@@ -62,10 +67,6 @@ def idv_doc_auth_document_capture_step
     idv_doc_auth_step_path(step: :document_capture)
   end
 
-  def idv_doc_auth_send_link_step
-    idv_doc_auth_step_path(step: :send_link)
-  end
-
   def idv_doc_auth_link_sent_step
     idv_doc_auth_step_path(step: :link_sent)
   end
@@ -90,7 +91,11 @@ def complete_doc_auth_steps_before_agreement_step(expect_accessible: false)
   end
 
   def complete_agreement_step
-    find('label', text: t('doc_auth.instructions.consent', app_name: APP_NAME)).click
+    find(
+      'label',
+      text: t('doc_auth.instructions.consent', app_name: APP_NAME),
+      wait: 5,
+    ).click
     click_on t('doc_auth.buttons.continue')
   end
 
@@ -101,7 +106,7 @@ def complete_doc_auth_steps_before_upload_step(expect_accessible: false)
   end
 
   def complete_upload_step
-    click_on t('doc_auth.info.upload_computer_link')
+    click_on t('forms.buttons.upload_photos')
   end
 
   def complete_doc_auth_steps_before_document_capture_step(expect_accessible: false)
@@ -126,7 +131,7 @@ def complete_document_capture_step_with_yml(proofing_yml)
   def complete_doc_auth_steps_before_email_sent_step
     allow(BrowserCache).to receive(:parse).and_return(mobile_device)
     complete_doc_auth_steps_before_upload_step
-    click_on t('doc_auth.info.upload_computer_link')
+    complete_upload_step
   end
 
   def complete_doc_auth_steps_before_phone_otp_step(expect_accessible: false)
@@ -170,21 +175,9 @@ def complete_doc_auth_steps_before_address_step(expect_accessible: false)
     click_button t('idv.buttons.change_address_label')
   end
 
-  def complete_doc_auth_steps_before_send_link_step
-    complete_doc_auth_steps_before_upload_step
-    if IdentityConfig.store.doc_auth_combined_hybrid_handoff_enabled
-      click_on t('forms.buttons.send_link')
-    else
-      click_on t('doc_auth.buttons.use_phone')
-    end
-  end
-
   def complete_doc_auth_steps_before_link_sent_step
-    complete_doc_auth_steps_before_send_link_step
-    if !IdentityConfig.store.doc_auth_combined_hybrid_handoff_enabled
-      fill_out_doc_auth_phone_form_ok
-    end
-    click_idv_continue
+    complete_doc_auth_steps_before_upload_step
+    click_send_link
   end
 
   def complete_all_doc_auth_steps(expect_accessible: false)
diff --git a/spec/support/features/idv_step_helper.rb b/spec/support/features/idv_step_helper.rb
index c9c09aab450..88f33b7ab49 100644
--- a/spec/support/features/idv_step_helper.rb
+++ b/spec/support/features/idv_step_helper.rb
@@ -60,7 +60,7 @@ def visit_help_center
   end
 
   def click_what_to_bring_link
-    expect(page).to have_content(t('in_person_proofing.headings.barcode'))
+    expect(page).to have_content(t('in_person_proofing.headings.barcode', app_name: APP_NAME))
     click_link t('in_person_proofing.body.barcode.learn_more')
   end
 
diff --git a/spec/support/matchers/accessibility.rb b/spec/support/matchers/accessibility.rb
index 5a991666b5b..65f7bb6870c 100644
--- a/spec/support/matchers/accessibility.rb
+++ b/spec/support/matchers/accessibility.rb
@@ -96,7 +96,7 @@ def page_markup_syntax_errors
   def descriptors(element)
     element['aria-describedby']&.
       split(' ')&.
-      map { |descriptor_id| rendered.at_css("##{descriptor_id}")&.text }
+      map { |descriptor_id| page.find("##{descriptor_id}")&.text }
   end
 
   match { |element| descriptors(element)&.include?(description) }
diff --git a/spec/views/idv/doc_auth/upload.html.erb_spec.rb b/spec/views/idv/doc_auth/upload.html.erb_spec.rb
deleted file mode 100644
index 0d04aa4c2bb..00000000000
--- a/spec/views/idv/doc_auth/upload.html.erb_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require 'rails_helper'
-
-describe 'idv/doc_auth/upload.html.erb' do
-  let(:flow_session) { {} }
-  let(:user_fully_authenticated) { true }
-
-  before do
-    allow(view).to receive(:flow_session).and_return(flow_session)
-    allow(view).to receive(:user_fully_authenticated?).and_return(user_fully_authenticated)
-    allow(view).to receive(:url_for).and_return('https://www.example.com/')
-    allow(view).to receive(:user_signing_up?).and_return(false)
-
-    render template: 'idv/doc_auth/upload'
-  end
-
-  it 'renders the headings and info' do
-    expect(rendered).to have_content(t('doc_auth.headings.upload'))
-    expect(rendered).to have_content(t('doc_auth.info.upload'))
-    expect(rendered).to have_content(t('doc_auth.headings.upload_from_phone'))
-  end
-end