diff --git a/lang/ar_SA.php b/lang/ar_SA.php
deleted file mode 100644
index 4d1d3b8..0000000
--- a/lang/ar_SA.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * Arabic (Saudi Arabia) language pack
- * @package modules: multiform
- * @subpackage i18n
- */
-
-i18n::include_locale_file('modules: multiform', 'en_US');
-
-global $lang;
-
-if (array_key_exists('ar_SA', $lang) && is_array($lang['ar_SA'])) {
-    $lang['ar_SA'] = array_merge($lang['en_US'], $lang['ar_SA']);
-} else {
-    $lang['ar_SA'] = $lang['en_US'];
-}
-
-$lang['ar_SA']['MultiForm']['BACK'] = 'السابق';
-$lang['ar_SA']['MultiForm']['NEXT'] = 'التالي';
-$lang['ar_SA']['MultiForm']['SUBMIT'] = 'إرسال';
-$lang['ar_SA']['MultiFormSession']['db_Hash'] = 'Hash';
-$lang['ar_SA']['MultiFormSession']['db_IsComplete'] = 'مكتمل؟';
-$lang['ar_SA']['MultiFormSession']['has_many_FormSteps'] = 'خطوات النموذج';
-$lang['ar_SA']['MultiFormSession']['plural_name'] = '(لايوجد)';
-$lang['ar_SA']['MultiFormSession']['singular_name'] = '(لايوجد)';
-$lang['ar_SA']['MultiFormStep']['db_Data'] = 'بيانات';
-$lang['ar_SA']['MultiFormStep']['plural_name'] = '(لايوجد)';
-$lang['ar_SA']['MultiFormStep']['singular_name'] = '(لايوجد)';
diff --git a/lang/bg_BG.php b/lang/bg_BG.php
deleted file mode 100644
index f11b98c..0000000
--- a/lang/bg_BG.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * Bulgarian (Bulgaria) language pack
- * @package modules: multiform
- * @subpackage i18n
- */
-
-i18n::include_locale_file('modules: multiform', 'en_US');
-
-global $lang;
-
-if (array_key_exists('bg_BG', $lang) && is_array($lang['bg_BG'])) {
-    $lang['bg_BG'] = array_merge($lang['en_US'], $lang['bg_BG']);
-} else {
-    $lang['bg_BG'] = $lang['en_US'];
-}
-
-$lang['bg_BG']['MultiForm']['BACK'] = 'Назад';
-$lang['bg_BG']['MultiForm']['NEXT'] = 'Следващо';
-$lang['bg_BG']['MultiForm']['SUBMIT'] = 'Прати';
-$lang['bg_BG']['MultiFormSession']['plural_name'] = '(никакви)';
-$lang['bg_BG']['MultiFormSession']['singular_name'] = '(никакво)';
-$lang['bg_BG']['MultiFormStep']['plural_name'] = '(никакви)';
-$lang['bg_BG']['MultiFormStep']['singular_name'] = '(никакво)';
diff --git a/lang/bs_BA.php b/lang/bs_BA.php
deleted file mode 100644
index 1bb4b7a..0000000
--- a/lang/bs_BA.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * Bosnian (Bosnia and Herzegovina) language pack
- * @package modules: multiform
- * @subpackage i18n
- */
-
-i18n::include_locale_file('modules: multiform', 'en_US');
-
-global $lang;
-
-if (array_key_exists('bs_BA', $lang) && is_array($lang['bs_BA'])) {
-    $lang['bs_BA'] = array_merge($lang['en_US'], $lang['bs_BA']);
-} else {
-    $lang['bs_BA'] = $lang['en_US'];
-}
-
-$lang['bs_BA']['MultiFormSession']['db_Hash'] = 'Hash';
-$lang['bs_BA']['MultiFormSession']['db_IsComplete'] = 'JeZavršen';
-$lang['bs_BA']['MultiFormSession']['has_many_FormSteps'] = 'KoraciForme';
-$lang['bs_BA']['MultiFormSession']['plural_name'] = '(ništa)';
-$lang['bs_BA']['MultiFormSession']['singular_name'] = '(ništa)';
-$lang['bs_BA']['MultiFormStep']['db_Data'] = 'Podaci';
-$lang['bs_BA']['MultiFormStep']['plural_name'] = '(ništa)';
-$lang['bs_BA']['MultiFormStep']['singular_name'] = '(ništa)';
diff --git a/lang/cs_CZ.php b/lang/cs_CZ.php
deleted file mode 100644
index ebeafed..0000000
--- a/lang/cs_CZ.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * Czech (Czech Republic) language pack
- * @package modules: multiform
- * @subpackage i18n
- */
-
-i18n::include_locale_file('modules: multiform', 'en_US');
-
-global $lang;
-
-if (array_key_exists('cs_CZ', $lang) && is_array($lang['cs_CZ'])) {
-    $lang['cs_CZ'] = array_merge($lang['en_US'], $lang['cs_CZ']);
-} else {
-    $lang['cs_CZ'] = $lang['en_US'];
-}
-
-$lang['cs_CZ']['MultiForm']['BACK'] = 'Zpět';
-$lang['cs_CZ']['MultiForm']['NEXT'] = 'Další';
-$lang['cs_CZ']['MultiForm']['SUBMIT'] = 'Odeslat';
-$lang['cs_CZ']['MultiFormSession']['db_Hash'] = 'Hash';
-$lang['cs_CZ']['MultiFormSession']['db_IsComplete'] = 'JeKompletni';
-$lang['cs_CZ']['MultiFormSession']['has_many_FormSteps'] = 'FormularoveKroky';
-$lang['cs_CZ']['MultiFormSession']['plural_name'] = '(žádný)';
-$lang['cs_CZ']['MultiFormSession']['singular_name'] = '(žádný)';
-$lang['cs_CZ']['MultiFormStep']['db_Data'] = 'Data';
-$lang['cs_CZ']['MultiFormStep']['plural_name'] = '(žádný)';
-$lang['cs_CZ']['MultiFormStep']['singular_name'] = '(žádný)';
diff --git a/lang/da_DK.php b/lang/da_DK.php
deleted file mode 100644
index 4a3e435..0000000
--- a/lang/da_DK.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * Danish (Denmark) language pack
- * @package modules: multiform
- * @subpackage i18n
- */
-
-i18n::include_locale_file('modules: multiform', 'en_US');
-
-global $lang;
-
-if (array_key_exists('da_DK', $lang) && is_array($lang['da_DK'])) {
-    $lang['da_DK'] = array_merge($lang['en_US'], $lang['da_DK']);
-} else {
-    $lang['da_DK'] = $lang['en_US'];
-}
-
-$lang['da_DK']['MultiFormSession']['db_Hash'] = 'Havelåge';
-$lang['da_DK']['MultiFormSession']['db_IsComplete'] = 'IsComplete';
-$lang['da_DK']['MultiFormSession']['has_many_FormSteps'] = 'FormSteps';
-$lang['da_DK']['MultiFormSession']['plural_name'] = '(ingen)';
-$lang['da_DK']['MultiFormSession']['singular_name'] = '(ingen)';
-$lang['da_DK']['MultiFormStep']['db_Data'] = 'Data';
-$lang['da_DK']['MultiFormStep']['plural_name'] = '(ingen)';
-$lang['da_DK']['MultiFormStep']['singular_name'] = '(none)';
diff --git a/lang/de_DE.php b/lang/de_DE.php
deleted file mode 100644
index 8ad2e62..0000000
--- a/lang/de_DE.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * German (Germany) language pack
- * @package modules: multiform
- * @subpackage i18n
- */
-
-i18n::include_locale_file('modules: multiform', 'en_US');
-
-global $lang;
-
-if (array_key_exists('de_DE', $lang) && is_array($lang['de_DE'])) {
-    $lang['de_DE'] = array_merge($lang['en_US'], $lang['de_DE']);
-} else {
-    $lang['de_DE'] = $lang['en_US'];
-}
-
-$lang['de_DE']['MultiForm']['BACK'] = 'Zurück';
-$lang['de_DE']['MultiForm']['NEXT'] = 'Weiter';
-$lang['de_DE']['MultiForm']['SUBMIT'] = 'Absenden';
-$lang['de_DE']['MultiFormSession']['db_Hash'] = 'Hash';
-$lang['de_DE']['MultiFormSession']['db_IsComplete'] = 'Abgeschlossen?';
-$lang['de_DE']['MultiFormSession']['has_many_FormSteps'] = 'Formularschritte';
-$lang['de_DE']['MultiFormSession']['plural_name'] = 'Multi-Formulare';
-$lang['de_DE']['MultiFormSession']['singular_name'] = 'Multi-Formular';
-$lang['de_DE']['MultiFormStep']['db_Data'] = 'Daten';
-$lang['de_DE']['MultiFormStep']['plural_name'] = 'Multi-Formular-Schritte';
-$lang['de_DE']['MultiFormStep']['singular_name'] = 'Multi-Formular-Schritt';
diff --git a/lang/en_US.php b/lang/en_US.php
deleted file mode 100644
index 5cbbfb8..0000000
--- a/lang/en_US.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-global $lang;
-
-$lang['en_US']['MultiForm']['BACK'] = 'Back';
-$lang['en_US']['MultiForm']['NEXT'] = 'Next';
-$lang['en_US']['MultiForm']['SUBMIT'] = 'Submit';
-$lang['en_US']['MultiFormSession']['PLURALNAME'] = array(
-    'Multi Form Sessions',
-    50,
-    'Pural name of the object, used in dropdowns and to generally identify a collection of this object in the interface'
-);
-$lang['en_US']['MultiFormSession']['SINGULARNAME'] = array(
-    'Multi Form Session',
-    50,
-    'Singular name of the object, used in dropdowns and to generally identify a single object in the interface'
-);
-$lang['en_US']['MultiFormStep']['PLURALNAME'] = array(
-    'Multi Form Steps',
-    50,
-    'Pural name of the object, used in dropdowns and to generally identify a collection of this object in the interface'
-);
-$lang['en_US']['MultiFormStep']['SINGULARNAME'] = array(
-    'Multi Form Step',
-    50,
-    'Singular name of the object, used in dropdowns and to generally identify a single object in the interface'
-);
diff --git a/lang/eo_XX.php b/lang/eo_XX.php
deleted file mode 100644
index 3fd7083..0000000
--- a/lang/eo_XX.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * Esperanto language pack
- * @package modules: multiform
- * @subpackage i18n
- */
-
-i18n::include_locale_file('modules: multiform', 'en_US');
-
-global $lang;
-
-if (array_key_exists('eo_XX', $lang) && is_array($lang['eo_XX'])) {
-    $lang['eo_XX'] = array_merge($lang['en_US'], $lang['eo_XX']);
-} else {
-    $lang['eo_XX'] = $lang['en_US'];
-}
-
-$lang['eo_XX']['MultiForm']['BACK'] = 'Retro';
-$lang['eo_XX']['MultiForm']['NEXT'] = 'Sekva';
-$lang['eo_XX']['MultiForm']['SUBMIT'] = 'Transsendi';
-$lang['eo_XX']['MultiFormSession']['db_Hash'] = 'Haketo';
-$lang['eo_XX']['MultiFormSession']['db_IsComplete'] = 'IsComplete';
-$lang['eo_XX']['MultiFormSession']['has_many_FormSteps'] = 'FormSteps';
-$lang['eo_XX']['MultiFormSession']['plural_name'] = '(neniu)';
-$lang['eo_XX']['MultiFormSession']['singular_name'] = '(neniu)';
-$lang['eo_XX']['MultiFormStep']['db_Data'] = 'Datumoj';
-$lang['eo_XX']['MultiFormStep']['plural_name'] = '(neniu)';
-$lang['eo_XX']['MultiFormStep']['singular_name'] = '(neniu)';
diff --git a/lang/es_419.php b/lang/es_419.php
deleted file mode 100644
index 7a49f61..0000000
--- a/lang/es_419.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- *  language pack
- * @package modules: multiform
- * @subpackage i18n
- */
-
-i18n::include_locale_file('modules: multiform', 'en_US');
-
-global $lang;
-
-if (array_key_exists('es_', $lang) && is_array($lang['es_'])) {
-    $lang['es_'] = array_merge($lang['en_US'], $lang['es_']);
-} else {
-    $lang['es_'] = $lang['en_US'];
-}
diff --git a/lang/es_AR.php b/lang/es_AR.php
deleted file mode 100644
index 6bc9c5e..0000000
--- a/lang/es_AR.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * Spanish (Argentina) language pack
- * @package modules: multiform
- * @subpackage i18n
- */
-
-i18n::include_locale_file('modules: multiform', 'en_US');
-
-global $lang;
-
-if (array_key_exists('es_AR', $lang) && is_array($lang['es_AR'])) {
-    $lang['es_AR'] = array_merge($lang['en_US'], $lang['es_AR']);
-} else {
-    $lang['es_AR'] = $lang['en_US'];
-}
-
-$lang['es_AR']['MultiForm']['BACK'] = 'Volver';
-$lang['es_AR']['MultiForm']['NEXT'] = 'Siguiente';
-$lang['es_AR']['MultiForm']['SUBMIT'] = 'Enviar';
-$lang['es_AR']['MultiFormSession']['db_Hash'] = 'Hash';
-$lang['es_AR']['MultiFormSession']['db_IsComplete'] = 'IsComplete';
-$lang['es_AR']['MultiFormSession']['has_many_FormSteps'] = 'FormSteps';
-$lang['es_AR']['MultiFormSession']['plural_name'] = '(ninguno)';
-$lang['es_AR']['MultiFormSession']['singular_name'] = '(ninguno)';
-$lang['es_AR']['MultiFormStep']['db_Data'] = 'Datos';
-$lang['es_AR']['MultiFormStep']['plural_name'] = '(ninguno)';
-$lang['es_AR']['MultiFormStep']['singular_name'] = '(ninguno)';
diff --git a/lang/es_MX.php b/lang/es_MX.php
deleted file mode 100644
index f790cbc..0000000
--- a/lang/es_MX.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * Spanish (Mexico) language pack
- * @package modules: multiform
- * @subpackage i18n
- */
-
-i18n::include_locale_file('modules: multiform', 'en_US');
-
-global $lang;
-
-if (array_key_exists('es_MX', $lang) && is_array($lang['es_MX'])) {
-    $lang['es_MX'] = array_merge($lang['en_US'], $lang['es_MX']);
-} else {
-    $lang['es_MX'] = $lang['en_US'];
-}
-
-$lang['es_MX']['MultiForm']['BACK'] = 'Atrás';
-$lang['es_MX']['MultiForm']['NEXT'] = 'Siguiente';
-$lang['es_MX']['MultiForm']['SUBMIT'] = 'Envíar';
-$lang['es_MX']['MultiFormSession']['db_Hash'] = 'Desclose';
-$lang['es_MX']['MultiFormSession']['db_IsComplete'] = 'Concluido';
-$lang['es_MX']['MultiFormSession']['has_many_FormSteps'] = 'Formularios';
-$lang['es_MX']['MultiFormSession']['plural_name'] = '(ningunos)';
-$lang['es_MX']['MultiFormSession']['singular_name'] = '(ningún)';
-$lang['es_MX']['MultiFormStep']['db_Data'] = 'Datos';
-$lang['es_MX']['MultiFormStep']['plural_name'] = '(ningunos)';
-$lang['es_MX']['MultiFormStep']['singular_name'] = '(ningún)';
diff --git a/lang/et_EE.php b/lang/et_EE.php
deleted file mode 100644
index 7f836c6..0000000
--- a/lang/et_EE.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * Estonian (Estonia) language pack
- * @package modules: multiform
- * @subpackage i18n
- */
-
-i18n::include_locale_file('modules: multiform', 'en_US');
-
-global $lang;
-
-if (array_key_exists('et_EE', $lang) && is_array($lang['et_EE'])) {
-    $lang['et_EE'] = array_merge($lang['en_US'], $lang['et_EE']);
-} else {
-    $lang['et_EE'] = $lang['en_US'];
-}
-
-$lang['et_EE']['MultiForm']['BACK'] = 'Tagasi';
-$lang['et_EE']['MultiForm']['NEXT'] = 'Järgmine';
-$lang['et_EE']['MultiForm']['SUBMIT'] = 'Saada';
-$lang['et_EE']['MultiFormSession']['db_Hash'] = 'Hash';
-$lang['et_EE']['MultiFormSession']['db_IsComplete'] = 'IsComplete';
-$lang['et_EE']['MultiFormSession']['has_many_FormSteps'] = 'FormSteps';
-$lang['et_EE']['MultiFormSession']['plural_name'] = '(none)';
-$lang['et_EE']['MultiFormSession']['singular_name'] = '(none)';
-$lang['et_EE']['MultiFormStep']['db_Data'] = 'Andmed';
-$lang['et_EE']['MultiFormStep']['plural_name'] = '(none)';
-$lang['et_EE']['MultiFormStep']['singular_name'] = '(none)';
diff --git a/lang/fr_FR.php b/lang/fr_FR.php
deleted file mode 100644
index 0486d56..0000000
--- a/lang/fr_FR.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * French (France) language pack
- * @package modules: multiform
- * @subpackage i18n
- */
-
-i18n::include_locale_file('modules: multiform', 'en_US');
-
-global $lang;
-
-if (array_key_exists('fr_FR', $lang) && is_array($lang['fr_FR'])) {
-    $lang['fr_FR'] = array_merge($lang['en_US'], $lang['fr_FR']);
-} else {
-    $lang['fr_FR'] = $lang['en_US'];
-}
-
-$lang['fr_FR']['MultiForm']['BACK'] = 'Retour';
-$lang['fr_FR']['MultiForm']['NEXT'] = 'Suivant';
-$lang['fr_FR']['MultiForm']['SUBMIT'] = 'Envoyez';
-$lang['fr_FR']['MultiFormSession']['db_Hash'] = 'Hash';
-$lang['fr_FR']['MultiFormSession']['db_IsComplete'] = 'IsComplete';
-$lang['fr_FR']['MultiFormSession']['has_many_FormSteps'] = 'Formulaire multi-étapes';
-$lang['fr_FR']['MultiFormSession']['plural_name'] = '(aucun)';
-$lang['fr_FR']['MultiFormSession']['singular_name'] = '(aucun)';
-$lang['fr_FR']['MultiFormStep']['db_Data'] = 'Data';
-$lang['fr_FR']['MultiFormStep']['plural_name'] = '(aucun)';
-$lang['fr_FR']['MultiFormStep']['singular_name'] = '(aucun)';
diff --git a/lang/id_ID.php b/lang/id_ID.php
deleted file mode 100644
index f784d53..0000000
--- a/lang/id_ID.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * Indonesian (Indonesia) language pack
- * @package modules: multiform
- * @subpackage i18n
- */
-
-i18n::include_locale_file('modules: multiform', 'en_US');
-
-global $lang;
-
-if (array_key_exists('id_ID', $lang) && is_array($lang['id_ID'])) {
-    $lang['id_ID'] = array_merge($lang['en_US'], $lang['id_ID']);
-} else {
-    $lang['id_ID'] = $lang['en_US'];
-}
-
-$lang['id_ID']['MultiForm']['BACK'] = 'Kembali';
-$lang['id_ID']['MultiForm']['NEXT'] = 'Berikutnya';
-$lang['id_ID']['MultiForm']['SUBMIT'] = 'Kirim';
-$lang['id_ID']['MultiFormSession']['db_Hash'] = 'Tanda Pagar';
-$lang['id_ID']['MultiFormSession']['db_IsComplete'] = 'TelahSelesai';
-$lang['id_ID']['MultiFormSession']['plural_name'] = '(tidak ada)';
-$lang['id_ID']['MultiFormSession']['singular_name'] = '(tidak ada)';
-$lang['id_ID']['MultiFormStep']['db_Data'] = 'Data';
-$lang['id_ID']['MultiFormStep']['plural_name'] = '(tidak ada)';
-$lang['id_ID']['MultiFormStep']['singular_name'] = '(tidak ada)';
diff --git a/lang/is_IS.php b/lang/is_IS.php
deleted file mode 100644
index 63f80d4..0000000
--- a/lang/is_IS.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * Icelandic (Iceland) language pack
- * @package modules: multiform
- * @subpackage i18n
- */
-
-i18n::include_locale_file('modules: multiform', 'en_US');
-
-global $lang;
-
-if (array_key_exists('is_IS', $lang) && is_array($lang['is_IS'])) {
-    $lang['is_IS'] = array_merge($lang['en_US'], $lang['is_IS']);
-} else {
-    $lang['is_IS'] = $lang['en_US'];
-}
-
-$lang['is_IS']['MultiFormSession']['plural_name'] = '(ekkert)';
-$lang['is_IS']['MultiFormSession']['singular_name'] = '(ekkert)';
-$lang['is_IS']['MultiFormStep']['db_Data'] = 'Gögn';
-$lang['is_IS']['MultiFormStep']['plural_name'] = '(ekkert)';
-$lang['is_IS']['MultiFormStep']['singular_name'] = '(ekkert)';
diff --git a/lang/it_IT.php b/lang/it_IT.php
deleted file mode 100644
index f658361..0000000
--- a/lang/it_IT.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * Italian (Italy) language pack
- * @package modules: multiform
- * @subpackage i18n
- */
-
-i18n::include_locale_file('modules: multiform', 'en_US');
-
-global $lang;
-
-if (array_key_exists('it_IT', $lang) && is_array($lang['it_IT'])) {
-    $lang['it_IT'] = array_merge($lang['en_US'], $lang['it_IT']);
-} else {
-    $lang['it_IT'] = $lang['en_US'];
-}
-
-$lang['it_IT']['MultiForm']['BACK'] = 'Indietro';
-$lang['it_IT']['MultiForm']['NEXT'] = 'Successivo';
-$lang['it_IT']['MultiForm']['SUBMIT'] = 'Invia';
-$lang['it_IT']['MultiFormSession']['db_Hash'] = 'Hash';
-$lang['it_IT']['MultiFormSession']['db_IsComplete'] = 'IsComplete';
-$lang['it_IT']['MultiFormSession']['has_many_FormSteps'] = 'FormSteps';
-$lang['it_IT']['MultiFormSession']['plural_name'] = '(nessuno)';
-$lang['it_IT']['MultiFormSession']['singular_name'] = '(nessuno)';
-$lang['it_IT']['MultiFormStep']['db_Data'] = 'Dati';
-$lang['it_IT']['MultiFormStep']['plural_name'] = '(nessuno)';
-$lang['it_IT']['MultiFormStep']['singular_name'] = '(nessuno)';
diff --git a/lang/ja_JP.php b/lang/ja_JP.php
deleted file mode 100644
index 1ee4235..0000000
--- a/lang/ja_JP.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * Japanese (Japan) language pack
- * @package modules: multiform
- * @subpackage i18n
- */
-
-i18n::include_locale_file('modules: multiform', 'en_US');
-
-global $lang;
-
-if (array_key_exists('ja_JP', $lang) && is_array($lang['ja_JP'])) {
-    $lang['ja_JP'] = array_merge($lang['en_US'], $lang['ja_JP']);
-} else {
-    $lang['ja_JP'] = $lang['en_US'];
-}
-
-$lang['ja_JP']['MultiForm']['BACK'] = '戻る';
-$lang['ja_JP']['MultiForm']['NEXT'] = '次へ';
-$lang['ja_JP']['MultiForm']['SUBMIT'] = '送信';
-$lang['ja_JP']['MultiFormSession']['db_Hash'] = 'ハッシュ';
-$lang['ja_JP']['MultiFormStep']['db_Data'] = 'データ';
diff --git a/lang/ms_MY.php b/lang/ms_MY.php
deleted file mode 100644
index b46c4dd..0000000
--- a/lang/ms_MY.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * Malay (Malaysia) language pack
- * @package modules: multiform
- * @subpackage i18n
- */
-
-i18n::include_locale_file('modules: multiform', 'en_US');
-
-global $lang;
-
-if (array_key_exists('ms_MY', $lang) && is_array($lang['ms_MY'])) {
-    $lang['ms_MY'] = array_merge($lang['en_US'], $lang['ms_MY']);
-} else {
-    $lang['ms_MY'] = $lang['en_US'];
-}
-
-$lang['ms_MY']['MultiFormSession']['db_Hash'] = 'Cincangan';
-$lang['ms_MY']['MultiFormSession']['db_IsComplete'] = 'TelahLengkap';
-$lang['ms_MY']['MultiFormSession']['has_many_FormSteps'] = 'JejakLangkahBorang';
-$lang['ms_MY']['MultiFormSession']['plural_name'] = '(tiada)';
-$lang['ms_MY']['MultiFormSession']['singular_name'] = '(tiada)';
-$lang['ms_MY']['MultiFormStep']['db_Data'] = 'Data';
-$lang['ms_MY']['MultiFormStep']['plural_name'] = '(tiada)';
-$lang['ms_MY']['MultiFormStep']['singular_name'] = '(tiada)';
diff --git a/lang/nb_NO.php b/lang/nb_NO.php
deleted file mode 100644
index 40ab72e..0000000
--- a/lang/nb_NO.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * Norwegian Bokmal (Norway) language pack
- * @package modules: multiform
- * @subpackage i18n
- */
-
-i18n::include_locale_file('modules: multiform', 'en_US');
-
-global $lang;
-
-if (array_key_exists('nb_NO', $lang) && is_array($lang['nb_NO'])) {
-    $lang['nb_NO'] = array_merge($lang['en_US'], $lang['nb_NO']);
-} else {
-    $lang['nb_NO'] = $lang['en_US'];
-}
-
-$lang['nb_NO']['MultiForm']['BACK'] = 'Forrige';
-$lang['nb_NO']['MultiForm']['NEXT'] = 'Neste';
-$lang['nb_NO']['MultiForm']['SUBMIT'] = 'Send';
-$lang['nb_NO']['MultiFormSession']['db_Hash'] = 'Hash';
-$lang['nb_NO']['MultiFormSession']['db_IsComplete'] = 'ErFullflørt';
-$lang['nb_NO']['MultiFormSession']['has_many_FormSteps'] = 'SkjemaSteg';
-$lang['nb_NO']['MultiFormSession']['plural_name'] = '(ingen)';
-$lang['nb_NO']['MultiFormSession']['singular_name'] = '(ingen)';
-$lang['nb_NO']['MultiFormStep']['db_Data'] = 'Data';
-$lang['nb_NO']['MultiFormStep']['plural_name'] = '(ingen)';
-$lang['nb_NO']['MultiFormStep']['singular_name'] = '(ingen)';
diff --git a/lang/nl_NL.php b/lang/nl_NL.php
deleted file mode 100644
index 3b6cf87..0000000
--- a/lang/nl_NL.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * Dutch (Netherlands) language pack
- * @package modules: multiform
- * @subpackage i18n
- */
-
-i18n::include_locale_file('modules: multiform', 'en_US');
-
-global $lang;
-
-if (array_key_exists('nl_NL', $lang) && is_array($lang['nl_NL'])) {
-    $lang['nl_NL'] = array_merge($lang['en_US'], $lang['nl_NL']);
-} else {
-    $lang['nl_NL'] = $lang['en_US'];
-}
-
-$lang['nl_NL']['MultiForm']['BACK'] = 'Terug';
-$lang['nl_NL']['MultiForm']['NEXT'] = 'Volgende';
-$lang['nl_NL']['MultiForm']['SUBMIT'] = 'Versturen';
-$lang['nl_NL']['MultiFormSession']['db_Hash'] = 'Hash';
-$lang['nl_NL']['MultiFormSession']['db_IsComplete'] = 'IsCompleet';
-$lang['nl_NL']['MultiFormSession']['has_many_FormSteps'] = 'FormulierStappen';
-$lang['nl_NL']['MultiFormSession']['plural_name'] = '(geen)';
-$lang['nl_NL']['MultiFormSession']['singular_name'] = '(geen)';
-$lang['nl_NL']['MultiFormStep']['db_Data'] = 'Data';
-$lang['nl_NL']['MultiFormStep']['plural_name'] = '(geen)';
-$lang['nl_NL']['MultiFormStep']['singular_name'] = '(geen)';
diff --git a/lang/pl_PL.php b/lang/pl_PL.php
deleted file mode 100644
index 06b90a6..0000000
--- a/lang/pl_PL.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * Polish (Poland) language pack
- * @package modules: multiform
- * @subpackage i18n
- */
-
-i18n::include_locale_file('modules: multiform', 'en_US');
-
-global $lang;
-
-if (array_key_exists('pl_PL', $lang) && is_array($lang['pl_PL'])) {
-    $lang['pl_PL'] = array_merge($lang['en_US'], $lang['pl_PL']);
-} else {
-    $lang['pl_PL'] = $lang['en_US'];
-}
-
-$lang['pl_PL']['MultiForm']['BACK'] = 'Wstecz';
-$lang['pl_PL']['MultiForm']['NEXT'] = 'Dalej';
-$lang['pl_PL']['MultiForm']['SUBMIT'] = 'Wyślij';
-$lang['pl_PL']['MultiFormSession']['db_Hash'] = 'Hash';
-$lang['pl_PL']['MultiFormSession']['db_IsComplete'] = 'CzyGotowe';
-$lang['pl_PL']['MultiFormSession']['has_many_FormSteps'] = 'KrokiFormularza';
-$lang['pl_PL']['MultiFormSession']['plural_name'] = '(brak)';
-$lang['pl_PL']['MultiFormSession']['singular_name'] = '(brak)';
-$lang['pl_PL']['MultiFormStep']['db_Data'] = 'Dane';
-$lang['pl_PL']['MultiFormStep']['plural_name'] = '(brak)';
-$lang['pl_PL']['MultiFormStep']['singular_name'] = '(brak)';
diff --git a/lang/pt_PT.php b/lang/pt_PT.php
deleted file mode 100644
index dc4aa7d..0000000
--- a/lang/pt_PT.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * Portuguese (Portugal) language pack
- * @package modules: multiform
- * @subpackage i18n
- */
-
-i18n::include_locale_file('modules: multiform', 'en_US');
-
-global $lang;
-
-if (array_key_exists('pt_PT', $lang) && is_array($lang['pt_PT'])) {
-    $lang['pt_PT'] = array_merge($lang['en_US'], $lang['pt_PT']);
-} else {
-    $lang['pt_PT'] = $lang['en_US'];
-}
-
-$lang['pt_PT']['MultiFormSession']['db_IsComplete'] = 'Está completa';
-$lang['pt_PT']['MultiFormSession']['has_many_FormSteps'] = 'Passos do formulário';
-$lang['pt_PT']['MultiFormSession']['plural_name'] = '(nenhum)';
-$lang['pt_PT']['MultiFormSession']['singular_name'] = '(nenhum)';
-$lang['pt_PT']['MultiFormStep']['db_Data'] = 'Dados';
-$lang['pt_PT']['MultiFormStep']['plural_name'] = '(nenhum)';
-$lang['pt_PT']['MultiFormStep']['singular_name'] = '(nenhum)';
diff --git a/lang/sr_RS.php b/lang/sr_RS.php
deleted file mode 100644
index 991ed0d..0000000
--- a/lang/sr_RS.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * Serbian (Serbia) language pack
- * @package modules: multiform
- * @subpackage i18n
- */
-
-i18n::include_locale_file('modules: multiform', 'en_US');
-
-global $lang;
-
-if (array_key_exists('sr_RS', $lang) && is_array($lang['sr_RS'])) {
-    $lang['sr_RS'] = array_merge($lang['en_US'], $lang['sr_RS']);
-} else {
-    $lang['sr_RS'] = $lang['en_US'];
-}
-
-$lang['sr_RS']['MultiFormSession']['db_IsComplete'] = 'ЈеЗавршен';
-$lang['sr_RS']['MultiFormSession']['plural_name'] = '(без)';
-$lang['sr_RS']['MultiFormSession']['singular_name'] = '(без)';
-$lang['sr_RS']['MultiFormStep']['db_Data'] = 'Подаци';
-$lang['sr_RS']['MultiFormStep']['plural_name'] = '(без)';
-$lang['sr_RS']['MultiFormStep']['singular_name'] = '(без)';
diff --git a/lang/sv_SE.php b/lang/sv_SE.php
deleted file mode 100644
index f51b787..0000000
--- a/lang/sv_SE.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * Swedish (Sweden) language pack
- * @package modules: multiform
- * @subpackage i18n
- */
-
-i18n::include_locale_file('modules: multiform', 'en_US');
-
-global $lang;
-
-if (array_key_exists('sv_SE', $lang) && is_array($lang['sv_SE'])) {
-    $lang['sv_SE'] = array_merge($lang['en_US'], $lang['sv_SE']);
-} else {
-    $lang['sv_SE'] = $lang['en_US'];
-}
-
-$lang['sv_SE']['MultiForm']['BACK'] = 'Tillbaka';
-$lang['sv_SE']['MultiForm']['NEXT'] = 'Nästa';
-$lang['sv_SE']['MultiForm']['SUBMIT'] = 'Skicka';
-$lang['sv_SE']['MultiFormSession']['db_Hash'] = 'Hash';
-$lang['sv_SE']['MultiFormSession']['plural_name'] = '(ingen)';
-$lang['sv_SE']['MultiFormStep']['db_Data'] = 'Data';
-$lang['sv_SE']['MultiFormStep']['plural_name'] = '(inga)';
-$lang['sv_SE']['MultiFormStep']['singular_name'] = '(ingen)';
diff --git a/lang/tr_TR.php b/lang/tr_TR.php
deleted file mode 100644
index e998f87..0000000
--- a/lang/tr_TR.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * Turkish (Turkey) language pack
- * @package modules: multiform
- * @subpackage i18n
- */
-
-i18n::include_locale_file('modules: multiform', 'en_US');
-
-global $lang;
-
-if (array_key_exists('tr_TR', $lang) && is_array($lang['tr_TR'])) {
-    $lang['tr_TR'] = array_merge($lang['en_US'], $lang['tr_TR']);
-} else {
-    $lang['tr_TR'] = $lang['en_US'];
-}
-
-$lang['tr_TR']['MultiForm']['BACK'] = 'Geri';
-$lang['tr_TR']['MultiForm']['NEXT'] = 'İleri';
-$lang['tr_TR']['MultiForm']['SUBMIT'] = 'Gönder';
-$lang['tr_TR']['MultiFormSession']['db_Hash'] = 'Hash';
-$lang['tr_TR']['MultiFormSession']['db_IsComplete'] = 'IsComplete';
-$lang['tr_TR']['MultiFormSession']['has_many_FormSteps'] = 'FormSteps';
-$lang['tr_TR']['MultiFormSession']['plural_name'] = '(hiçbiri)';
-$lang['tr_TR']['MultiFormSession']['singular_name'] = '(hiçbiri)';
-$lang['tr_TR']['MultiFormStep']['db_Data'] = 'Veri';
-$lang['tr_TR']['MultiFormStep']['plural_name'] = '(hiçbiri)';
-$lang['tr_TR']['MultiFormStep']['singular_name'] = '(hiçbiri)';
diff --git a/lang/zh_CN.php b/lang/zh_CN.php
deleted file mode 100644
index c350786..0000000
--- a/lang/zh_CN.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * Chinese (China) language pack
- * @package modules: multiform
- * @subpackage i18n
- */
-
-i18n::include_locale_file('modules: multiform', 'en_US');
-
-global $lang;
-
-if (array_key_exists('zh_CN', $lang) && is_array($lang['zh_CN'])) {
-    $lang['zh_CN'] = array_merge($lang['en_US'], $lang['zh_CN']);
-} else {
-    $lang['zh_CN'] = $lang['en_US'];
-}
-
-$lang['zh_CN']['MultiForm']['BACK'] = '区域';
-$lang['zh_CN']['MultiForm']['NEXT'] = '下一个';
-$lang['zh_CN']['MultiForm']['SUBMIT'] = '提交';
-$lang['zh_CN']['MultiFormSession']['db_Hash'] = 'Hash 字符串';
-$lang['zh_CN']['MultiFormSession']['db_IsComplete'] = '是否已完成';
-$lang['zh_CN']['MultiFormSession']['has_many_FormSteps'] = '表单步骤';
-$lang['zh_CN']['MultiFormSession']['plural_name'] = '多名称';
-$lang['zh_CN']['MultiFormSession']['singular_name'] = '单名称';
-$lang['zh_CN']['MultiFormStep']['db_Data'] = '数据';
-$lang['zh_CN']['MultiFormStep']['plural_name'] = '多名称';
-$lang['zh_CN']['MultiFormStep']['singular_name'] = '单名称';
diff --git a/tests/Stubs/MultiFormObjectDecorator_DataObject.php b/tests/Stubs/MultiFormObjectDecorator_DataObject.php
new file mode 100644
index 0000000..88e83ad
--- /dev/null
+++ b/tests/Stubs/MultiFormObjectDecorator_DataObject.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace SilverStripe\multiform\tests\Stubs;
+
+class MultiFormObjectDecorator_DataObject
+{
+
+}
diff --git a/tests/Stubs/MultiFormStepOne.php b/tests/Stubs/MultiFormStepOne.php
new file mode 100644
index 0000000..d051142
--- /dev/null
+++ b/tests/Stubs/MultiFormStepOne.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace SilverStripe\MultiForm\Tests\Stubs;
+
+class MultiFormStepOne
+{
+
+}
diff --git a/tests/Stubs/MultiFormTestForm.php b/tests/Stubs/MultiFormTestForm.php
new file mode 100644
index 0000000..6ab1dee
--- /dev/null
+++ b/tests/Stubs/MultiFormTestForm.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace SilverStripe\multiform\tests\Stubs;
+
+class MultiFormTestForm
+{
+
+}
diff --git a/tests/Stubs/MultiFormTestStepThree.php b/tests/Stubs/MultiFormTestStepThree.php
new file mode 100644
index 0000000..1bb88b9
--- /dev/null
+++ b/tests/Stubs/MultiFormTestStepThree.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace SilverStripe\multiform\tests\Stubs;
+
+class MultiFormTestStepThree
+{
+
+}
diff --git a/tests/Stubs/MultiFormTestStepTwo.php b/tests/Stubs/MultiFormTestStepTwo.php
new file mode 100644
index 0000000..e69de29
diff --git a/tests/Stubs/MultiFormTest_Controller.php b/tests/Stubs/MultiFormTest_Controller.php
new file mode 100644
index 0000000..bc15205
--- /dev/null
+++ b/tests/Stubs/MultiFormTest_Controller.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace SilverStripe\multiform\tests\Stubs;
+
+class MultiFormTest_Controller
+{
+
+}