diff --git a/benefits/core/migrations/0002_sample_data.py b/benefits/core/migrations/0002_sample_data.py
index 9dee5cee5..d9298e20d 100644
--- a/benefits/core/migrations/0002_sample_data.py
+++ b/benefits/core/migrations/0002_sample_data.py
@@ -13,8 +13,8 @@ def load_sample_data(app, *args, **kwargs):
 
     EligibilityType = app.get_model("core", "EligibilityType")
 
-    type1 = EligibilityType.objects.create(name="type1", label="Eligibility Type 1", group_id="group1")
-    type2 = EligibilityType.objects.create(name="type2", label="Eligibility Type 2", group_id="group2")
+    senior_type = EligibilityType.objects.create(name="senior", label="Senior", group_id="group1")
+    courtesy_card_type = EligibilityType.objects.create(name="courtesy_card", label="Courtesy Card", group_id="group2")
 
     PemData = app.get_model("core", "PemData")
 
@@ -88,42 +88,26 @@ def load_sample_data(app, *args, **kwargs):
         client_name="benefits-oauth-client-name",
         client_id="benefits-oauth-client-id",
         authority="https://example.com",
-        scope="verify:type1",
-        claim="type1",
+        scope="verify:senior",
+        claim="senior",
     )
 
     EligibilityVerifier = app.get_model("core", "EligibilityVerifier")
 
     verifier1 = EligibilityVerifier.objects.create(
-        name="Test Eligibility Verifier 1",
-        api_url="http://server:8000/verify",
-        api_auth_header="X-Server-API-Key",
-        api_auth_key="server-auth-token",
-        eligibility_type=type1,
-        public_key=server_public_key,
-        jwe_cek_enc="A256CBC-HS512",
-        jwe_encryption_alg="RSA-OAEP",
-        jws_signing_alg="RS256",
+        name="OAuth claims via Login.gov",
+        eligibility_type=senior_type,
         auth_provider=auth_provider,
-        selection_label=_("eligibility.pages.index.sample.label"),
-        selection_label_description=_("eligibility.pages.index.sample.description"),
-        start_headline=_("eligibility.pages.start.sample.title"),
-        start_sub_headline=_("eligibility.pages.start.sample.content_title"),
-        start_item_name=_("eligibility.pages.start.sample.items[0].title"),
-        start_item_description=_("eligibility.pages.start.sample.items[0].text"),
-        start_blurb=_("eligibility.pages.start.sample.p[0]"),
-        form_title=_("eligibility.pages.confirm.sample.title"),
-        form_content_title=_("eligibility.pages.confirm.sample.content_title"),
-        form_blurb=_("eligibility.pages.confirm.sample.p[0]"),
-        form_sub_label=_("eligibility.forms.confirm.sample.fields.sub"),
-        form_sub_placeholder="A1234567",
-        form_sub_pattern=".+",
-        form_name_label=_("eligibility.forms.confirm.sample.fields.name"),
-        form_name_placeholder="Rodriguez",
-        form_name_max_length=255,
-        unverified_title=_("eligibility.pages.unverified.sample.title"),
-        unverified_content_title=_("eligibility.pages.unverified.sample.content_title"),
-        unverified_blurb=_("eligibility.pages.unverified.sample.p[0]"),
+        selection_label=_("eligibility.pages.index.mst_login.label"),
+        selection_label_description=_("eligibility.pages.index.mst_login.description"),
+        start_headline=_("eligibility.pages.start.mst_login.headline"),
+        start_sub_headline=_("eligibility.pages.start.mst_login.sub_headline"),
+        start_item_name=_("eligibility.pages.start.mst_login.items[0].title"),
+        start_item_description=_("eligibility.pages.start.mst_login.items[0].text"),
+        start_blurb=_("eligibility.pages.start.mst_login.p[0]"),
+        unverified_title=_("eligibility.pages.unverified.mst_login.title"),
+        unverified_content_title=_("eligibility.pages.unverified.mst_login.content_title"),
+        unverified_blurb=_("eligibility.pages.unverified.mst_login.p[0]"),
     )
 
     verifier2 = EligibilityVerifier.objects.create(
@@ -131,7 +115,7 @@ def load_sample_data(app, *args, **kwargs):
         api_url="http://server:8000/verify",
         api_auth_header="X-Server-API-Key",
         api_auth_key="server-auth-token",
-        eligibility_type=type2,
+        eligibility_type=courtesy_card_type,
         public_key=server_public_key,
         jwe_cek_enc="A256CBC-HS512",
         jwe_encryption_alg="RSA-OAEP",
@@ -160,22 +144,6 @@ def load_sample_data(app, *args, **kwargs):
         unverified_blurb=_("eligibility.pages.unverified.mst_cc.p[0]"),
     )
 
