diff --git a/app/src/Production/Java/com/rockthevote/grommet/Modules.java b/app/src/Production/Java/com/rockthevote/grommet/Modules.java
new file mode 100644
index 00000000..2c06a83e
--- /dev/null
+++ b/app/src/Production/Java/com/rockthevote/grommet/Modules.java
@@ -0,0 +1,13 @@
+package com.rockthevote.grommet;
+
+final class Modules {
+    static Object[] list(GrommetApp app) {
+        return new Object[]{
+                new GrommetModule(app)
+        };
+    }
+
+    private Modules() {
+        // No instances.
+    }
+}
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 990061fb..cbc9d921 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2,11 +2,7 @@
 <resources>
 
     <!--Main Activity Strings-->
-    <string name="label_total_registered">Total Registered</string>
     <string name="label_registered_event">Registered</string>
-    <string name="button_label_new_voter">New Voter</string>
-    <string name="event_details">Event Details</string>
-    <string name="error_partner_id">Invalid Partner ID</string>
     <string name="label_partner_name_spinner">Validating Partner ID</string>
 
     <!--Registration Activity Strings-->
@@ -55,7 +51,6 @@
     <string name="label_county">Condado donde vive</string>
     <string name="checkbox_mailing_address_is_different">Consigo mi correo desde una dirección diferente a la de arriba.</string>
     <string name="checkbox_address_changed">He cambiado mi dirección.</string>
-    <string name="label_send_copy_in_mail">I would like to receive a copy of my voter registration in the mail</string>
     <string name="checkbox_name_changed">He cambiado mi nombre.</string>
     <string name="label_receive_text">Estoy de acuerdo que puede llamar a %s y texto con actualizaciones importantes y recordatorios.</string>
     <string name="county_empty_error">Condado donde vive es obligatorio</string>
@@ -126,7 +121,6 @@ Al hacerlo:
     <string name="fragment_title_review">Revisar</string>
     <string name="voter_agreement_text">He revisado la información anterior, y es verdad y exacta a lo mejor de mi conocimiento.</string>
     <string name="title_activity_settings">La Configuración</string>
-    <string name="name_phrase_formatter">{title} {first_name} {middle_name} {last_name} {suffix}</string>
     <string name="section_label_contact_info">Información de Contacto</string>
     <string name="review_confirm_instructions">Por favor revise la siguiente información y confirmar su exactitud.</string>
     <string name="section_label_signature">Su Firma</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 069346ac..9019c6c1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,9 +13,9 @@
     <string name="nav_title_about" translatable="false">About</string>
     <string name="nav_title_data_usage" translatable="false">Data Usage</string>
     <string name="nav_title_help" translatable="false">Help</string>
-    <string name="incomplete_profile_alert">Some of your canvasser information is incomplete. You must enter your name, Partner ID, Event ID and Event Zip before registering voters</string>
-    <string name="dialog_no_thanks">No Thanks</string>
-    <string name="dialog_enter_info">Enter Info</string>
+    <string name="incomplete_profile_alert" translatable="false">Some of your canvasser information is incomplete. You must enter your name, Partner ID, Event ID and Event Zip before registering voters</string>
+    <string name="dialog_no_thanks" translatable="false">No Thanks</string>
+    <string name="dialog_enter_info" translatable="false">Enter Info</string>
 
     <!--Main Activity Strings-->
     <string name="label_total_registered" translatable="false">Total Registered</string>
@@ -65,7 +65,7 @@
     <string name="label_city">City</string>
     <string name="label_zip_code">Zip Code</string>
     <string name="label_state">State</string>
-    <string name="label_unit_num" translatable="false">Unit Type &amp; Number</string>
+    <string name="label_unit_num">Unit Type &amp; Number</string>
     <string name="label_county">County</string>
     <string name="checkbox_mailing_address_is_different"> I get my mail from a different address from the one above</string>
     <string name="checkbox_address_changed">I have changed my address</string>
@@ -231,8 +231,8 @@ Submitting an application containing false information may also subject a person
     <string name="pref_title_event_name" translatable="false">Event Name</string>
 
     <!--Multi use strings-->
-    <string name="action_cancel">Cancel</string>
-    <string name="action_save">Save</string>
+    <string name="action_cancel" translatable="false">Cancel</string>
+    <string name="action_save" translatable="false">Save</string>
     <string name="action_ok">OK</string>
     <string name="action_accept">Accept</string>
     <string name="action_decline">Decline</string>