diff --git a/src/apps/common/i18n/de-DE.json b/src/apps/common/i18n/de-DE.json
index 341428c56..833569f17 100644
--- a/src/apps/common/i18n/de-DE.json
+++ b/src/apps/common/i18n/de-DE.json
@@ -205,7 +205,6 @@
 		"postalCode": "PLZ",
 		"rotatedText": "Für Notdienste",
 		"state": "Bundesland/Kanton",
-		"country": "Country",
 		"successE911": "Sie haben die e911-Adresse von <br> {{phoneNumber}} erfolgreich aktualisiert",
 		"title": "E911-Adresse",
 		"verifyLocation": "Standort prüfen",
@@ -217,12 +216,6 @@
 			"youEntered": "Ihre Eingabe:",
 			"choicesAvailable": "Verfügbare Auswahl:",
 			"content": "Ihre Angaben passen zu mehreren Adressen. Vielleicht haben Sie keine Hausnummer angegeben oder das Haus besteht aus mehreren Gebäuden."
-		},
-		"countries": {
-			"us": {
-				"value": "US",
-				"option": "United States"
-			}
 		}
 	},
 
diff --git a/src/apps/common/i18n/en-US.json b/src/apps/common/i18n/en-US.json
index 265467844..ec716f669 100644
--- a/src/apps/common/i18n/en-US.json
+++ b/src/apps/common/i18n/en-US.json
@@ -724,7 +724,6 @@
 		"postalCode": "Zip Code",
 		"rotatedText": "For emergency services",
 		"state": "State",
-		"country": "Country",
 		"successE911": "You successfully updated the e911 information of <br> {{phoneNumber}}",
 		"title": "E911 Information",
 		"verifyLocation": "Verify Location",
@@ -736,12 +735,6 @@
 			"youEntered": "You entered:",
 			"choicesAvailable": "Choices available:",
 			"content": "Several addresses matched the information you provided. Perhaps you didn't enter a street number or the building has multiple units."
-		},
-		"countries": {
-			"us": {
-				"value": "US",
-				"option": "United States"
-			}
 		}
 	},
 
diff --git a/src/apps/common/i18n/fr-FR.json b/src/apps/common/i18n/fr-FR.json
index 462fa1e4a..f4d101f5b 100644
--- a/src/apps/common/i18n/fr-FR.json
+++ b/src/apps/common/i18n/fr-FR.json
@@ -128,7 +128,6 @@
 		"postalCode":"Code Postal",
 		"rotatedText":"Pour Services d'Urgences",
 		"state":"État",
-		"country": "Country",
 		"successE911":"Mise à jour de l'Adresse d'Urgence de <br> {{phoneNumber}} réussie",
 		"title":"Adresse d'Urgence",
 		"verifyLocation":"Vérifier Adresse",
@@ -138,12 +137,6 @@
 			"youEntered": "Vous avez entré:",
 			"choicesAvailable": "Choix disponibles:",
 			"content": "Plusieurs adresses correpondent à celle que vous avez entré. Peut-être que vous n'avez pas spécifié un numéro de rue ou le bâtiment à plusieurs appartements."
