diff --git a/res/app/settings/language/language-service.js b/res/app/settings/language/language-service.js
index 6bb4f188..9a8b9d14 100644
--- a/res/app/settings/language/language-service.js
+++ b/res/app/settings/language/language-service.js
@@ -1,27 +1,18 @@
 var _ = require('lodash')
-
-// TODO: Implement this
 var supportedLanguages = require('./../../../common/lang/langs.json')
 
-
-module.exports = function LanguageServiceFactory(
-  SettingsService
-, $q
-, gettextCatalog
-) {
+module.exports = function (SettingsService, $q, gettextCatalog) {
   var LanguageService = {}
 
-  LanguageService.supportedLanguages = [
-    {code: 'en', name: 'English'},
-    {code: 'ja', name: '日本語'}
-  ]
+  LanguageService.supportedLanguages = supportedLanguages
 
   var browserLocale = navigator.language || navigator.userLanguage || 'en-US'
   var browserLanguage = browserLocale.substring(0, 2)
-  var detectedLanguage =
-    _.some(LanguageService.supportedLanguages, {code: browserLanguage}) ?
-      browserLanguage :
-      'en'
+  var isLanguageMatched = _.some(supportedLanguages, function (value, key) {
+    return key === browserLanguage
+  })
+  var detectedLanguage = isLanguageMatched ? browserLanguage : 'en'
+
   var defaultLanguage = 'ja'
   LanguageService.detectedLanguage = defaultLanguage
   LanguageService.selectedLanguage = null
diff --git a/res/app/settings/language/language.jade b/res/app/settings/language/language.jade
index 051531ea..94f544f4 100644
--- a/res/app/settings/language/language.jade
+++ b/res/app/settings/language/language.jade
@@ -5,4 +5,4 @@
   .widget-content.padded
     .form-horizontal
       .form-group
-        select.form-control(ng-model='language', ng-options='l.code as l.name for l in supportedLanguages')
+        select.form-control(ng-model='language', ng-options='key as value for (key, value) in supportedLanguages')
diff --git a/res/common/lang/langs.json b/res/common/lang/langs.json
index 80ec967f..34464ae9 100644
--- a/res/common/lang/langs.json
+++ b/res/common/lang/langs.json
@@ -1,5 +1,4 @@
 {
   "en": "English",
-  "es": "Espaniol",
   "ja": "日本語"
 }
\ No newline at end of file
diff --git a/res/common/lang/translations/stf.es.json b/res/common/lang/translations/stf.es.json
deleted file mode 100644
index 21efc3a2..00000000
--- a/res/common/lang/translations/stf.es.json
+++ /dev/null
@@ -1 +0,0 @@
-{"es":{"Carrier":"Correa","Clear":"","Control":"","Details":"","Device Port":"","Devices":"","Enable notifications":"","Example: 3000":"","Filter":"","Help":"ヘルプ","Language":"","Local Settings":"","Location":"","Model":"","Native":"","No devices connected":"","Notifications":"","OS":"","Product":"","Refresh":"","Release Date":"","Reset Settings":"","Saved to: {{savedTo}}":"","Screen":"","Settings":"","Shell":"","Start Using":"","Status":"","Stop Using":"","Target IP / Hostname":"","Target Port":"","Target host (detect if blank)":"","Use":"","User":"","Web":""}}
\ No newline at end of file