-    EligibilityVerifier.objects.create(
-        name="OAuth claims via Login.gov",
-        eligibility_type=type1,
-        auth_provider=auth_provider,
-        selection_label=_("eligibility.pages.index.mst_login.label"),
-        selection_label_description=None,
-        start_headline=_("eligibility.pages.start.mst_login.headline"),
-        start_sub_headline=_("eligibility.pages.start.mst_login.sub_headline"),
-        start_item_name=_("eligibility.pages.start.mst_login.items[0].title"),
-        start_item_description=_("eligibility.pages.start.mst_login.items[0].text"),
-        start_blurb=_("eligibility.pages.start.mst_login.p[0]"),
-        unverified_title=_("eligibility.pages.unverified.mst_login.title"),
-        unverified_content_title=_("eligibility.pages.unverified.mst_login.content_title"),
-        unverified_blurb=_("eligibility.pages.unverified.mst_login.p[0]"),
-    )
-
     PaymentProcessor = app.get_model("core", "PaymentProcessor")
 
     payment_processor = PaymentProcessor.objects.create(
@@ -197,39 +165,22 @@ def load_sample_data(app, *args, **kwargs):
 
     TransitAgency = app.get_model("core", "TransitAgency")
 
-    transit_agency1 = TransitAgency.objects.create(
-        slug="abc",
-        short_name="ABC",
-        long_name="ABC Transit Company",
-        agency_id="abc123",
-        merchant_id="abc",
-        info_url="https://www.example.com/help",
-        phone="800-555-5555",
-        active=True,
-        private_key=client_private_key,
-        public_key=client_public_key,
-        jws_signing_alg="RS256",
-        payment_processor=payment_processor,
-    )
-    transit_agency1.eligibility_types.set([type1, type2])
-    transit_agency1.eligibility_verifiers.set([verifier1, verifier2])
-
-    transit_agency2 = TransitAgency.objects.create(
-        slug="deftl",
-        short_name="DefTL",
-        long_name="DEF Transit Lines",
-        agency_id="def456",
-        merchant_id="deftl",
-        info_url="https://www.example.com/help",
-        phone="321-555-5555",
+    mst_agency = TransitAgency.objects.create(
+        slug="mst",
+        short_name="MST (sample)",
+        long_name="Monterey-Salinas Transit (sample)",
+        agency_id="mst",
+        merchant_id="mst",
+        info_url="https://mst.org/benefits",
+        phone="888-678-2871",
         active=True,
         private_key=client_private_key,
         public_key=client_public_key,
         jws_signing_alg="RS256",
         payment_processor=payment_processor,
     )
-    transit_agency2.eligibility_types.set([type1])
-    transit_agency2.eligibility_verifiers.set([verifier1])
+    mst_agency.eligibility_types.set([senior_type, courtesy_card_type])
+    mst_agency.eligibility_verifiers.set([verifier1, verifier2])
 
 
 class Migration(migrations.Migration):
diff --git a/benefits/locale/en/LC_MESSAGES/django.po b/benefits/locale/en/LC_MESSAGES/django.po
index 369b2bbd2..d834fac25 100644
--- a/benefits/locale/en/LC_MESSAGES/django.po
+++ b/benefits/locale/en/LC_MESSAGES/django.po
@@ -6,97 +6,61 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: https://github.com/cal-itp/benefits/issues \n"
-"POT-Creation-Date: 2022-09-28 20:50+0000\n"
+"POT-Creation-Date: 2022-09-28 23:05+0000\n"
 "Language: English\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: benefits/core/migrations/0002_sample_data.py:86
 msgid "eligibility.buttons.signin"
 msgstr "Get started with"
 
-#: benefits/core/migrations/0002_sample_data.py:87
 msgid "eligibility.buttons.signout"
 msgstr "Sign out of Login.gov"
 
-#: benefits/core/migrations/0002_sample_data.py:108
-msgid "eligibility.pages.index.sample.label"
-msgstr "I am 65 years of age or older"
+msgid "eligibility.pages.index.mst_login.label"
+msgstr "Senior Discount Program"
 
-#: benefits/core/migrations/0002_sample_data.py:109
-msgid "eligibility.pages.index.sample.description"
+msgid "eligibility.pages.index.mst_login.description"
 msgstr ""
 "You must be 65 years or older. This benefit does not expire, but you may "
 "need to renew. Using this benefit means your new transit fare is half of the "
 "standard fare."
 
-#: benefits/core/migrations/0002_sample_data.py:110
-msgid "eligibility.pages.start.sample.title"
-msgstr "You selected an Older Adult Benefit with MST."
+msgid "eligibility.pages.start.mst_login.headline"
+msgstr "You selected an Older Adult benefit with MST."
 
-#: benefits/core/migrations/0002_sample_data.py:111
-msgid "eligibility.pages.start.sample.content_title"
+msgid "eligibility.pages.start.mst_login.sub_headline"
 msgstr "You will need a few items to connect your benefit:"
 
-#: benefits/core/migrations/0002_sample_data.py:112
-msgid "eligibility.pages.start.sample.items[0].title"
-msgstr "Provide your California ID number"
-
-#: benefits/core/migrations/0002_sample_data.py:113
-msgid "eligibility.pages.start.sample.items[0].text"
-msgstr "You will need to verify your age with a driver’s license or ID card."
+msgid "eligibility.pages.start.mst_login.items[0].title"
+msgstr "A Login.gov account with identity verification"
 
-#: benefits/core/migrations/0002_sample_data.py:114
-msgid "eligibility.pages.start.sample.p[0]"
+msgid "eligibility.pages.start.mst_login.items[0].text"
 msgstr ""
-"This program is currently open to those who are 65 or older. Not over 65? "
-"Get in touch with your transit provider to learn about other available "
-"discount programs."
-
-#: benefits/core/migrations/0002_sample_data.py:115
-msgid "eligibility.pages.confirm.sample.title"
-msgstr "Confirm Eligibility"
-
-#: benefits/core/migrations/0002_sample_data.py:116
-msgid "eligibility.pages.confirm.sample.content_title"
-msgstr "Let’s see if we can confirm your age with the Sample Server."
+"Login.gov is a safe way to sign in to government services. Benefits uses "
+"Login.gov to verify your age. If you do not have an account already, you "
+"will be able to create one. You will also need to verify your identity, "
+"which will require these items:"
 
-#: benefits/core/migrations/0002_sample_data.py:117
-msgid "eligibility.pages.confirm.sample.p[0]"
+msgid "eligibility.pages.start.mst_login.p[0]"
 msgstr ""
-"Please enter your license/ID number and last name below. If you’re 65 or "
-"older, we can confirm that you are eligible for a senior discount when you "
-"ride transit. We do not save the information you enter here."
-
-#: benefits/core/migrations/0002_sample_data.py:118
-msgid "eligibility.forms.confirm.sample.fields.sub"
-msgstr "CA driver’s license or ID number"
-
-#: benefits/core/migrations/0002_sample_data.py:121
-msgid "eligibility.forms.confirm.sample.fields.name"
-msgstr "Last name (as it appears on ID)"
 
-#: benefits/core/migrations/0002_sample_data.py:124
-msgid "eligibility.pages.unverified.sample.title"
+msgid "eligibility.pages.unverified.mst_login.title"
 msgstr "Eligibility Error"
 
-#: benefits/core/migrations/0002_sample_data.py:125
-msgid "eligibility.pages.unverified.sample.content_title"
+msgid "eligibility.pages.unverified.mst_login.content_title"
 msgstr "Your eligibility could not be verified."
 
-#: benefits/core/migrations/0002_sample_data.py:126
-msgid "eligibility.pages.unverified.sample.p[0]"
+msgid "eligibility.pages.unverified.mst_login.p[0]"
 msgstr ""
-"You may still be eligible for a discount, but we can’t verify your age with "
-"the sample."
+"That’s okay! You may still be eligible for our program. Please reach out to "
+"your local transit provider for assistance."
 
-#: benefits/core/migrations/0002_sample_data.py:140
 msgid "eligibility.pages.index.mst_cc.label"
 msgstr "I have an MST Courtesy Card"
 
-#: benefits/core/migrations/0002_sample_data.py:141
 msgid "eligibility.pages.index.mst_cc.description"
 msgstr ""
 "This option is for people who have a current Courtesy Card (includes MST "
@@ -104,158 +68,90 @@ msgstr ""
 "and may need to be renewed in the future. Using this benefit means your new "
 "transit fare is half of the standard fare.the sample."
 
-#: benefits/core/migrations/0002_sample_data.py:142
 msgid "eligibility.pages.start.mst_cc.headline"
 msgstr "You selected a Courtesy Card benefit."
 
-#: benefits/core/migrations/0002_sample_data.py:143
 msgid "eligibility.pages.start.mst_cc.sub_headline"
 msgstr "You will need a few items to connect your benefit:"
 
-#: benefits/core/migrations/0002_sample_data.py:144
 msgid "eligibility.pages.start.mst_cc.items[0].title"
 msgstr "Your current Courtesy Card number"
 
-#: benefits/core/migrations/0002_sample_data.py:145
 msgid "eligibility.pages.start.mst_cc.items[0].text"
 msgstr ""
 "You do not need to have your physical card, but you will need to know the "
 "number. It is five digits and starts with a #.  "
 
-#: benefits/core/migrations/0002_sample_data.py:146
 msgid "eligibility.pages.start.mst_cc.p[0]"
 msgstr ""
 "This program is currently open to all MST Courtesy Cardholders. Not a "
 "Courtesy Cardholder? Get in touch with your transit provider to learn about "
 "other available discount programs at"
 
-#: benefits/core/migrations/0002_sample_data.py:147
 msgid "eligibility.pages.confirm.mst_cc.title"
 msgstr "Confirm your Courtesy Card"
 
-#: benefits/core/migrations/0002_sample_data.py:148
 msgid "eligibility.pages.confirm.mst_cc.content_title"
 msgstr "Let’s see if we can find you in our system"
 
-#: benefits/core/migrations/0002_sample_data.py:149
 msgid "eligibility.pages.confirm.mst_cc.p[0]"
 msgstr ""
 "Please input your Courtesy Card number and last name below. If you’re a "
 "current MST Courtesy Cardholder, we can confirm that you are eligible for a "
 "benefit. We do not save your information."
 
-#: benefits/core/migrations/0002_sample_data.py:150
 msgid "eligibility.forms.confirm.mst_cc.fields.sub"
 msgstr "MST Courtesy Card number"
 
-#: benefits/core/migrations/0002_sample_data.py:151
 msgid "eligibility.forms.confirm.mst_cc.fields.sub.help_text"
 msgstr "This is a 5-digit number on the front and back of your card."
 
-#: benefits/core/migrations/0002_sample_data.py:154
 msgid "eligibility.forms.confirm.mst_cc.fields.name"
 msgstr "Last name (as it appears on Courtesy Card)"
 
-#: benefits/core/migrations/0002_sample_data.py:155
 msgid "eligibility.forms.confirm.mst_cc.fields.name.help_text"
 msgstr "We use this to help confirm your Courtesy Card."
 
-#: benefits/core/migrations/0002_sample_data.py:158
 msgid "eligibility.pages.unverified.mst_cc.title"
 msgstr "Courtesy Card not located"
 
-#: benefits/core/migrations/0002_sample_data.py:159
 msgid "eligibility.pages.unverified.mst_cc.content_title"
 msgstr "We couldn’t locate you in our system"
 
-#: benefits/core/migrations/0002_sample_data.py:160
 msgid "eligibility.pages.unverified.mst_cc.p[0]"
 msgstr ""
 "That’s okay! You may still be eligible for our program. Please reach out to "
 "Monterey-Salinas Transit for assistance."
 
-#: benefits/core/migrations/0002_sample_data.py:167
-msgid "eligibility.pages.index.mst_login.label"
-msgstr "Senior Discount Program"
-
-#: benefits/core/migrations/0002_sample_data.py:169
-msgid "eligibility.pages.start.mst_login.headline"
-msgstr "You selected an Older Adult benefit with MST."
-
-#: benefits/core/migrations/0002_sample_data.py:170
-msgid "eligibility.pages.start.mst_login.sub_headline"
-msgstr "You will need a few items to connect your benefit:"
-
-#: benefits/core/migrations/0002_sample_data.py:171
-msgid "eligibility.pages.start.mst_login.items[0].title"
-msgstr "A Login.gov account with identity verification"
-
-#: benefits/core/migrations/0002_sample_data.py:172
-msgid "eligibility.pages.start.mst_login.items[0].text"
-msgstr ""
-"Login.gov is a safe way to sign in to government services. Benefits uses "
-"Login.gov to verify your age. If you do not have an account already, you "
-"will be able to create one. You will also need to verify your identity, "
-"which will require these items:"
-
-#: benefits/core/migrations/0002_sample_data.py:173
-msgid "eligibility.pages.start.mst_login.p[0]"
-msgstr ""
-
-#: benefits/core/migrations/0002_sample_data.py:174
-msgid "eligibility.pages.unverified.mst_login.title"
-msgstr "Eligibility Error"
-
-#: benefits/core/migrations/0002_sample_data.py:175
-msgid "eligibility.pages.unverified.mst_login.content_title"
-msgstr "Your eligibility could not be verified."
-
-#: benefits/core/migrations/0002_sample_data.py:176
-msgid "eligibility.pages.unverified.mst_login.p[0]"
-msgstr ""
-"That’s okay! You may still be eligible for our program. Please reach out to "
-"your local transit provider for assistance."
-
-#: benefits/core/templates/core/agency_index.html:10
 msgid "core.pages.agency_index.h2"
 msgstr "Your benefit applies every time you tap to ride."
 
-#: benefits/core/templates/core/base.html:10
-#: benefits/core/templates/core/help.html:12
 msgid "core.pages.help.about.p[0]"
 msgstr ""
 "The Benefits tool is provided by California Integrated Travel Project (Cal-"
 "ITP), which is a new program from the California Department of "
 "Transportation dedicated to making travel simpler and cost-effective for all."
 
-#: benefits/core/templates/core/base.html:44
 msgid "core.buttons.skip"
 msgstr "Skip to Main Content"
 
-#: benefits/core/templates/core/base.html:61
 msgctxt "image alt text"
 msgid "core.logos.small"
 msgstr "California Integrated Travel Project: Benefits logo (small)"
 
-#: benefits/core/templates/core/base.html:64
 msgctxt "image alt text"
 msgid "core.logos.large"
 msgstr "California Integrated Travel Project: Benefits logo (large)"
 
-#: benefits/core/templates/core/base.html:80 benefits/core/views.py:88
-#: benefits/core/views.py:89
 msgid "core.buttons.help"
 msgstr "Help"
 
-#: benefits/core/templates/core/base.html:83
 msgid "core.buttons.privacy"
 msgstr "Privacy Policy"
 
-#: benefits/core/templates/core/help.html:11
 msgid "core.pages.help.about"
 msgstr "What is Cal-ITP Benefits?"
 
-#: benefits/core/templates/core/help.html:13
 msgid "core.pages.help.about.p[1]"
 msgstr ""
 "We partner with Login.gov to confirm age for age-based discounts, and we "
@@ -264,29 +160,24 @@ msgstr ""
 "our payment partner, Littlepay, so that when you pay for your transit ride, "
 "you get your discount automatically."
 
-#: benefits/core/templates/core/help.html:15
 msgid "core.pages.help.payment_options"
 msgstr "Payment options"
 
-#: benefits/core/templates/core/help.html:16
 msgid "core.pages.help.payment_options.p[0]"
 msgstr ""
 "In order to activate your discount, you need a bank card that has the "
 "contactless symbol on it. The contactless symbol is four curved lines that "
 "looks like this:"
 
-#: benefits/core/templates/core/help.html:21
 msgctxt "image alt text"
 msgid "core.icons.contactless"
 msgstr "Four curved lines on contactless-enabled cards"
 
-#: benefits/core/templates/core/help.html:24
 msgid "core.pages.help.payment_options.p[1]"
 msgstr ""
 "A contactless bank card can be a credit card or a debit card and must "
 "include a Visa or Mastercard logo."
 
-#: benefits/core/templates/core/help.html:26
 #, python-format
 msgid "core.pages.help.payment_options.p[2][0]%(website)s"
 msgstr ""
@@ -295,44 +186,37 @@ msgstr ""
 "as the <a href=\"%(website)s\" target=\"_blank\" rel=\"noopener noreferrer"
 "\">Cash App Visa Debit Card</a> "
 
-#: benefits/core/templates/core/help.html:27
 #, python-format
 msgid "core.pages.help.payment_options.p[2][1]%(website)s"
 msgstr ""
 "or the <a href=\"%(website)s\" target=\"_blank\" rel=\"noopener noreferrer"
 "\">Venmo Mastercard Debit Card</a>."
 
-#: benefits/core/templates/core/help.html:29
 msgid "core.pages.help.payment_options.p[3]"
 msgstr ""
 "You can still get your discount by going through your local transit "
 "provider’s application process."
 
-#: benefits/core/templates/core/help.html:30
 msgid "core.pages.help.payment_options.p[4]"
 msgstr ""
 "For updates on additional options, please check back on this website, or get "
 "in touch with your local transit provider."
 
-#: benefits/core/templates/core/help.html:32
 msgid "core.pages.help.login_gov"
 msgstr "What is Login.gov?"
 
-#: benefits/core/templates/core/help.html:33
 msgid "core.pages.help.login_gov.p[0]"
 msgstr ""
 "Login.gov is a secure way to sign in to participating government agencies. "
 "You can use your Login.gov account to access all of the benefits offered "
 "through Cal-ITP."
 
-#: benefits/core/templates/core/help.html:34
 msgid "core.pages.help.login_gov.p[1]"
 msgstr ""
 "Creating an account is simple. You will need an email address and method for "
 "authenticating your account&mdash;which will use either a landline, mobile "
 "phone, or backup codes that must be printed or written down."
 
-#: benefits/core/templates/core/help.html:35
 msgid "core.pages.help.login_gov.p[2]"
 msgstr ""
 "To learn more about Login.gov, please visit the <a href='https://login.gov/' "
@@ -340,11 +224,9 @@ msgstr ""
 "<a href='https://login.gov/help/' target=\"_blank\" rel=\"noopener noreferrer"
 "\">Login.gov Help Center</a>."
 
-#: benefits/core/templates/core/help.html:37
 msgid "core.pages.help.login_gov_verify"
 msgstr "How do I verify my identity on Login.gov?"
 
-#: benefits/core/templates/core/help.html:38
 msgid "core.pages.help.login_gov_verify.p[0]"
 msgstr ""
 "To verify your identity, Login.gov asks that you upload a photograph of your "
@@ -352,20 +234,17 @@ msgstr ""
 "which is then verified against authoritative sources. These requirements are "
 "in addition to meeting the requirements for two-factor authentication."
 
-#: benefits/core/templates/core/help.html:39
 msgid "core.pages.help.login_gov_verify.p[1]"
 msgstr ""
 "You cannot verify your identity on Login.gov without a state-issued ID, "
 "which can be either a driver’s license or non-driver’s license state-issued "
 "ID card."
 
-#: benefits/core/templates/core/help.html:40
 msgid "core.pages.help.login_gov_verify.p[2]"
 msgstr ""
 "If you do not have a phone plan that is in your name, Login.gov can send you "
 "the verification code by mail which takes approximately 3-5 days."
 
-#: benefits/core/templates/core/help.html:41
 msgid "core.pages.help.login_gov_verify.p[3]"
 msgstr ""
 "Verifying your identity makes sure the right person has access to the right "
@@ -375,194 +254,150 @@ msgstr ""
 "identity/how-to-verify-your-identity/' target=\"_blank\" rel=\"noopener "
 "noreferrer\">Help Center.</a>"
 
-#: benefits/core/templates/core/help.html:43
 msgid "core.pages.help.littlepay"
 msgstr "What is Littlepay?"
 
-#: benefits/core/templates/core/help.html:44
 msgid "core.pages.help.littlepay.p[0]"
 msgstr ""
 "Our payment partner, Littlepay, is a secure, end-to-end payment processing "
 "platform that allows us to seamlessly attach your transit discount to your "
 "bank card."
 
-#: benefits/core/templates/core/help.html:46
 #, python-format
 msgid "core.pages.help.littlepay.p[1]%(website)s"
 msgstr ""
 "For more information on Littlepay, please visit the <a href=\"%(website)s\" "
 "target=\"_blank\" rel=\"noopener noreferrer\">Littlepay website</a>."
 
-#: benefits/core/templates/core/help.html:49
 msgid "core.pages.help.questions"
 msgstr "Questions?"
 
-#: benefits/core/templates/core/help.html:50
 msgid "core.pages.help.questions.p[0]"
 msgstr ""
 "If you need assistance with this website, please reach out to the customer "
 "service team for your local transit provider."
 
-#: benefits/core/templates/core/help.html:57
 msgid "core.pages.help.foss.text"
 msgstr ""
 "This application is Free and Open Source Software. You may obtain the source "
 "code from"
 
-#: benefits/core/templates/core/help.html:58
 msgid "core.pages.help.foss.link"
 msgstr "GitHub"
 
-#: benefits/core/templates/core/includes/nocookies.html:6
 msgid "core.includes.nocookies.brand"
 msgstr "Cookies are disabled"
 
-#: benefits/core/templates/core/includes/nocookies.html:8
 msgid "core.includes.nocookies.text"
 msgstr ""
 "To function properly, this website requires a browser that supports cookies. "
 "Please enable cookies for this website and"
 
-#: benefits/core/templates/core/includes/nocookies.html:8
-#: benefits/core/templates/core/includes/noscript.html:8
-#: benefits/core/viewmodels.py:54
 msgid "core.buttons.return_home"
 msgstr "Return home"
 
-#: benefits/core/templates/core/includes/noscript.html:6
 msgid "core.includes.noscript.brand"
 msgstr "JavaScript is disabled"
 
-#: benefits/core/templates/core/includes/noscript.html:8
 msgid "core.includes.noscript.text"
 msgstr ""
 "To function properly, this website requires a browser that supports "
 "JavaScript. Please enable JavaScript for this website and"
 
-#: benefits/core/viewmodels.py:120
 msgid "core.pages.index.prefix"
 msgstr "Transit Benefits"
 
-#: benefits/core/viewmodels.py:162 benefits/core/viewmodels.py:164
-#: benefits/eligibility/forms.py:74
 msgid "core.pages.error.title"
 msgstr "Error"
 
-#: benefits/core/viewmodels.py:163
 msgctxt "image alt text"
 msgid "core.icons.sadbus"
 msgstr "Bus icon with flat tire"
 
-#: benefits/core/viewmodels.py:165
 msgid "core.pages.server_error.content_title"
 msgstr "Sorry! Service for this site is down."
 
-#: benefits/core/viewmodels.py:171
 msgid "core.pages.user_error.title"
 msgstr "Invalid state"
 
-#: benefits/core/viewmodels.py:172
 msgid "core.pages.user_error.content_title"
 msgstr "You may have reached this page on accident."
 
-#: benefits/core/viewmodels.py:173
 msgid "core.pages.user_error.p[0]"
 msgstr ""
 "To get started with Cal-ITP Benefits please click the button below, and you "
 "will be directed to the beginning of the enrollment process. "
 
-#: benefits/core/viewmodels.py:181 benefits/core/viewmodels.py:182
 msgid "core.pages.server_error.title"
 msgstr "Sorry! Service for this site is down."
 
-#: benefits/core/viewmodels.py:183
 msgid "core.pages.server_error.p[0]"
 msgstr ""
 "We should be back in operation soon. Please refresh the page in a few "
 "minutes."
 
-#: benefits/core/viewmodels.py:191
 msgid "core.pages.not_found.title"
 msgstr "Page not found"
 
-#: benefits/core/viewmodels.py:192
 msgid "core.pages.not_found.content_title"
 msgstr "Sorry! We can’t find that page."
 
-#: benefits/core/viewmodels.py:193
 msgid "core.pages.not_found.p[0]"
 msgstr ""
 "The page you are looking for might be somewhere else or may not exist "
 "anymore."
 
-#: benefits/core/viewmodels.py:216
 msgid "core.buttons.wait"
 msgstr "Please wait..."
 
-#: benefits/core/views.py:37
 msgid "core.pages.index.chooseprovider"
 msgstr "Please choose your transit provider:"
 
-#: benefits/core/views.py:40
 msgid "core.pages.index.title"
 msgstr "Choose Provider"
 
-#: benefits/core/views.py:41
 msgid "core.pages.index.content_title"
 msgstr ""
 "Cal-ITP Benefits makes it easy to use your public transit discount every "
 "time you ride."
 
-#: benefits/core/views.py:58
 msgid "core.pages.index.continue"
 msgstr "Get started"
 
-#: benefits/core/views.py:61
 msgid "core.pages.agency_index.title"
 msgstr "Introduction"
 
-#: benefits/core/views.py:62
 msgid "core.pages.agency_index.mst_cc.content_title"
 msgstr "Connect your MST Benefit to your Contactless Card"
 
-#: benefits/core/views.py:85
 msgid "core.buttons.back"
 msgstr "Go back"
 
-#: benefits/eligibility/forms.py:21
 msgid "eligibility.pages.index.label"
 msgstr "Select the option that best applies to you:"
 
-#: benefits/eligibility/forms.py:23
 msgid "eligibility.buttons.choose"
 msgstr "Choose this Benefit"
 
-#: benefits/eligibility/forms.py:41
 msgid "eligibility.forms.confirm.submit"
 msgstr "Check status"
 
-#: benefits/eligibility/forms.py:42
 msgid "eligibility.forms.confirm.submitting"
 msgstr "Checking"
 
-#: benefits/eligibility/forms.py:45
 msgid "eligibility.forms.confirm.errors.invalid"
 msgstr "Check your input. The format looks wrong."
 
-#: benefits/eligibility/forms.py:46
 msgid "eligibility.forms.confirm.errors.missing"
 msgstr "This field is required."
 
-#: benefits/eligibility/views.py:42
 msgid "eligibility.pages.index.title"
 msgstr "Select a benefit option"
 
-#: benefits/eligibility/views.py:43
 msgid "eligibility.pages.index.content_title"
 msgstr ""
 "Connect your bank card to your public transit discount with Cal-ITP Benefits"
 
-#: benefits/eligibility/views.py:45
 #, python-format
 msgid "eligibility.pages.index.p[0]%(info_link)s"
 msgstr ""
@@ -573,65 +408,51 @@ msgstr ""
 "\"%(info_link)s\">Learn more about Cal-ITP Benefits</a></strong><span "
 "class='period'>.</span>"
 
-#: benefits/eligibility/views.py:82
 msgid "eligibility.buttons.continue"
 msgstr "Continue"
 
-#: benefits/eligibility/views.py:86 benefits/enrollment/views.py:80
 msgctxt "image alt text"
 msgid "core.icons.idcardcheck"
 msgstr "Identification card icon with checkmark"
 
-#: benefits/eligibility/views.py:96
 msgid "eligibility.pages.start.mst_login.link_text"
 msgstr "Learn more about Login.gov and providing proof of identity"
 
-#: benefits/eligibility/views.py:101
 msgid "eligibility.pages.start.mst_login.required_items[0]"
 msgstr "Your state-issued ID card"
 
-#: benefits/eligibility/views.py:102
 msgid "eligibility.pages.start.mst_login.required_items[1]"
 msgstr "Your Social Security number"
 
-#: benefits/eligibility/views.py:103
 msgid "eligibility.pages.start.mst_login.required_items[2]"
 msgstr "A phone number with a phone plan associated with your name"
 
-#: benefits/eligibility/views.py:114 benefits/enrollment/views.py:150
 msgctxt "image alt text"
 msgid "core.icons.bankcardcheck"
 msgstr "Bank card icon with contactless symbol and checkmark"
 
-#: benefits/eligibility/views.py:115
 msgid "eligibility.pages.start.bankcard.title"
 msgstr "Your bank card details"
 
-#: benefits/eligibility/views.py:116
 msgid "eligibility.pages.start.bankcard.text"
 msgstr ""
 "Your card must be a contactless debit or credit card by Visa or Mastercard."
 
-#: benefits/eligibility/views.py:122
 msgid "eligibility.pages.start.title"
 msgstr "Get Started"
 
-#: benefits/eligibility/views.py:234
 msgctxt "image alt text"
 msgid "core.icons.idcardquestion"
 msgstr "Identification card icon with question mark"
 
-#: benefits/enrollment/templates/enrollment/success.html:14
 msgid "enrollment.pages.success.p1"
 msgstr "You were not charged anything today."
 
-#: benefits/enrollment/templates/enrollment/success.html:15
 msgid "enrollment.pages.success.p2"
 msgstr ""
 "When boarding transit, pay with this same physical card and your discount "
 "will automatically be applied to your fare purchase."
 
-#: benefits/enrollment/templates/enrollment/success.html:16
 #, python-format
 msgid "enrollment.pages.success.p3%(help_link)s"
 msgstr ""
@@ -639,70 +460,55 @@ msgstr ""
 "please reach out to your local transit provider or check out our <a href="
 "\"%(help_link)s\" rel=\"noopener noreferrer\">help page</a>."
 
-#: benefits/enrollment/templates/enrollment/success.html:23
 msgid "enrollment.pages.success.p3"
 msgstr "If you are on a public or shared computer, please sign out of your"
 
-#: benefits/enrollment/templates/enrollment/success.html:29
 msgid "enrollment.pages.success.p4"
 msgstr "account."
 
-#: benefits/enrollment/views.py:78
 msgid "enrollment.pages.index.title"
 msgstr "Connect Card"
 
-#: benefits/enrollment/views.py:79
 msgid "enrollment.pages.index.content_title"
 msgstr "Let’s link your card to your discount."
 
-#: benefits/enrollment/views.py:81
 msgid "enrollment.pages.index.p[0]"
 msgstr ""
 "Now that you are logged in we can link your transit discount to your card "
 "through our payment partner, Littlepay."
 
-#: benefits/enrollment/views.py:81
 msgid "enrollment.pages.index.p[1]"
 msgstr ""
 "We don’t store your information, and you won’t be charged. When you use this "
 "card to pay for transit, you will always receive your discount."
 
-#: benefits/enrollment/views.py:81
 msgid "enrollment.pages.index.p[2]"
 msgstr ""
 "Please use a bank-issued contactless Visa or Mastercard credit or debit card."
 
-#: benefits/enrollment/views.py:86
 msgid "enrollment.buttons.payment_partner"
 msgstr "Connect Your Card"
 
-#: benefits/enrollment/views.py:127 benefits/enrollment/views.py:129
 msgid "enrollment.pages.retry.title"
 msgstr "We couldn’t connect your bank card"
 
-#: benefits/enrollment/views.py:128
 msgctxt "image alt text"
 msgid "core.icons.bankcardquestion"
 msgstr "Bank card icon with contactless symbol and question mark"
 
-#: benefits/enrollment/views.py:130
 msgid "enrollment.pages.retry.p[0]"
 msgstr ""
 "You can try again or reach out to your transit provider for assistance."
 
-#: benefits/enrollment/views.py:133
 msgid "core.buttons.retry"
 msgstr "Try again"
 
-#: benefits/enrollment/views.py:153
 msgid "enrollment.pages.success.title"
 msgstr "Success"
 
-#: benefits/enrollment/views.py:154
 msgid "enrollment.pages.success.content_title"
 msgstr "Success! Your discount is now linked to your bank card."
 
-#: benefits/enrollment/views.py:164
 msgid "enrollment.pages.success.logout.title"
 msgstr ""
 "You have been successfully logged out. Thank you for using Cal-ITP Benefits!"
diff --git a/benefits/locale/es/LC_MESSAGES/django.po b/benefits/locale/es/LC_MESSAGES/django.po
index 3a77882a3..9c097197f 100644
--- a/benefits/locale/es/LC_MESSAGES/django.po
+++ b/benefits/locale/es/LC_MESSAGES/django.po
@@ -6,103 +6,63 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: https://github.com/cal-itp/benefits/issues \n"
-"POT-Creation-Date: 2022-09-28 20:50+0000\n"
+"POT-Creation-Date: 2022-09-28 23:05+0000\n"
 "Language: Español\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: benefits/core/migrations/0002_sample_data.py:86
 msgid "eligibility.buttons.signin"
 msgstr "Comencemos con"
 
-#: benefits/core/migrations/0002_sample_data.py:87
 msgid "eligibility.buttons.signout"
 msgstr "Cierre sesión de Login.gov"
 
-#: benefits/core/migrations/0002_sample_data.py:108
-msgid "eligibility.pages.index.sample.label"
-msgstr "TODO: I am 65 years of age or older"
+msgid "eligibility.pages.index.mst_login.label"
+msgstr "TODO: Senior Discount Program"
 
-#: benefits/core/migrations/0002_sample_data.py:109
-msgid "eligibility.pages.index.sample.description"
+msgid "eligibility.pages.index.mst_login.description"
 msgstr ""
 "TODO: You must be 65 years or older. This benefit does not expire, but you "
 "may need to renew. Using this benefit means your new transit fare is half of "
 "the standard fare."
 
-#: benefits/core/migrations/0002_sample_data.py:110
-msgid "eligibility.pages.start.sample.title"
+msgid "eligibility.pages.start.mst_login.headline"
 msgstr ""
 "Conecta tu tarjeta bancaria para tu descuento en el transporte público con "
 "Cal-ITP Benefits."
 
-#: benefits/core/migrations/0002_sample_data.py:111
-msgid "eligibility.pages.start.sample.content_title"
+msgid "eligibility.pages.start.mst_login.sub_headline"
 msgstr "Necesitará algunos artículos para conectar su descuento:"
 
-#: benefits/core/migrations/0002_sample_data.py:112
-msgid "eligibility.pages.start.sample.items[0].title"
-msgstr "Proporcione su número de identificación de California"
-
-#: benefits/core/migrations/0002_sample_data.py:113
-msgid "eligibility.pages.start.sample.items[0].text"
-msgstr ""
-"Deberá verificar su edad con una licencia de conducir o tarjeta de "
-"identificación."
+msgid "eligibility.pages.start.mst_login.items[0].title"
+msgstr "Una cuenta de Login.gov con verificación de identidad"
 
-#: benefits/core/migrations/0002_sample_data.py:114
-msgid "eligibility.pages.start.sample.p[0]"
+msgid "eligibility.pages.start.mst_login.items[0].text"
 msgstr ""
-"Este programa actualmente está disponible para personas de 65 años o más. "
-"¿No tienes más de 65 años? Póngase en contacto con su proveedor de "
-"transporte público para obtener información sobre los programas de descuento "
-"disponibles."
-
-#: benefits/core/migrations/0002_sample_data.py:115
-msgid "eligibility.pages.confirm.sample.title"
-msgstr "Confirmar la elegibilidad"
-
-#: benefits/core/migrations/0002_sample_data.py:116
-msgid "eligibility.pages.confirm.sample.content_title"
-msgstr "Veamos si podemos confirmar su edad con el sample server."
+"Login.gov es una forma segura de iniciar sesión en servicios "
+"gubernamentales. Benefits utiliza Login.gov para verificar su edad. Si aún "
+"no tiene una cuenta, podrá crear una. También deberá verificar su identidad, "
+"lo que requerirá estos artículos:"
 
-#: benefits/core/migrations/0002_sample_data.py:117
-msgid "eligibility.pages.confirm.sample.p[0]"
+msgid "eligibility.pages.start.mst_login.p[0]"
 msgstr ""
-"Por favor, ingrese su número de licencia/identificación y su apellido abajo. "
-"Si tiene 65 años o más, podemos confirmar que es eligible para un beneficio "
-"para personas mayores cuando viaja en transporte público. No guardamos la "
-"información que ingresa aquí."
-
-#: benefits/core/migrations/0002_sample_data.py:118
-msgid "eligibility.forms.confirm.sample.fields.sub"
-msgstr "Licencia de conducir de California o número de identificación"
 
-#: benefits/core/migrations/0002_sample_data.py:121
-msgid "eligibility.forms.confirm.sample.fields.name"
-msgstr "Apellido (tal como aparece en la identificación)"
-
-#: benefits/core/migrations/0002_sample_data.py:124
-msgid "eligibility.pages.unverified.sample.title"
+msgid "eligibility.pages.unverified.mst_login.title"
 msgstr "Error de elegibilidad"
 
-#: benefits/core/migrations/0002_sample_data.py:125
-msgid "eligibility.pages.unverified.sample.content_title"
+msgid "eligibility.pages.unverified.mst_login.content_title"
 msgstr "No se pudo verificar su elegibilidad."
 
-#: benefits/core/migrations/0002_sample_data.py:126
-msgid "eligibility.pages.unverified.sample.p[0]"
+msgid "eligibility.pages.unverified.mst_login.p[0]"
 msgstr ""
-"Usted todavía puede ser elegible para un descuento, pero no podemos "
-"verificar su edad con el sample."
+"¡Esta bien! Aún puede ser elegible para nuestro programa. Comuníquese con su "
+"proveedor de tránsito local para obtener asistencia."
 
-#: benefits/core/migrations/0002_sample_data.py:140
 msgid "eligibility.pages.index.mst_cc.label"
 msgstr "TODO: I have an MST Courtesy Card"
 
-#: benefits/core/migrations/0002_sample_data.py:141
 msgid "eligibility.pages.index.mst_cc.description"
 msgstr ""
 "TODO: This option is for people who have a current Courtesy Card (includes "
@@ -110,25 +70,20 @@ msgstr ""
 "tool and may need to be renewed in the future. Using this benefit means your "
 "new transit fare is half of the standard fare."
 
-#: benefits/core/migrations/0002_sample_data.py:142
 msgid "eligibility.pages.start.mst_cc.headline"
 msgstr ""
 "Conecta tu tarjeta bancaria para tu descuento en el transporte público con "
 "Cal-ITP Benefits."
 
-#: benefits/core/migrations/0002_sample_data.py:143
 msgid "eligibility.pages.start.mst_cc.sub_headline"
 msgstr "TODO: Genial, necesitarás dos cosas antes de empeza"
 
-#: benefits/core/migrations/0002_sample_data.py:144
 msgid "eligibility.pages.start.mst_cc.items[0].title"
 msgstr "Tu tarjeta de cortesía MST"
 
-#: benefits/core/migrations/0002_sample_data.py:145
 msgid "eligibility.pages.start.mst_cc.items[0].text"
 msgstr "Una tarjeta activa que no ha caducado"
 
-#: benefits/core/migrations/0002_sample_data.py:146
 msgid "eligibility.pages.start.mst_cc.p[0]"
 msgstr ""
 "Este programa está actualmente abierto a todas los titulares de tarjetas de "
@@ -136,101 +91,44 @@ msgstr ""
 "con su proveedor de transporte público para obtener información sobre los "
 "programas de descuento disponibles"
 
-#: benefits/core/migrations/0002_sample_data.py:147
 msgid "eligibility.pages.confirm.mst_cc.title"
 msgstr "Verificar su tarjeta de cortesía MST"
 
-#: benefits/core/migrations/0002_sample_data.py:148
 msgid "eligibility.pages.confirm.mst_cc.content_title"
 msgstr "Veamos si podemos encontrarle en nuestra sistema"
 
-#: benefits/core/migrations/0002_sample_data.py:149
 msgid "eligibility.pages.confirm.mst_cc.p[0]"
 msgstr ""
 "Por favor ingrese su número de tarjeta cortesía y apellido a continuación. "
 "Si eres titular de una tarjeta de cortesía MST, podemos confirmar que ere "
 "elegible para un descuento. Nosotros no guardamos su información."
 
-#: benefits/core/migrations/0002_sample_data.py:150
 msgid "eligibility.forms.confirm.mst_cc.fields.sub"
 msgstr "Número de tarjeta cortesía MST"
 
-#: benefits/core/migrations/0002_sample_data.py:151
 msgid "eligibility.forms.confirm.mst_cc.fields.sub.help_text"
 msgstr "TODO: This is a 5-digit number on the front and back of your card."
 
-#: benefits/core/migrations/0002_sample_data.py:154
 msgid "eligibility.forms.confirm.mst_cc.fields.name"
 msgstr "Apellido (como aparece en la identificación)"
 
-#: benefits/core/migrations/0002_sample_data.py:155
 msgid "eligibility.forms.confirm.mst_cc.fields.name.help_text"
 msgstr "TODO: We use this to help confirm your Courtesy Card."
 
-#: benefits/core/migrations/0002_sample_data.py:158
 msgid "eligibility.pages.unverified.mst_cc.title"
 msgstr "Tarjeta de cortesía MST no confirmada"
 
-#: benefits/core/migrations/0002_sample_data.py:159
 msgid "eligibility.pages.unverified.mst_cc.content_title"
 msgstr "No podemos confirmar su tarjeta de cortesía MST"
 
-#: benefits/core/migrations/0002_sample_data.py:160
 msgid "eligibility.pages.unverified.mst_cc.p[0]"
 msgstr ""
 "TODO: That’s okay! You may still be eligible for our program. Please reach "
 "out to Monterey-Salinas Transit for assistance."
 
-#: benefits/core/migrations/0002_sample_data.py:167
-msgid "eligibility.pages.index.mst_login.label"
-msgstr "TODO: Senior Discount Program"
-
-#: benefits/core/migrations/0002_sample_data.py:169
-msgid "eligibility.pages.start.mst_login.headline"
-msgstr ""
-"Conecta tu tarjeta bancaria para tu descuento en el transporte público con "
-"Cal-ITP Benefits."
-
-#: benefits/core/migrations/0002_sample_data.py:170
-msgid "eligibility.pages.start.mst_login.sub_headline"
-msgstr "Necesitará algunos artículos para conectar su descuento:"
-
-#: benefits/core/migrations/0002_sample_data.py:171
-msgid "eligibility.pages.start.mst_login.items[0].title"
-msgstr "Una cuenta de Login.gov con verificación de identidad"
-
-#: benefits/core/migrations/0002_sample_data.py:172
-msgid "eligibility.pages.start.mst_login.items[0].text"
-msgstr ""
-"Login.gov es una forma segura de iniciar sesión en servicios "
-"gubernamentales. Benefits utiliza Login.gov para verificar su edad. Si aún "
-"no tiene una cuenta, podrá crear una. También deberá verificar su identidad, "
-"lo que requerirá estos artículos:"
-
-#: benefits/core/migrations/0002_sample_data.py:173
-msgid "eligibility.pages.start.mst_login.p[0]"
-msgstr ""
-
-#: benefits/core/migrations/0002_sample_data.py:174
-msgid "eligibility.pages.unverified.mst_login.title"
-msgstr "Error de elegibilidad"
-
-#: benefits/core/migrations/0002_sample_data.py:175
-msgid "eligibility.pages.unverified.mst_login.content_title"
-msgstr "No se pudo verificar su elegibilidad."
-
-#: benefits/core/migrations/0002_sample_data.py:176
-msgid "eligibility.pages.unverified.mst_login.p[0]"
-msgstr ""
-"¡Esta bien! Aún puede ser elegible para nuestro programa. Comuníquese con su "
-"proveedor de tránsito local para obtener asistencia."
-
-#: benefits/core/templates/core/agency_index.html:10
 msgid "core.pages.agency_index.h2"
 msgstr "TODO: Your benefit applies every time you tap to ride."
 
-#: benefits/core/templates/core/base.html:10
-#: benefits/core/templates/core/help.html:12
 msgid "core.pages.help.about.p[0]"
 msgstr ""
 "La herramienta de Beneficios es proporcionada por California Integrated "
@@ -238,36 +136,28 @@ msgstr ""
 "un nuevo programa del Departamento de Transporte de California dedicado a "
 "hacer que los viajes sean más sencillos y económicos para todos."
 
-#: benefits/core/templates/core/base.html:44
 msgid "core.buttons.skip"
 msgstr "Saltar al contenido principal"
 
-#: benefits/core/templates/core/base.html:61
 msgctxt "image alt text"
 msgid "core.logos.small"
 msgstr ""
 "Proyecto de viaje integrado de California: logotipo de beneficios (pequeño)"
 
-#: benefits/core/templates/core/base.html:64
 msgctxt "image alt text"
 msgid "core.logos.large"
 msgstr ""
 "Proyecto de viaje integrado de California: logotipo de beneficios (grande)"
 
-#: benefits/core/templates/core/base.html:80 benefits/core/views.py:88
-#: benefits/core/views.py:89
 msgid "core.buttons.help"
 msgstr "Ayuda"
 
-#: benefits/core/templates/core/base.html:83
 msgid "core.buttons.privacy"
 msgstr "Póliza de Privacidad"
 
-#: benefits/core/templates/core/help.html:11
 msgid "core.pages.help.about"
 msgstr "¿Qué son los beneficios de Cal-ITP?"
 
-#: benefits/core/templates/core/help.html:13
 msgid "core.pages.help.about.p[1]"
 msgstr ""
 "Nos asociamos con Login.gov para confirmar la edad para los descuentos "
@@ -277,29 +167,24 @@ msgstr ""
 "de pago, Littlepay, para que cuando pague su viaje en transporte, obtenga su "
 "descuento automáticamente."
 
-#: benefits/core/templates/core/help.html:15
 msgid "core.pages.help.payment_options"
 msgstr "Opciones de pago"
 
-#: benefits/core/templates/core/help.html:16
 msgid "core.pages.help.payment_options.p[0]"
 msgstr ""
 "Para activar su descuento, necesita una tarjeta bancaria que tenga el "
 "símbolo de sin contacto. El símbolo sin contacto son cuatro líneas curvas "
 "que se ven así:"
 
-#: benefits/core/templates/core/help.html:21
 msgctxt "image alt text"
 msgid "core.icons.contactless"
 msgstr "Cuatro líneas curvas en las tarjetas habilitadas sin contacto"
 
-#: benefits/core/templates/core/help.html:24
 msgid "core.pages.help.payment_options.p[1]"
 msgstr ""
 "Una tarjeta bancaria sin contacto puede ser una tarjeta de crédito o de "
 "débito y debe incluir el logotipo de Visa o Mastercard."
 
-#: benefits/core/templates/core/help.html:26
 #, python-format
 msgid "core.pages.help.payment_options.p[2][0]%(website)s"
 msgstr ""
@@ -308,44 +193,37 @@ msgstr ""
 "contacto gratuitas, como la tarjeta de débito  <a href=\"%(website)s\" "
 "target=\"_blank\" rel=\"noopener noreferrer\">Cash App Visa</a> "
 
-#: benefits/core/templates/core/help.html:27
 #, python-format
 msgid "core.pages.help.payment_options.p[2][1]%(website)s"
 msgstr ""
 "o la tarjeta de débito <a href=\"%(website)s\" target=\"_blank\" rel="
 "\"noopener noreferrer\">Venmo Mastercard</a>."
 
-#: benefits/core/templates/core/help.html:29
 msgid "core.pages.help.payment_options.p[3]"
 msgstr ""
 "Todavía puede obtener su descuento mediante el proceso de solicitud de su "
 "proveedor de transporte local."
 
-#: benefits/core/templates/core/help.html:30
 msgid "core.pages.help.payment_options.p[4]"
 msgstr ""
 "Para obtener actualizaciones sobre opciones adicionales, vuelva a consultar "
 "este sitio web o comuníquese con su proveedor de transporte local."
 
-#: benefits/core/templates/core/help.html:32
 msgid "core.pages.help.login_gov"
 msgstr "¿Qué es Login.gov?"
 
-#: benefits/core/templates/core/help.html:33
 msgid "core.pages.help.login_gov.p[0]"
 msgstr ""
 "Login.gov es una forma segura de iniciar sesión en las agencias "
 "gubernamentales participantes. Puede utilizar su cuenta de Login.gov para "
 "acceder a todos los beneficios ofrecidos a través de Cal-ITP."
 
-#: benefits/core/templates/core/help.html:34
 msgid "core.pages.help.login_gov.p[1]"
 msgstr ""
 "Crear una cuenta es simple. Necesitará una dirección de correo electrónico y "
 "un método para autenticar su cuenta—que utilizará un teléfono fijo o un "
 "teléfono móvil o códigos de seguridad que deben imprimirse o anotarse."
 
-#: benefits/core/templates/core/help.html:35
 msgid "core.pages.help.login_gov.p[2]"
 msgstr ""
 "Para obtener más información sobre Login.gov, visite <a href='https://login."
@@ -353,11 +231,9 @@ msgstr ""
 "href='https://login.gov/es/help/' target=\"_blank\" rel=\"noopener noreferrer"
 "\">Login.gov: Centro de ayuda</a>."
 
-#: benefits/core/templates/core/help.html:37
 msgid "core.pages.help.login_gov_verify"
 msgstr "¿Cómo verifico mi identidad en Login.gov?"
 
-#: benefits/core/templates/core/help.html:38
 msgid "core.pages.help.login_gov_verify.p[0]"
 msgstr ""
 "​​Para verificar su identidad, Login.gov le pide que suba una fotografía de su "
@@ -366,21 +242,18 @@ msgstr ""
 "requisitos son adicionales para cumplir con los requisitos para la "
 "autentificación de dos factores."
 
-#: benefits/core/templates/core/help.html:39
 msgid "core.pages.help.login_gov_verify.p[1]"
 msgstr ""
 "No puede verificar su identidad en Login.gov sin una identificación emitida "
 "por el estado, que puede ser una licencia de conducir o una tarjeta de "
 "identificación emitida por el estado que no sea una licencia de conducir."
 
-#: benefits/core/templates/core/help.html:40
 msgid "core.pages.help.login_gov_verify.p[2]"
 msgstr ""
 "Si no tiene un plan telefónico que esté a su nombre, Login.gov puede "
 "enviarle el código de verificación por correo, lo que toma aproximadamente "
 "de 3 a 5 días."
 
-#: benefits/core/templates/core/help.html:41
 msgid "core.pages.help.login_gov_verify.p[3]"
 msgstr ""
 "Verificar su identidad asegura que la persona adecuada tenga acceso a la "
@@ -391,195 +264,151 @@ msgstr ""
 "identity/' target=\"_blank\" rel=\"noopener noreferrer\">Login.gov: Centro "
 "de ayuda</a>."
 
-#: benefits/core/templates/core/help.html:43
 msgid "core.pages.help.littlepay"
 msgstr "¿Qué es Littlepay?"
 
-#: benefits/core/templates/core/help.html:44
 msgid "core.pages.help.littlepay.p[0]"
 msgstr ""
 "Nuestro socio de pagos, Littlepay, es una plataforma de procesamiento de "
 "pagos segura e integral que nos permite adjuntar sin problemas su descuento "
 "de tránsito a su tarjeta bancaria."
 
-#: benefits/core/templates/core/help.html:46
 #, python-format
 msgid "core.pages.help.littlepay.p[1]%(website)s"
 msgstr ""
 "Para obtener más información sobre Littlepay, visite el sitio web de <a href="
 "\"%(website)s\" target=\"_blank\" rel=\"noopener noreferrer\">Littlepay</a>."
 
-#: benefits/core/templates/core/help.html:49
 msgid "core.pages.help.questions"
 msgstr "¿Preguntas?"
 
-#: benefits/core/templates/core/help.html:50
 msgid "core.pages.help.questions.p[0]"
 msgstr ""
 "Si necesita ayuda con este sitio web, póngase en contacto con el equipo de "
 "servicio al cliente de su proveedor de transito local."
 
-#: benefits/core/templates/core/help.html:57
 msgid "core.pages.help.foss.text"
 msgstr ""
 "Esta aplicación es un software libre y de código abierto. Puede obtener el "
 "código fuente de"
 
-#: benefits/core/templates/core/help.html:58
 msgid "core.pages.help.foss.link"
 msgstr "GitHub"
 
-#: benefits/core/templates/core/includes/nocookies.html:6
 msgid "core.includes.nocookies.brand"
 msgstr "Cookies están inactivos"
 
-#: benefits/core/templates/core/includes/nocookies.html:8
 msgid "core.includes.nocookies.text"
 msgstr ""
 "Para funcionar correctamente, este sitio web requiere un navegador que "
 "admita cookies. Por favor, active cookies por este sitio web y"
 
-#: benefits/core/templates/core/includes/nocookies.html:8
-#: benefits/core/templates/core/includes/noscript.html:8
-#: benefits/core/viewmodels.py:54
 msgid "core.buttons.return_home"
 msgstr "Regresar a la página principal"
 
-#: benefits/core/templates/core/includes/noscript.html:6
 msgid "core.includes.noscript.brand"
 msgstr "JavaScript está inactivo"
 
-#: benefits/core/templates/core/includes/noscript.html:8
 msgid "core.includes.noscript.text"
 msgstr ""
 "Para funcionar correctamente, este sitio web requiere un navegador que "
 "admita JavaScript. Por favor, active JavaScript por este sitio web y"
 
-#: benefits/core/viewmodels.py:120
 msgid "core.pages.index.prefix"
 msgstr "Beneficios del Tránsito"
 
-#: benefits/core/viewmodels.py:162 benefits/core/viewmodels.py:164
-#: benefits/eligibility/forms.py:74
 msgid "core.pages.error.title"
 msgstr "Error"
 
-#: benefits/core/viewmodels.py:163
 msgctxt "image alt text"
 msgid "core.icons.sadbus"
 msgstr "Icono de autobus con llanta ponchada"
 
-#: benefits/core/viewmodels.py:165
 msgid "core.pages.server_error.content_title"
 msgstr "¡Lo sentimos! El servicio para este sitio está caído."
 
-#: benefits/core/viewmodels.py:171
 msgid "core.pages.user_error.title"
 msgstr "TODO: Invalid state"
 
-#: benefits/core/viewmodels.py:172
 msgid "core.pages.user_error.content_title"
 msgstr "TODO: You may have reached this page on accident."
 
-#: benefits/core/viewmodels.py:173
 msgid "core.pages.user_error.p[0]"
 msgstr ""
 "TODO: To get started with Cal-ITP Benefits please click the button below, "
 "and you will be directed to the beginning of the enrollment process. "
 
-#: benefits/core/viewmodels.py:181 benefits/core/viewmodels.py:182
 msgid "core.pages.server_error.title"
 msgstr "¡Lo sentimos! El servicio no está funcionando"
 
-#: benefits/core/viewmodels.py:183
 msgid "core.pages.server_error.p[0]"
 msgstr ""
 "Deberíamos volver a funcionar pronto. Por favor, actualice la página en unos "
 "minutos."
 
-#: benefits/core/viewmodels.py:191
 msgid "core.pages.not_found.title"
 msgstr "No podemos encontrar esa página"
 
-#: benefits/core/viewmodels.py:192
 msgid "core.pages.not_found.content_title"
 msgstr "¡Lo sentimos! No podemos encontrar esa página."
 
-#: benefits/core/viewmodels.py:193
 msgid "core.pages.not_found.p[0]"
 msgstr ""
 "La página que estás buscando puede estar en otro lugar o puede que ya no "
 "exista."
 
-#: benefits/core/viewmodels.py:216
 msgid "core.buttons.wait"
 msgstr "Espere por favor..."
 
-#: benefits/core/views.py:37
 msgid "core.pages.index.chooseprovider"
 msgstr "Por favor, elija su proveedor de transporte:"
 
-#: benefits/core/views.py:40
 msgid "core.pages.index.title"
 msgstr "Elija proveedor"
 
-#: benefits/core/views.py:41
 msgid "core.pages.index.content_title"
 msgstr ""
 "Los beneficios de Cal-ITP facilita el uso de su descuento de transporte "
 "público cada vez que viaja."
 
-#: benefits/core/views.py:58
 msgid "core.pages.index.continue"
 msgstr "Comencemos"
 
-#: benefits/core/views.py:61
 msgid "core.pages.agency_index.title"
 msgstr "Introducción"
 
-#: benefits/core/views.py:62
 msgid "core.pages.agency_index.mst_cc.content_title"
 msgstr "TODO: Connect your MST Benefit to your Contactless Card"
 
-#: benefits/core/views.py:85
 msgid "core.buttons.back"
 msgstr "Regresar a la página principal"
 
-#: benefits/eligibility/forms.py:21
 msgid "eligibility.pages.index.label"
 msgstr "TODO: Select the option that best applies to you:"
 
-#: benefits/eligibility/forms.py:23
 msgid "eligibility.buttons.choose"
 msgstr "TODO: Choose this Benefit"
 
-#: benefits/eligibility/forms.py:41
 msgid "eligibility.forms.confirm.submit"
 msgstr "Verificando estado"
 
-#: benefits/eligibility/forms.py:42
 msgid "eligibility.forms.confirm.submitting"
 msgstr "Verificando"
 
-#: benefits/eligibility/forms.py:45
 msgid "eligibility.forms.confirm.errors.invalid"
 msgstr "Verifique su entrada. El formato parece incorrecto."
 
-#: benefits/eligibility/forms.py:46
 msgid "eligibility.forms.confirm.errors.missing"
 msgstr "Este campo es requerido."
 
-#: benefits/eligibility/views.py:42
 msgid "eligibility.pages.index.title"
 msgstr "TODO: Select a benefit option"
 
-#: benefits/eligibility/views.py:43
 msgid "eligibility.pages.index.content_title"
 msgstr ""
 "TODO: Connect your bank card to your public transit discount with Cal-ITP "
 "Benefits"
 
-#: benefits/eligibility/views.py:45
 #, python-format
 msgid "eligibility.pages.index.p[0]%(info_link)s"
 msgstr ""
@@ -590,143 +419,114 @@ msgstr ""
 "href=\"%(info_link)s\">Learn more about Cal-ITP Benefits</a></strong><span "
 "class='period'>.</span>"
 
-#: benefits/eligibility/views.py:82
 msgid "eligibility.buttons.continue"
 msgstr "Continuar"
 
-#: benefits/eligibility/views.py:86 benefits/enrollment/views.py:80
 msgctxt "image alt text"
 msgid "core.icons.idcardcheck"
 msgstr "Icono de tarjeta de identificación con marca de verificación"
 
-#: benefits/eligibility/views.py:96
 msgid "eligibility.pages.start.mst_login.link_text"
 msgstr ""
 "Conozca más sobre Login.gov y cómo proporcionar una prueba de identidad."
 
-#: benefits/eligibility/views.py:101
 msgid "eligibility.pages.start.mst_login.required_items[0]"
 msgstr "Su tarjeta de identificación emitida por el estado"
 
-#: benefits/eligibility/views.py:102
 msgid "eligibility.pages.start.mst_login.required_items[1]"
 msgstr "Su número de Seguro Social"
 
-#: benefits/eligibility/views.py:103
 msgid "eligibility.pages.start.mst_login.required_items[2]"
 msgstr "Un número de teléfono con un plan de teléfono asociado con su nombre"
 
-#: benefits/eligibility/views.py:114 benefits/enrollment/views.py:150
 msgctxt "image alt text"
 msgid "core.icons.bankcardcheck"
 msgstr ""
 "Icono de tarjeta bancaria con símbolo sin contacto y marca de verificación"
 
-#: benefits/eligibility/views.py:115
 msgid "eligibility.pages.start.bankcard.title"
 msgstr "Los datos de su tarjeta bancaria"
 
-#: benefits/eligibility/views.py:116
 msgid "eligibility.pages.start.bankcard.text"
 msgstr ""
 "Su tarjeta debe ser una tarjeta de débito o crédito sin contacto de Visa o "
 "Mastercard."
 
-#: benefits/eligibility/views.py:122
 msgid "eligibility.pages.start.title"
 msgstr "Comencemos"
 
-#: benefits/eligibility/views.py:234
 msgctxt "image alt text"
 msgid "core.icons.idcardquestion"
 msgstr "Icono de tarjeta de identificación con signo de interrogación"
 
-#: benefits/enrollment/templates/enrollment/success.html:14
 msgid "enrollment.pages.success.p1"
 msgstr "No se le ha cobrado nada hoy."
 
-#: benefits/enrollment/templates/enrollment/success.html:15
 msgid "enrollment.pages.success.p2"
 msgstr ""
 "Al abordar el tránsito, pague con esta misma tarjeta física y su descuento "
 "se aplicará automáticamente a su tarifa."
 
-#: benefits/enrollment/templates/enrollment/success.html:16
 #, python-format
 msgid "enrollment.pages.success.p3%(help_link)s"
 msgstr ""
 "Para más información, consulte nuestro <a href=\"%(help_link)s\" rel="
 "\"noopener noreferrer\">página de ayuda</a>."
 
-#: benefits/enrollment/templates/enrollment/success.html:23
 msgid "enrollment.pages.success.p3"
 msgstr ""
 "Si estás en una computadora pública o compartida, no olvides hacer clic aquí "
 "para cerrar la sesión de"
 
-#: benefits/enrollment/templates/enrollment/success.html:29
 msgid "enrollment.pages.success.p4"
 msgstr "."
 
-#: benefits/enrollment/views.py:78
 msgid "enrollment.pages.index.title"
 msgstr "Tarjeta de conexión"
 
-#: benefits/enrollment/views.py:79
 msgid "enrollment.pages.index.content_title"
 msgstr "Vamos a vincular su tarjeta con su descuento."
 
-#: benefits/enrollment/views.py:81
 msgid "enrollment.pages.index.p[0]"
 msgstr ""
 "Ahora que ha iniciado sesión, podemos vincular su descuento de tránsito a su "
 "tarjeta a través de nuestro socio de pagos, Littlepay."
 
-#: benefits/enrollment/views.py:81
 msgid "enrollment.pages.index.p[1]"
 msgstr ""
 "No almacenamos su información y no se le cobrará. Cuando utilice esta "
 "tarjeta para pagar el tránsito, siempre recibirá su descuento."
 
-#: benefits/enrollment/views.py:81
 msgid "enrollment.pages.index.p[2]"
 msgstr ""
 "Utilice una tarjeta de crédito o débito Visa o Mastercard sin contacto "
 "emitida por un banco."
 
-#: benefits/enrollment/views.py:86
 msgid "enrollment.buttons.payment_partner"
 msgstr "Conecta tu tarjeta"
 
-#: benefits/enrollment/views.py:127 benefits/enrollment/views.py:129
 msgid "enrollment.pages.retry.title"
 msgstr "No pudimos conectar tú tarjeta bancaria"
 
-#: benefits/enrollment/views.py:128
 msgctxt "image alt text"
 msgid "core.icons.bankcardquestion"
 msgstr ""
 "Icono de tarjeta bancaria con símbolo sin contacto y signo de interrogación"
 
-#: benefits/enrollment/views.py:130
 msgid "enrollment.pages.retry.p[0]"
 msgstr ""
 "Puede intentarlo de nuevo o comunicarse con su proveedor de transporte local "
 "para obtener ayuda."
 
-#: benefits/enrollment/views.py:133
 msgid "core.buttons.retry"
 msgstr "Intentar otra vez"
 
-#: benefits/enrollment/views.py:153
 msgid "enrollment.pages.success.title"
 msgstr "Cierre sesión"
 
-#: benefits/enrollment/views.py:154
 msgid "enrollment.pages.success.content_title"
 msgstr "¡Éxito! Su descuento está ahora vinculado a su tarjeta bancaria."
 
-#: benefits/enrollment/views.py:164
 msgid "enrollment.pages.success.logout.title"
 msgstr ""
 "Ha cerrado la sesión correctamente. ¡Gracias por usar los beneficios de Cal-"
diff --git a/bin/makemessages.sh b/bin/makemessages.sh
index 3b16e3f6f..48217e533 100755
--- a/bin/makemessages.sh
+++ b/bin/makemessages.sh
@@ -3,7 +3,7 @@ set -eu
 
 # generate initial .PO files from msgids in template and view files
 
-python manage.py makemessages -a --no-obsolete
+python manage.py makemessages -a --no-obsolete --no-location
 
 # put back bug-report link