-		},
-		"countries": {
-			"us": {
-				"value": "US",
-				"option": "United States"
-			}
 		}
 	},
 	"failover":{
diff --git a/src/apps/common/i18n/nl-NL.json b/src/apps/common/i18n/nl-NL.json
index ab4730450..e93b8d9f8 100644
--- a/src/apps/common/i18n/nl-NL.json
+++ b/src/apps/common/i18n/nl-NL.json
@@ -107,16 +107,9 @@
 		"postalCode": "Postcode",
 		"rotatedText": "Voor alarmdiensten",
 		"state": "Provincie",
-		"country": "Country",
 		"successE911": "U werkte met succes het 112 alarmdienst adres bij voor {{phoneNumber}}",
 		"title": "112 Adres",
-		"verifyLocation": "Check de Locatie",
-		"countries": {
-			"us": {
-				"value": "US",
-				"option": "United States"
-			}
-		}
+		"verifyLocation": "Check de Locatie"
 	},
 
 	"failover": {
diff --git a/src/apps/common/i18n/ru-RU.json b/src/apps/common/i18n/ru-RU.json
index 3a8cb364a..620695ecb 100644
--- a/src/apps/common/i18n/ru-RU.json
+++ b/src/apps/common/i18n/ru-RU.json
@@ -105,16 +105,9 @@
 		"postalCode": "Почтовый индекс",
 		"rotatedText": "Для экстренных служб",
 		"state": "Регион",
-		"country": "Country",
 		"successE911": "Вы успешно обновили адрес вызова экстренных служб для номера {{phoneNumber}}",
 		"title": "Адрес для вызова экстренных служб",
-		"verifyLocation": "Проверьте адрес",
-		"countries": {
-			"us": {
-				"value": "US",
-				"option": "United States"
-			}
-		}
+		"verifyLocation": "Проверьте адрес"
 	},
 
 	"failover": {
diff --git a/src/apps/common/submodules/e911/e911.js b/src/apps/common/submodules/e911/e911.js
index 470d7b284..9309ed0e4 100644
--- a/src/apps/common/submodules/e911/e911.js
+++ b/src/apps/common/submodules/e911/e911.js
@@ -242,13 +242,6 @@ define(function(require) {
 		},
 
 		e911Normalize: function(data) {
-			var splitAddress = data.street_address.split(/\s/g);
-			data.caller_name = monster.apps.auth.currentAccount.name;
-			data.legacy_data = {
-				house_number: _.head(splitAddress)
-			};
-			data.street_address = splitAddress.slice(1).join(' ');
-
 			return _.merge({}, data, {
 				notification_contact_emails: _
 					.chain(data)
diff --git a/src/apps/common/submodules/e911/e911.scss b/src/apps/common/submodules/e911/e911.scss
index cb35a0598..938601170 100644
--- a/src/apps/common/submodules/e911/e911.scss
+++ b/src/apps/common/submodules/e911/e911.scss
@@ -60,11 +60,6 @@
 		width: 186px;
 		padding: 10px 5px;
 	}
-	
-	.control-group .controls select {
-		width: 197px;
-		height: 42px;
-	}
 
 	.control-group .controls button {
 		width: 200px;
diff --git a/src/apps/common/submodules/e911/views/dialog.html b/src/apps/common/submodules/e911/views/dialog.html
index 29bab548b..d75548400 100644
--- a/src/apps/common/submodules/e911/views/dialog.html
+++ b/src/apps/common/submodules/e911/views/dialog.html
@@ -18,7 +18,7 @@
 			<div class="control-group">
 				<label class="control-label" for="street_address">{{ i18n.e911.addressLine1 }}</label>
 				<div class="controls">
-					<input id="street_address" type="text" placeholder='{{ i18n.e911.addressLine1 }}' name="street_address" value="{{full_street_address}}" />
+					<input id="street_address" type="text" placeholder='{{ i18n.e911.addressLine1 }}' name="street_address" value="{{street_address}}" />
 				</div>
 			</div>
 			<div class="control-group">
@@ -39,16 +39,6 @@
 					<input id="region" type="text" name="region" placeholder='{{ i18n.e911.state }}' value="{{region}}" />
 				</div>
 			</div>
-			<div class="control-group">
-				<label class="control-label" for="country">{{ i18n.e911.country }}</label>
-				<div class="controls">
-					<select class="country-list" name="country">
-						<option value="{{ i18n.e911.countries.us.value }}" selected>
-							{{ i18n.e911.countries.us.option }}
-						</option>
-					</select>
-				</div>
-			</div>
 			{{#if status}}
 				<div class="control-group gmap_link_div" style="display: none;">
 					<div class="controls">