diff --git a/modules/openidProvider/config-template/module_openidProvider.php b/modules/openidProvider/config-template/module_openidProvider.php
deleted file mode 100644
index 2222e55e67880626fd2723a320860d56d93c5f0e..0000000000000000000000000000000000000000
--- a/modules/openidProvider/config-template/module_openidProvider.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Configuration file for the OpenID provider.
- */
-
-$config = array(
-
-	/* The authentication source that should be used. */
-	'auth' => 'default-sp',
-
-	/* The name of the attribute which contains the username of the user. */
-	'username_attribute' => 'uid',
-
-	/* The directory where OpenID data is stored. */
-	'filestore' => '/var/lib/simplesamlphp-openid-provider',
-
-);
diff --git a/modules/openidProvider/default-disable b/modules/openidProvider/default-disable
deleted file mode 100644
index fa0bd82e2df7bd79d57593d35bc53c1f9d3ef71f..0000000000000000000000000000000000000000
--- a/modules/openidProvider/default-disable
+++ /dev/null
@@ -1,3 +0,0 @@
-This file indicates that the default state of this module
-is disabled. To enable, create a file named enable in the
-same directory as this file.
diff --git a/modules/openidProvider/dictionaries/openidProvider.definition.json b/modules/openidProvider/dictionaries/openidProvider.definition.json
deleted file mode 100644
index 4485a58dd6408ecf7dbdef180d7d6a12a8bbf39a..0000000000000000000000000000000000000000
--- a/modules/openidProvider/dictionaries/openidProvider.definition.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-	"title_no_user": {
-		"en": "OpenID provider"
-	},
-	"title_user": {
-		"en": "OpenID for %USERID%"
-	},
-	"user_page_for": {
-		"en": "This is the OpenID user page for <code>%USERID%<\/code>."
-	},
-	"view_own_page": {
-		"en": "View your own OpenID page."
-	},
-	"login_view_own_page": {
-		"en": "Log in to view your own OpenID page."
-	},
-	"your_identifier": {
-		"en": "To log in with your OpenID identifier, use the following identifier:"
-	},
-	"howto_delegate": {
-		"en": "You can also delegate a different identifier to use this OpenID provider. To do that, you need to add the following to the <code>&lt;head&gt;<\/code>-element on the webpage of that identifier:"
-	},
-	"logout_title": {
-		"en": "Log out"
-	},
-	"logout": {
-		"en": "Click here to log out of your OpenID user."
-	},
-	"confirm_question": {
-		"en": "Do you wish to log on to %SITEURL%?"
-	},
-	"remember": {
-		"en": "Remember this decision"
-	},
-	"confirm": {
-		"en": "Confirm"
-	},
-	"notconfirm": {
-		"en": "Do not confirm"
-	},
-	"trustlist_trustedsites": {
-		"en": "Trusted Sites"
-	},
-	"trustlist_remove": {
-		"en": "Remove"
-	},
-	"trustlist_nosites": {
-		"en": "No sites are trusted. When you authenticate with a site, you can choose to add it to this list by choosing <q>Remember this decision<\/q>."
-	}
-}
\ No newline at end of file
diff --git a/modules/openidProvider/dictionaries/openidProvider.translation.json b/modules/openidProvider/dictionaries/openidProvider.translation.json
deleted file mode 100644
index 637a196b1a788f6be63d3789fc7d87030d1d1c90..0000000000000000000000000000000000000000
--- a/modules/openidProvider/dictionaries/openidProvider.translation.json
+++ /dev/null
@@ -1,471 +0,0 @@
-{
-	"title_no_user": {
-		"no": "OpenID tilbyder",
-		"de": "OpenID-Anbieter",
-		"sl": "OpenID ponudnik",
-		"pt": "Fornecedor de Identidades OpenID",
-		"sv": "OpenID-leverant\u00f6r",
-		"hr": "Ustanova koja izdaje OpenID elektroni\u010dke identitete",
-		"da": "OpenID udbyder",
-		"fr": "Fournisseur OpenID",
-		"it": "Provider OpenID",
-		"es": "Proveedor OpenID",
-		"lt": "OpenID teik\u0117jas",
-		"ja": "OpenID\u30d7\u30ed\u30d0\u30a4\u30c0",
-		"zh-tw": "OpenID \u63d0\u4f9b\u8005",
-		"nn": "OpenID tilbydar",
-		"nl": "OpenID provider",
-		"et": "OpenID pakkuja",
-		"he": "\u05e1\u05e4\u05e7 OpenID",
-		"zh": "OpenID\u63d0\u4f9b\u8005",
-		"ar": "\u0645\u0632\u0648\u062f \u0627\u0644 OpenID",
-		"lv": "OpenID pieg\u0101d\u0101t\u0101js",
-		"id": "Provider OpenID",
-		"sr": "Davalac OpenID digitalnih identiteta",
-		"ro": "Furnizorul OpenID",
-		"ru": "\u041f\u0440\u043e\u0432\u0430\u0439\u0434\u0435\u0440 OpenID",
-		"cs": "OpenID poskytovatel",
-		"eu": "OpenID hornitzailea"
-	},
-	"title_user": {
-		"no": "OpenID for %USERID%",
-		"de": "OpenID f\u00fcr %USERID%",
-		"sl": "OpenID za %USERID%",
-		"pt": "OpenID para %USERID%",
-		"sv": "OpenID f\u00f6r %USERID%",
-		"hr": "OpenID za %USERID%",
-		"da": "OpenID for %USERID%",
-		"fr": "OpenID pour %USERID%",
-		"it": "OpenID per %USERID%",
-		"es": "OpenID para %USERID%",
-		"lt": "Vartotojo %USERID% OpenID",
-		"ja": "%USERID% \u306e OpenID",
-		"zh-tw": "OpenID for %USERID%",
-		"nn": "OpenID for %USERID%",
-		"nl": "OpenID voor %USERID%",
-		"et": "OpenID %USERID%",
-		"he": "OpenID \u05e2\u05d1\u05d5\u05e8 %USERID%",
-		"zh": "%USERID%\u7684OpenID",
-		"hu": "%USERID% OpenID azonos\u00edt\u00f3ja",
-		"ar": "%USERID% \u0644 OpenID",
-		"lv": "OpenID priek\u0161 %USERID%",
-		"id": "OpenID untuk %USERID%",
-		"sr": "OpenID za %USERID%",
-		"ro": "OpenID pentru %USERID%",
-		"ru": "OpenID \u0434\u043b\u044f %USERID%",
-		"cs": "OpenID pro %USERID%",
-		"eu": "OpenID %USERID%(r)entzat"
-	},
-	"user_page_for": {
-		"no": "Dette er OpenID brukersiden for <code>%USERID%<\/code>.",
-		"de": "Dies ist die OpenID Nutzerseite f\u00fcr <code>%USERID%<\/code>",
-		"sl": "To je OpenID stran uporabnika <code>%USERID%<\/code>.",
-		"pt": "Est\u00e1 na p\u00e1gina de OpenID do utilizador <code>%USERID%<\/code>",
-		"sv": "Detta \u00e4r OpenID-anv\u00e4ndarsida f\u00f6r <code>%USERID%<\/code>.",
-		"hr": "Ovo je OpenID stranica za korisnika <code>%USERID%<\/code>.",
-		"da": "Dette er OpenID brugersiden for <code>%USERID%<\/code>.",
-		"fr": "Ceci est la page OpenID pour <code>%USERID%<\/code>.",
-		"it": "Questa \u00e8 la pagina utente OpenID per <code>%USERID%<code>.",
-		"es": "Esta es la p\u00e1gina OpenID de usuario para <code>%USERID%<\/code>",
-		"lt": "Tai OpenID puslapis vartotojui <code>%USERID%<\/code>.",
-		"ja": "\u3053\u3053\u306fO<code>%USERID%<\/code>\u306eOpenID\u30e6\u30fc\u30b6\u30fc\u30da\u30fc\u30b8\u3067\u3059\u3002",
-		"zh-tw": "\u9019\u662f OpenID <code>%USERID%<\/code> \u7684\u4f7f\u7528\u8005\u4ecb\u9762\u3002",
-		"nn": "Dette er OpenID brukersida for <code>%USERID%<\/code>.",
-		"nl": "Dit is de OpenID gebruikerspagina voor <code>%USERID%<\/code>.",
-		"et": "See on OpenID kasutajaleht kasutajale <code>%USERID%<\/code>.",
-		"he": "<code>%USERID%<\/code>. \u05d6\u05d4\u05d5 \u05d3\u05e3 \u05d4\u05de\u05e9\u05ea\u05de\u05e9  OpenID \u05e2\u05d1\u05d5\u05e8 ",
-		"zh": "\u8fd9\u662f<code>%USERID%<\/code>\u7684OpenID\u7684\u7528\u6237\u9875\u9762",
-		"ar": "\u0635\u0641\u062d\u0629 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645 \u0644 OpenID <code>%USERID%<\/code>",
-		"lv": "\u0160\u012b ir OpenID lietot\u0101ja lapa priek\u0161 <code>%USERID%<\/code>.",
-		"id": "Ini adalah halaman pengguna OpenID untuk <code>%USERID%<\/code>.",
-		"sr": "Ovo je OpenID stranica za korisnika <code>%USERID%<\/code>.",
-		"ro": "Aceasta este pagina OpenID pentru <code>%USERID<\/code>.",
-		"ru": "\u042d\u0442\u043e OpenID \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430 \u0434\u043b\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f <code>%USERID%<\/code>.",
-		"cs": "Toto je u\u017eivatelsk\u00e1 tr\u00e1nka OpenID pro <code>%USERID%<\/code>.",
-		"eu": "Hau erabiltzailearen OpenID orria da <code>%USERID%<\/code>(r)entzat."
-	},
-	"view_own_page": {
-		"no": "Se p\u00e5 din egen OpenID side.",
-		"de": "Zeigen Sie Ihren OpenID-Seite an.",
-		"sl": "Poglejte svojo OpenID stran.",
-		"pt": "Ver a sua p\u00e1gina de OpenID.",
-		"sv": "Visa din egen OpenID-sida.",
-		"hr": "Pogledaj vlastitu OpenID stranicu.",
-		"da": "Se din egen OpenID side.",
-		"fr": "Voir votre propre page OpenID.",
-		"it": "Visualizza la tua pagina OpenID.",
-		"es": "Visuarlizar tu propia p\u00e1gina OpenID",
-		"lt": "Pamatyti savo OpenID puslap\u012f.",
-		"ja": "\u3042\u306a\u305f\u306eOpenID\u30da\u30fc\u30b8\u3092\u53c2\u7167\u3002",
-		"zh-tw": "\u6aa2\u8996\u60a8\u7684 OpenID \u9801\u9762\u3002",
-		"nn": "Sj\u00e5 di OpenID-side",
-		"nl": "Bekijk uw eigen OpenID pagina.",
-		"et": "N\u00e4ita enda OpenID lehek\u00fclge.",
-		"he": "\u05d4\u05e6\u05d2 \u05d0\u05ea \u05d3\u05e3 \u05d4 OpenID \u05e9\u05dc\u05da",
-		"zh": "\u8bbf\u95ee\u4f60\u81ea\u5df1\u7684OpenID\u9875\u9762",
-		"hu": "Tekintse meg OpenID oldal\u00e1t.",
-		"ar": "\u0634\u0627\u0647\u062f \u0635\u0641\u062d\u062a\u064a \u0628 OpenID",
-		"lv": "Skatiet savu OpenID lapu.",
-		"id": "Lihat halaman OpenID anda.",
-		"sr": "Pogledaj svoju OpenID stranicu.",
-		"ro": "Accesa\u021bi pagina dumneavoastr\u0103 OpenID.",
-		"ru": "\u041f\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0412\u0430\u0448\u0443 OpenID \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443.",
-		"cs": "Zobrazit Va\u0161i OpenID str\u00e1nku.",
-		"eu": "Bistaratu zure OpenID orria."
-	},
-	"login_view_own_page": {
-		"no": "Logg p\u00e5 for \u00e5 se p\u00e5 din egen OpenID side.",
-		"de": "Melden Sie sich an, um Ihre eigene OpenID-Seite zu betrachten.",
-		"sl": "Prijavite se in poglejte svojo OpenID stran.",
-		"pt": "Efectue a entrada para ver a sua p\u00e1gina de OpenID.",
-		"sv": "Logga in f\u00f6r att se din egen OpenID-sida.",
-		"hr": "Prijavite se da biste vidjeli va\u0161u OpenID stranicu.",
-		"da": "Log ind for at se dine egen OpenID side.",
-		"fr": "Connexion pour acc\u00e9der \u00e0 votre propre page OpenID.",
-		"it": "Collegati per visualizzare la tua pagina OpenID.",
-		"es": "Accede para ver tu p\u00e1gina OpenID",
-		"lt": "Prisijunkite, kad pamatytum\u0117te savo OpenID puslap\u012f.",
-		"ja": "\u3042\u306a\u305f\u306eOpenID\u30da\u30fc\u30b8\u3092\u53c2\u7167\u3059\u308b\u70ba\u306b\u30ed\u30b0\u30a4\u30f3\u3002",
-		"zh-tw": "\u767b\u5165\u4ee5\u6aa2\u8996\u60a8\u7684 OpenID \u9801\u9762\u3002",
-		"nn": "Logg inn for \u00e5 sj\u00e5 di OpenID-side",
-		"nl": "Log in om uw eigen OpenID pagina te bekijken.",
-		"et": "Logi sisse oma OpenID lehek\u00fclje n\u00e4gemiseks.",
-		"he": "\u05d4\u05ea\u05d7\u05d1\u05e8 \u05dc\u05de\u05e2\u05e8\u05db\u05ea \u05db\u05d3\u05d9 \u05dc\u05e8\u05d0\u05d5\u05ea \u05d0\u05ea \u05d3\u05e3 \u05d4 OpenID \u05e9\u05dc\u05da",
-		"zh": "\u767b\u5f55\u4ee5\u8bbf\u95ee\u4f60\u81ea\u5df1\u7684OpenID\u9875\u9762",
-		"ar": "\u0642\u0645 \u0628\u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u062f\u062e\u0648\u0644 \u0644\u062a\u0634\u0627\u0647\u062f \u0635\u0641\u062d\u062a\u0643 \u0628 OpenID",
-		"lv": "Piesl\u0113dzieties pie savas OpenID lapas.",
-		"id": "Log in untuk melihat halaman OpenID Anda.",
-		"sr": "Prijavite se da biste videli va\u0161u OpenID stranicu.",
-		"ro": "Autentifica\u021bi-v\u0103 pentru a vizualiza pagina dumneavoastr\u0103 OpenID.",
-		"ru": "\u0412\u043e\u0439\u0442\u0438 \u0434\u043b\u044f \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0430 \u0412\u0430\u0448\u0435\u0439 OpenID \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b.",
-		"cs": "P\u0159ihl\u00e1sit se pro zobrazen\u00ed Va\u0161\u00ed OpenID str\u00e1nky.",
-		"eu": "Sartu zure OpenID orria ikusteko."
-	},
-	"logout_title": {
-		"no": "Logg av",
-		"de": "Abmelden",
-		"sl": "Odjava",
-		"pt": "Sair",
-		"sv": "Logga ut",
-		"hr": "Odjavi se",
-		"da": "Log ud",
-		"fr": "Se d\u00e9connecter",
-		"it": "Disconnessione",
-		"es": "Cerrar sesi\u00f3n",
-		"lt": "Atsijungti",
-		"ja": "\u30ed\u30b0\u30a2\u30a6\u30c8",
-		"zh-tw": "\u767b\u51fa",
-		"nn": "Logg ut",
-		"nl": "Log uit",
-		"et": "Logi v\u00e4lja",
-		"he": "\u05d4\u05ea\u05e0\u05ea\u05e7\u05d5\u05ea",
-		"zh": "\u767b\u51fa",
-		"hu": "Kil\u00e9p\u00e9s",
-		"ar": "\u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u062e\u0631\u0648\u062c",
-		"lv": "Atsl\u0113gties",
-		"id": "Log out",
-		"sr": "Odjavi se",
-		"ro": "Ie\u0219ire din sistem (deautentificare)",
-		"ru": "\u0412\u044b\u0439\u0442\u0438",
-		"cs": "Odhl\u00e1sit",
-		"eu": "Saioa itxi"
-	},
-	"logout": {
-		"no": "Trykk her for \u00e5 logge ut av din OpenID bruker.",
-		"de": "Klicken Sie hier, um sich von Ihrem OpenID-Benutzer abzumelden.",
-		"sl": "Kliknite tukaj za odjavo OpenID uporabnika.",
-		"pt": "Carregue aqui para sair desta p\u00e1gina de utilizador OpenID.",
-		"sv": "Klicka h\u00e4r f\u00f6r att logga ut fr\u00e5n din OpenID-anv\u00e4ndare.",
-		"da": "Klik her for at logge din OpenID bruger ud.",
-		"hr": "Kliknite ovdje da biste se odjavili.",
-		"fr": "Cliquez ici pour clore votre session OpenID.",
-		"it": "Clicca qui per disconnetterti come utente OpenID.",
-		"es": "Pincha aqu\u00ed para salir de tu usuario OpenID",
-		"lt": "Spauskite \u010dia nor\u0117dami atsijungti nuo savo OpenID vartotojo.",
-		"ja": "\u30af\u30ea\u30c3\u30af\u3057\u3066OpenID\u30e6\u30fc\u30b6\u3092\u30ed\u30b0\u30a2\u30a6\u30c8\u3057\u307e\u3059\u3002",
-		"zh-tw": "\u6309\u9019\u88e1\u767b\u51fa\u60a8\u7684 OpenID \u4f7f\u7528\u8005\u3002",
-		"nn": "Klikk her for \u00e5 logga ut med din OpenID-brukar",
-		"nl": "Klik hier om uit te loggen van uw OpenID gebruiker.",
-		"et": "Kl\u00f5psa siia oma OpenID kasutajast v\u00e4lja logimiseks.",
-		"he": "\u05dc\u05d7\u05e5 \u05db\u05d0\u05d5 \u05db\u05d3\u05d9 \u05dc\u05d4\u05ea\u05e0\u05ea\u05e7 \u05de\u05de\u05e9\u05ea\u05de\u05e9 \u05d4 OpenID \u05e9\u05dc\u05da.",
-		"zh": "\u70b9\u51fb\u8fd9\u91cc\u767b\u51fa\u4f60\u7684OpenID",
-		"hu": "Kattintson a kil\u00e9p\u00e9shez.",
-		"ar": "\u0627\u0636\u063a\u0637 \u0644\u062a\u062e\u0631\u062c \u0645\u0646 OpenID \u062e\u0627\u0635\u062a\u0643",
-		"lv": "Klik\u0161\u0137iniet \u0161eit, lai atsl\u0113gtos.",
-		"id": "Klik disini untuk log out dari user OpenID anda.",
-		"sr": "Kliknite ovde da biste se odjavili.",
-		"ro": "Ap\u0103sa\u021bi aici pentru a ie\u0219i din contul dumneavoastr\u0103 OpenID.",
-		"ru": "\u041a\u043b\u0438\u043a\u043d\u0438\u0442\u0435 \u0442\u0443\u0442 \u0434\u043b\u044f \u0432\u044b\u0445\u043e\u0434\u0430 \u0432\u0430\u0448\u0435\u0433\u043e OpenID \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f.",
-		"cs": "Klikn\u011bte zde pro odhl\u00e1\u0161en\u00ed Va\u0161eho OpenID u\u017eivatele.",
-		"eu": "Sakatu hemen zure OpenID erabiltzailetik irteteko"
-	},
-	"confirm_question": {
-		"no": "\u00d8nsker du \u00e5 logge p\u00e5 %SITEURL%?",
-		"de": "M\u00f6chten Sie sich auf %SITEURL% anmelden?",
-		"sl": "Ali se \u017eelite prijaviti v %SITEURL%?",
-		"pt": "Pretende efectuar a entrada em %SITEURL%?",
-		"sv": "Vill du logga in p\u00e5 %SITEURL%?",
-		"hr": "\u017delite li se prijaviti za pristup stranici %SITEURL%?",
-		"da": "Vil du logge ind til %SITEURL%?",
-		"fr": "Voulez vous vous connecter sur %SITEURL%?",
-		"it": "Vuoi collegarti a %SITEURL% ?",
-		"es": "\u00bfDeseas acceder a %SITEURL%?",
-		"lt": "Ar norite prisijungti prie %SITEURL%?",
-		"ja": "%SITEURL% \u3078\u30ed\u30b0\u30a4\u30f3\u3057\u307e\u3059\u304b?",
-		"zh-tw": "\u60a8\u60f3\u767b\u5165\u4e0b\u5217\u7db2\u5740 %SITEURL% \uff1f",
-		"nn": "\u00d8nskjer du \u00e5 logga inn til %SITEURL%?",
-		"nl": "Wilt u in te loggen op %SITEURL%?",
-		"et": "Kas sa soovid logida sisse lehek\u00fcljele %SITEURL%?",
-		"he": "\u05d4\u05d0\u05dd \u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05d4\u05ea\u05d7\u05d1\u05e8 \u05dc %SITEURL%?",
-		"zh": "\u4f60\u60f3\u767b\u5f55\u81f3%SITEURL%",
-		"ar": "\u0647\u0644 \u062a\u0631\u063a\u0628 \u0628\u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u062f\u062e\u0648\u0644 \u0644 %SITEURL%?",
-		"lv": "Vai v\u0113laties piesl\u0113gties pie %SITEURL%?",
-		"id": "Apakah anda ingin log in ke %SITEURL%?",
-		"sr": "\u017delite li se prijaviti za pristup stranici %SITEURL%?",
-		"ro": "Dori\u021bi s\u0103 v\u0103 conecta\u021bi la %SITEURL%?",
-		"ru": "\u0412\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u0432\u043e\u0439\u0442\u0438 \u043d\u0430 %SITEURL%?",
-		"cs": "P\u0159ejete si p\u0159ihl\u00e1sit se k %SITEURL%?",
-		"eu": "%SITEURL%(e)an sartu nahi al duzu?"
-	},
-	"remember": {
-		"no": "Husk dette valget",
-		"nn": "Hugs denne avgjerda",
-		"da": "Husk dette",
-		"de": "Diese Entscheidung merken",
-		"sv": "Spara detta beslut",
-		"es": "Recordar esta decisi\u00f3n",
-		"nl": "Onthoud deze keuze",
-		"sl": "Zapomni si to odlo\u010ditev",
-		"hr": "Zapamti ovu odluku",
-		"hu": "Eml\u00e9kezzen erre a v\u00e1laszt\u00e1sra",
-		"pl": "Zapami\u0119taj t\u0105 decyzj\u0119",
-		"pt": "Lembrar esta decis\u00e3o",
-		"pt-br": "Lembrar desta decis\u00e3o",
-		"tr": "Karar\u0131m\u0131 hat\u0131rla",
-		"fr": "Retenir cette d\u00e9cision",
-		"it": "Ricordati questa decisione",
-		"lt": "Atsiminti \u0161\u012f sprendim\u0105",
-		"ja": "\u3053\u306e\u8a2d\u5b9a\u3092\u8a18\u61b6\u3059\u308b",
-		"zh-tw": "\u8a18\u4f4f\u9019\u500b\u6c7a\u5b9a",
-		"et": "J\u00e4ta see otsus meelde",
-		"he": "\u05d6\u05db\u05d5\u05e8 \u05d0\u05ea \u05d4\u05d4\u05d7\u05dc\u05d8\u05d4",
-		"zh": "\u8bb0\u4f4f\u8fd9\u4e2a\u51b3\u5b9a",
-		"ar": "\u062a\u0630\u0643\u0631 \u0647\u0630\u0627 \u0627\u0644\u0642\u0631\u0627\u0631",
-		"lv": "Atcer\u0113ties \u0161o izv\u0113li",
-		"id": "Ingat pilihan ini.",
-		"sr": "Zapamti ovu odluku",
-		"ro": "\u021aine minte aceast\u0103 alegere",
-		"ru": "\u0417\u0430\u043f\u043e\u043c\u043d\u0438\u0442\u044c \u044d\u0442\u043e \u0440\u0435\u0448\u0435\u043d\u0438\u0435",
-		"cs": "Pamatovat toto rozhodnut\u00ed",
-		"eu": "Gogoratu erabaki hau"
-	},
-	"confirm": {
-		"no": "Bekreft",
-		"nn": "Stadfest",
-		"da": "Bekr\u00e6ft",
-		"de": "Best\u00e4tigen",
-		"sv": "Bekr\u00e4fta",
-		"es": "Confirmar",
-		"nl": "Bevestig",
-		"sl": "Potrdi",
-		"hr": "Potvrdi",
-		"hu": "Meger\u0151s\u00edt",
-		"pl": "Potwierd\u017a",
-		"pt": "Confirmar",
-		"pt-br": "Confirmar",
-		"tr": "Do\u011frula",
-		"fr": "Confirmer",
-		"it": "Confermo",
-		"lt": "Patvirtinti",
-		"ja": "\u78ba\u8a8d",
-		"zh-tw": "\u78ba\u8a8d",
-		"et": "Kinnita",
-		"he": "\u05d0\u05e9\u05e8",
-		"zh": "\u786e\u8ba4",
-		"ar": "\u062a\u0627\u0643\u064a\u062f\u0627\u0644\u0642\u0631\u0627\u0631\u0627\u062a \u0643\u064a\u062f",
-		"lv": "Piekrist",
-		"id": "Konfirmasi",
-		"sr": "Potvrdi",
-		"ro": "Confirm\/De acord",
-		"ru": "\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044c",
-		"cs": "Potvrdit",
-		"eu": "Berretsi"
-	},
-	"notconfirm": {
-		"no": "Ikke bekreft",
-		"nn": "Stadfesting ikkje",
-		"da": "Bekr\u00e6ft ikke",
-		"de": "Nicht best\u00e4tigen",
-		"sv": "Bekr\u00e4fta inte",
-		"es": "No confirmar",
-		"nl": "Weiger",
-		"sl": "Ne potrdi",
-		"hr": "Nemoj potvrditi",
-		"hu": "Nem er\u0151s\u00edti meg",
-		"pl": "Nie potwierdzaj",
-		"pt": "N\u00e3o confirmar",
-		"pt-br": "N\u00e3o confirmar",
-		"tr": "Do\u011frulama",
-		"fr": "Ne pas confirmer",
-		"it": "Non confermo",
-		"lt": "Nepatvirtinti",
-		"ja": "\u78ba\u8a8d\u3057\u306a\u3044",
-		"zh-tw": "\u4e0d\u78ba\u8a8d",
-		"et": "\u00c4ra kinnita",
-		"he": "\u05d0\u05dc \u05ea\u05d0\u05e9\u05e8",
-		"zh": "\u4e0d\u786e\u8ba4",
-		"ar": "\u0644\u0627 \u062a\u0624\u0643\u062f",
-		"lv": "Nepiekrist",
-		"id": "Jangan konfirmasi",
-		"sr": "Nemoj potvrditi",
-		"ro": "Nu confirm\/Nu sunt de acord",
-		"ru": "\u041e\u0442\u043a\u0430\u0437\u0430\u0442\u044c\u0441\u044f \u043e\u0442 \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u044f",
-		"cs": "Nepotvrdit",
-		"eu": "Ez berretsi"
-	},
-	"trustlist_trustedsites": {
-		"no": "Klarerte websider",
-		"nn": "Tiltrudde partnarar",
-		"da": "Hjemmesider du har tillid til",
-		"de": "Vertrauensw\u00fcrdige Sites",
-		"sv": "Godk\u00e4nda sajter",
-		"es": "Sitios de confianza",
-		"nl": "Vertrouwde Sites",
-		"sl": "Zaupanja vredne strani",
-		"hr": "Web stranice kojima vjerujete",
-		"hu": "Megb\u00edzhat\u00f3 oldalak",
-		"pl": "Zaufane strony",
-		"pt": "Sites confi\u00e1veis",
-		"pt-br": "Sites Confi\u00e1veis",
-		"tr": "G\u00fcvenilir Siteler",
-		"fr": "Sites de confiance",
-		"it": "Siti affidabili",
-		"lt": "Patikimi Tinklapiai",
-		"ja": "\u4fe1\u983c\u3055\u308c\u3066\u3044\u308b\u30b5\u30a4\u30c8",
-		"zh-tw": "\u4fe1\u4efb\u7ad9\u53f0",
-		"et": "Usaldatavad lehek\u00fcljed",
-		"he": "\u05d0\u05ea\u05e8\u05d9\u05dd \u05de\u05d4\u05d9\u05de\u05e0\u05d9\u05dd",
-		"zh": "\u4fe1\u4efb\u7ad9\u70b9",
-		"ar": "\u0645\u0648\u0642\u0639 \u0645\u0648\u062b\u0648\u0642 \u0628\u0647",
-		"lv": "Uzticam\u0101s vietnes",
-		"id": "Situs yang dipercayai",
-		"sr": "Web stranice kojima verujete",
-		"ro": "Situri de \u00eencredere",
-		"ru": "\u0414\u043e\u0432\u0435\u0440\u0435\u043d\u043d\u044b\u0435 \u0441\u0430\u0439\u0442\u044b",
-		"cs": "D\u016fv\u011bryhodn\u00e1 m\u00edsta",
-		"eu": "Gune fidagarriak"
-	},
-	"trustlist_remove": {
-		"no": "Fjern",
-		"nn": "Ta vekk",
-		"da": "Fjern",
-		"de": "L\u00f6schen",
-		"sv": "Ta bort",
-		"sl": "Odstrani",
-		"pt": "Remover",
-		"hr": "Ukloni",
-		"fr": "Supprimer",
-		"it": "Rimuovere",
-		"es": "Eliminar",
-		"lt": "Pa\u0161alinti",
-		"ja": "\u524a\u9664",
-		"zh-tw": "\u79fb\u9664",
-		"nl": "Verwijder",
-		"et": "Eemalda",
-		"he": "\u05d4\u05e1\u05e8",
-		"zh": "\u79fb\u9664",
-		"hu": "T\u00f6r\u00f6l",
-		"ar": " \u0627\u0645\u0633\u062d",
-		"lv": "Dz\u0113st",
-		"id": "Buang",
-		"sr": "Ukloni ",
-		"ro": "\u0218terge",
-		"ru": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c",
-		"cs": "Odebrat",
-		"eu": "Ezabatu"
-	},
-	"trustlist_nosites": {
-		"no": "Ingen sites er husket. N\u00e5r du autentiserer deg hos en site, kan du velge \u00e5 legge den til denne listen ved \u00e5 velge <q>Husk dette valget<\/q>.",
-		"nn": "Ingen tenester er lagra.  N\u00e5r du logger inn p\u00e5 ei teneste, kan du velja \u00e5 leggja ho inn p\u00e5 lista over tiltrudde partnarar ved \u00e5 velja <q>Hugs denne avgjerda<\/q>.",
-		"da": "Der er ikke gemt nogle sites. N\u00e5r authenticater mod et site kan du v\u00e6lge at gemme sitet i denne liste ved at v\u00e6lge <q>Gem mit valg<\/q>",
-		"sv": "Inga sajter \u00e4r sparade. N\u00e4r du loggar in p\u00e5 en sajt kan du v\u00e4lja om du ska l\u00e4gga den i listan genom att v\u00e4lja <q>Spara detta beslut<\/q>.",
-		"de": "Keine Site ist vertrauensw\u00fcrdig. Wenn Sie sich auf einer Site authentifizieren, k\u00f6nnen Sie sie dieser List hinzuf\u00fcgen, indem Sie <q>Diese Entscheidung merken<\/q> anw\u00e4hlen.",
-		"sl": "Nobeno spletno mestno ni zaupanja vredno. Med prijavo lahko dodate spletno mesto na ta seznam z izbiro <q>Zapomni si to odlo\u010ditev<\/q>.",
-		"pt": "Lista de sites confi\u00e1veis vazia. Quando se autenticar num site, pode adicion\u00e1-lo a esta lista escolhendo <q>Lembrar esta decis\u00e3o<\/q>.",
-		"hr": "Trenutno ne vjerujete niti jednoj web stranici. Prilikom autentifikacije za pristup nekoj web stranici mo\u017eete ju postaviti na popis stranica kojima vjerujete odabirom opcije <q>Zapamti ovu odluku<\/q>.",
-		"fr": "Aucun site de confiance. Quand vous vous authentifiez sur un site, vous pouvez d\u00e9cider de l'ajouter \u00e0 cette liste en s\u00e9lectionnant <q>Retenir cette d\u00e9cision<\/q>.",
-		"it": "Non ci sono siti affidabili. Quando ti autentichi con un sito, puoi scegliere di aggiungerlo a tale list selezionando <q>Ricordati questa decisione<\/q>.",
-		"es": "No hay sitios de confianza. Cuando te autentiques en un sitio puede elegir a\u00f1adirlo a a esta lista seleccionando <q>Recordar esta decisi\u00f3n<\/q>",
-		"lt": "N\u0117ra patikim\u0173 tinklapi\u0173. Kai tinklapyje patvirtinate autenti\u0161kum\u0105, galite prid\u0117ti j\u012f \u012f \u0161\u012f s\u0105ra\u0161\u0105 pasirink\u0119 <q>Atsiminti \u0161\u012f sprendim\u0105<\/q>.",
-		"ja": "\u4fe1\u983c\u3055\u308c\u3066\u3044\u308b\u30b5\u30a4\u30c8\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u3042\u306a\u305f\u304c\u30b5\u30a4\u30c8\u306b\u8a8d\u8a3c\u3092\u884c\u3046\u969b\u3001\u3042\u306a\u305f\u306f\u30ea\u30b9\u30c8\u306b\u8ffd\u52a0\u3055\u308c\u305f<q>\u8a18\u61b6\u3057\u305f\u6c7a\u5b9a<\/q>\u304b\u3089\u9078\u629e\u3059\u308b\u4e8b\u304c\u51fa\u6765\u307e\u3059\u3002",
-		"zh-tw": "\u6c92\u6709\u4efb\u4f55\u4fe1\u4efb\u7ad9\u53f0\u3002\u7576\u4f60\u65bc\u7ad9\u53f0\u8a8d\u8b49\uff0c\u60a8\u53ef\u9ede\u9078 <q>\u8a18\u4f4f\u9019\u500b\u6c7a\u5b9a<\/q> \u52a0\u5165\u8a72\u7ad9\u81f3\u9019\u500b\u6e05\u55ae\u88e1",
-		"nl": "Geen sites zijn vertrouwd. Wanneer u verbind met een site, kunt u kiezen om deze toe te voegen aan deze lijst, door <q>Onthoud deze keuze<\/q> te kiezen.",
-		"et": "\u00dchtegi lehek\u00fclge ei usaldata. Kui sa autendid mingil lehek\u00fcljel, siis saad lisada seda nimekirja, valides <q>J\u00e4ta see otsus meelde<\/q>.",
-		"he": "\u05d0\u05d9\u05df \u05d0\u05ea\u05e8\u05d9\u05dd \u05de\u05d4\u05de\u05e0\u05d9\u05dd. \u05db\u05d0\u05e9\u05e8 \u05ea\u05d6\u05d3\u05d4\u05d4 \u05e2\u05dd \u05d0\u05ea\u05e8, \u05d0\u05ea\u05d4 \u05d9\u05db\u05d5\u05dc \u05dc\u05d1\u05d7\u05d5\u05e8 \u05dc\u05d4\u05d5\u05e1\u05d9\u05e3 \u05d0\u05d5\u05ea\u05d5 \u05dc\u05e8\u05e9\u05d9\u05de\u05d4 \u05d6\u05d5 \u05e2\u05dc \u05d9\u05d3\u05d9 \u05d1\u05d7\u05d9\u05e8\u05ea <q>\u05d6\u05db\u05d5\u05e8 \u05d0\u05ea \u05d4\u05d4\u05d7\u05dc\u05d8\u05d4<\/q>.",
-		"zh": "\u6ca1\u6709\u4fe1\u4efb\u7ad9\u70b9\uff0c\u5f53\u4f60\u8ba4\u8bc1\u4e00\u4e2a\u7ad9\u70b9\u7684\u65f6\u5019\uff0c\u4f60\u53ef\u4ee5\u9009\u62e9\u589e\u52a0\u81f3\u4fe1\u4efb\u5217\u8868\u901a\u8fc7\u9009\u62e9<q>\u8bb0\u4f4f\u8fd9\u4e2a\u51b3\u5b9a<\/q>",
-		"ar": "\u0644\u0627 \u062a\u0648\u062c\u062f \u0645\u0648\u0627\u0642\u0639 \u0645\u0648\u062b\u0648\u0642 \u0628\u0647\u0627. \u0639\u0646\u062f\u0645\u0627 \u062a\u0642\u0648\u0645 \u0628\u0627\u0644\u062a\u0635\u062f\u064a\u0642 \u0639\u0644\u064a \u0627\u062d\u062f \u0627\u0644\u0645\u0648\u0627\u0642\u0639\u060c \u064a\u0645\u0643\u0646\u0643 \u0625\u0636\u0627\u0641\u062a\u0647 \u0644\u0644\u0642\u0627\u0626\u0645\u0629 \u0628\u0627\u062e\u062a\u064a\u0627\u0631 <q>remember this decision<\/q>.",
-		"lv": "Nav uzticamu viet\u0146u. Kad autentific\u0113jaties \u0161aj\u0101 vietn\u0113, varat to pievienot sarakstam izv\u0113loties <q>Atcer\u0113ties \u0161o izv\u0113li<\/q>.",
-		"id": "Tidak ada situs yang dipercayai. Ketika anda melakukan autentifikasi pada suatu situs, anda dapat memilih untuk menambahkannya ke daftar ini dengan memilih <q>Remember this decision<\/q>.",
-		"sr": "Trenutno ne verujete nijednoj web stranici. Prilikom autentifikacije za pristup nekoj web stranici mo\u017eete je postaviti na popis stranica kojima verujete odabirom opcije <q>Zapamti ovu odluku<\/q>.",
-		"ro": "Niciun sit nu este considerat de \u00eencredere. Atunci c\u00e2nd v\u0103 autentifica\u021bi pe un sit, pute\u021bi alege ad\u0103ugarea acestuia \u00een lista celor de \u00eencredere prin marcarea <q>Re\u021bine aceast\u0103 alegere<\/q>",
-		"ru": "\u041d\u0435\u0442 \u0434\u043e\u0432\u0435\u0440\u0435\u043d\u043d\u044b\u0445 \u0441\u0430\u0439\u0442\u043e\u0432. \u041f\u043e\u0441\u043b\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438 \u043d\u0430 \u0441\u0430\u0439\u0442\u0435, \u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0434\u0430\u043d\u043d\u044b\u0439 \u0441\u0430\u0439\u0442 \u0432 \u0432\u0430\u0448 \u0441\u043f\u0438\u0441\u043e\u043a, \u0432\u044b\u0431\u0440\u0430\u0432 <q>\u0417\u0430\u043f\u043e\u043c\u043d\u0438\u0442\u044c \u043c\u043e\u0439 \u0432\u044b\u0431\u043e\u0440<\/q>.",
-		"cs": "\u017d\u00e1dn\u00e1 d\u016fv\u011bryhodn\u00e1 m\u00edsta. Kdy\u017e se p\u0159ihl\u00e1s\u00edte ke str\u00e1nce, m\u016f\u017eete ji p\u0159idat do tohoto seznamu volbou <q>Pamatovat toto rozhodnut\u00ed<\/q>.",
-		"eu": "Ez dago gune fidagarririk. Gune batean kautotzen zarenean zerrenda honetara gehitzea hautatu dezakezu <q>Gogoratu erabaki hau<\/q> hautatuz."
-	},
-	"your_identifier": {
-		"no": "For \u00e5 logge inn med din OpenID, bruk f\u00f8lgende ID:",
-		"de": "Um sich mit Ihren OpenID-Bezeichner anzumelden, verwenden Sie den folgenden Bezeichner:",
-		"sl": "Za prijavo z va\u0161im OpenID identifikatorjem uporabite naslednje:",
-		"pt": "Para efectuar a entrada com OpenID, utilize o seguinte identificador:",
-		"sv": "F\u00f6r att logga in med din OpenID-leverant\u00f6r anv\u00e4nd f\u00f6ljande identifierare:",
-		"hr": "Da biste se prijavili s va\u0161im OpenID elektroni\u010dkim identitetom, koristite sljede\u0107i identifikator:",
-		"fr": "Pour vous connecter avec votre identifiant OpenID, utilisez l'identifiant suivant:",
-		"da": "For at logge ind med OpenID, brug f\u00f8lgende ID:",
-		"it": "Per collegarsi con il proprio identificatore OpenID, usa il seguente:",
-		"es": "Para acceder con tu identificador OpenID, usa el siguiente identificador",
-		"lt": "Nor\u0117dami prisijungti su savo OpenID, naudokite \u0161\u012f identifikatori\u0173:",
-		"ja": "OpenID\u8b58\u5225\u5b50\u3067\u30ed\u30b0\u30a4\u30f3\u3059\u308b\u70ba\u306b\u4ee5\u4e0b\u306eID\u3092\u8b58\u5225\u5b50\u3092\u4f7f\u7528\u3057\u307e\u3059\u3002",
-		"zh-tw": "\u82e5\u8981\u767b\u5165 OpenID \u8b58\u5225\uff0c\u4f7f\u7528\u4e0b\u5217\u8b58\u5225\uff1a",
-		"nn": "For \u00e5 logga inn med OpenID, bruk f\u00f8lgjande ID: ",
-		"nl": "Om in te loggen met uw OpenID identificatiemiddel, gebruikt u het volgende identificatiemiddel:",
-		"et": "Kasuta j\u00e4rgnevat identifikaatorit oma OpenID identifikaatoriga sisse logimiseks:",
-		"he": "\u05db\u05d3\u05d9 \u05dc\u05d4\u05ea\u05d7\u05d1\u05e8 \u05e2\u05dd \u05de\u05d6\u05d4\u05d4 OpenID, \u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05de\u05d6\u05d4\u05d4 \u05d4\u05d1\u05d0:",
-		"zh": "\u9009\u62e9\u5982\u4e0b\u7684\u6807\u5fd7\uff0c\u4f7f\u7528\u4f60\u81ea\u5df1\u7684OpenID\u6807\u5fd7\u767b\u5f55",
-		"ar": "\u0644\u0644\u062f\u062e\u0648\u0644 \u0645\u0633\u062a\u062e\u062f\u0645\u0627 \u064b \u0627\u0633\u0645 \u062f\u062e\u0648\u0644\u0643 \u0644 OpenID, \u0627\u0633\u062a\u062e\u062f\u0645 \u0627\u0644\u062a\u0639\u0631\u064a\u0641 \u0623\u062f\u0646\u0627\u0647 ",
-		"lv": "Lai piesl\u0113gtos ar J\u016bsu OpenID identifikatoru, izmantojiet \u0161o identifikatoru:",
-		"id": "Untuk log in dengan identifier OpenID anda, gunakan identifier berikut :",
-		"sr": "Da biste se prijavili s va\u0161im OpenID digitalnim identitetom, koristite slede\u0107i identifikator:",
-		"ro": "Pentru a v\u0103 autentifica cu identificatorul dumneavoastr\u0103 OpenID, folos\u021bi urm\u0103torul identificator:",
-		"ru": "\u0414\u043b\u044f \u0432\u0445\u043e\u0434\u0430 \u0441 \u0412\u0430\u0448\u0438\u043c OpenID \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u043e\u043c, \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0439 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440:",
-		"cs": "Pro p\u0159ihl\u00e1\u0161en\u00ed pomoc\u00ed Va\u0161eho OpenID identifik\u00e1toru pou\u017eijte n\u00e1sleduj\u00edc\u00ed identifik\u00e1tor:",
-		"eu": "Zure OpenID identifikadorearekin sartzeko, erabil ezazu identifikadore hau:"
-	},
-	"howto_delegate": {
-		"no": "Du kan ogs\u00e5 delegere en annen OpenID til \u00e5 benytte denne OpenID tilbyderen. For \u00e5 gj\u00f8re det, m\u00e5 du legge til f\u00f8lgende <code>&lt;head&gt;<\/code>-element p\u00e5 websiden til denne OpenID-en du vil delegere.",
-		"de": "Sie k\u00f6nnen auch einen anderen Bezeichner bevollm\u00e4chtigen, diesen OpenID-Anbieter zu verwenden. Um dies zu tun, m\u00fcssen Sie das folgende <code>&lt;head&gt;<\/code>-Element auf der Webseite dieses Bezeichners hinzuf\u00fcgen:",
-		"sl": "Lahko dolo\u010dite drug identifikator za prijavo na tem OpenID ponudniku. To storite tako da, naslednje dodate v element <code>&lt;head&gt;<\/code> v spletne strani tega identifikatorja.",
-		"pt": "Pode tamb\u00e9m delegar este fornecedor de Identidades OpenID noutro identificador. Para o fazer, necessita de adicionar o seguinte texto no elemento <code>&lt;head&gt;<\/code> da p\u00e1gina web desse novo identificador.",
-		"sv": "Du kan ocks\u00e5 delegera till en annan identifierare att anv\u00e4nda denna OpenID-leverant\u00f6r. F\u00f6r att g\u00f6ra detta m\u00e5ste du l\u00e4gga till f\u00f6ljande till <code>&lt;head&gt;<\/code>-elementet p\u00e5 webbsidan f\u00f6r den identifieraren:",
-		"hr": "Ovom davatelju OpenID elektroni\u010dkih identiteta mo\u017eete dodijeliti i druga\u010diji identifikator. Da biste to napravili, morate dodati sljede\u0107i sadr\u017eaj u <code>&lt;head&gt;<\/code> element zaglavlja web stranice tog identifikatora:",
-		"fr": "Vous pouvez aussi utiliser un identifiant d\u00e9l\u00e9gu\u00e9 diff\u00e9rent pour ce fournisseur OpenID. Pour ce faire, ajoutez l'\u00e9l\u00e9ment <code>&lt;head&gt;<\/code> sur la page web de l'identifiant:",
-		"da": "Du kan ogs\u00e5 bruge et andet ID til denne OpenID udbyder. For at g\u00f8re dette, skal du tilf\u00f8je f\u00f8lgende til <code>&lt;head&gt;<\/code>-element p\u00e5 websiden for dette ID:",
-		"it": "E' possibile delegare un altro identificatore perch\u00e9 sia usato con questo provider OpenID. Per far questo, occorre aggiungere il seguente <code>&lh;head&gt;<code> elemento nella pagina web dell'identificatore:",
-		"es": "Puede adem\u00e1s utilizar un identificador diferente para utilizar este proveedor OpenID. Para hacerlo debe agregar el elemento <code>&lt;head&gt;<\/code> a la p\u00e1gina del identificador:",
-		"lt": "J\u016bs taip pat galite priskirti kit\u0105 identifikatori\u0173 \u0161io OpenID teik\u0117jo naudojimui. Jums reikia prid\u0117ti \u0161\u012f <code>&lt;head&gt;<\/code> element\u0105 to identifikatoriaus tinklapyje:",
-		"ja": "\u3055\u3089\u306b\u3001\u3053\u306eOpenID\u30d7\u30ed\u30d0\u30a4\u30c0\u3092\u4f7f\u7528\u3059\u308b\u70ba\u306b\u5225\u306e\u8b58\u5225\u5b50\u306b\u59d4\u4efb\u3059\u308b\u3053\u3068\u304c\u51fa\u6765\u307e\u3059\u3002\u3053\u308c\u3092\u884c\u3046\u306b\u306f\u3001\u3042\u306a\u305f\u306fWEB\u30da\u30fc\u30b8\u306e<code>&lt;head&gt;<\/code>\u8981\u7d20\u306b\u4ee5\u4e0b\u306e\u8b58\u5225\u5b50\u3092\u8ffd\u52a0\u3059\u308b\u5fc5\u8981\u304c\u6709\u308a\u307e\u3059\u3002",
-		"zh-tw": "\u60a8\u4ea6\u53ef\u65bc OpenID \u63d0\u4f9b\u8005\u4f7f\u7528\u4e0d\u540c\u8eab\u5206\u8b58\u5225\u3002\u82e5\u9700\u5982\u6b64\uff0c\u8acb\u65b0\u589e\u9019\u500b\u8b58\u5225\u6a19\u7c64 <code>&lt;head&gt;<\/code>-\u5143\u4ef6\u81f3\u60a8\u7684\u7db2\u9801\uff1a",
-		"nn": "Du kan ogs\u00e5 delegera ein annan ID for bruk i denne OpenID-tilbydaren.  For \u00e5 gjera det, m\u00e5 du leggja til det som st\u00e5r under inni <code>&lt;head&gt;<\/code>-elementet p\u00e5 websida til den andre IDen: ",
-		"nl": "U kunt ook delegeren een ander id met deze OpenID provider te gebruiken. Om dat te doen, moet u het volgende toevoegen aan het <code>&lt;head&gt;<\/code>-element op de webpagina van dat identificatiemiddel:",
-		"et": "V\u00f5id delegeerida ka muu identifikaatori seda OpenID pakkujat kasutama. Selle tegemiseks pead lisama j\u00e4rgneva koodi selle indetifikaatori veebilehek\u00fclje <code>&lt;head&gt;<\/code>-elementi.",
-		"he": "\u05d0\u05ea\u05d4 \u05d9\u05db\u05d5\u05dc \u05dc\u05d4\u05e1\u05de\u05d9\u05da \u05de\u05d6\u05d4\u05d4 \u05e9\u05d5\u05e0\u05d4 \u05dc\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05e1\u05e4\u05e7 OpenID <code>&lt;head&gt;<\/code> \u05dc\u05d3\u05e3 \u05d4\u05d1\u05d9\u05ea \u05e9\u05dc \u05d4\u05de\u05d6\u05d4\u05d4 \u05d4\u05de\u05d1\u05d5\u05e7\u05e9: \u05d4\u05e0\u05d5\u05db\u05d7\u05d9. \u05d1\u05e9\u05d1\u05d9\u05dc \u05db\u05da, \u05d0\u05ea\u05d4 \u05e6\u05e8\u05d9\u05da \u05dc\u05d4\u05d5\u05e1\u05d9\u05e3 \u05e8\u05ea \u05d0\u05dc\u05de\u05e0\u05d8 ",
-		"zh": "\u4f60\u53ef\u4ee5\u6388\u6743\u4e00\u4e2a\u4e0d\u540c\u7684\u6807\u8bc6\u7b26\uff0c\u6765\u4f7f\u7528\u8fd9\u4e2aOpenID\u63d0\u4f9b\u8005\uff0c\u4e3a\u6b64\u4f60\u9700\u8981\u5728\u90a3\u4e2a\u6807\u8bc6\u7b26<code>&lt;head&gt;<\/code>\u5143\u7d20\u4e2d\u6dfb\u52a0\u4e0b\u5217\u4fe1\u606f",
-		"ar": "\u064a\u0645\u0643\u0646\u0643 \u0627\u0633\u062a\u062e\u062f\u0627\u0645 \u062a\u0639\u0631\u064a\u0641 \u0627\u062e\u0631 \u0644\u0644\u062f\u062e\u0648\u0644 \u0644\u0647\u0630\u0627 \u0627\u0644\u0645\u0648\u0642\u0639\u060c \u0644\u0644\u0642\u064a\u0627\u0645 \u0628\u0630\u0644\u0643 \u0642\u0645 \u0628\u0625\u0636\u0627\u0641\u0629 \u0627\u0644\u0622\u062a\u064a <code>&lt;head&gt;<\/code>-element \u0644\u0645\u062a\u0635\u0641\u062d\u0643",
-		"lv": "J\u016bs varat ar\u012b dele\u0123\u0113t citu identifikatoru \u0161\u012b OpenID pied\u0101v\u0101t\u0101ja izmanto\u0161anai. Lai to izdar\u012btu, identifikatora interneta lap\u0101 pie <code>&lt;head&gt;<\/code>-elementa Jums j\u0101pievieno sekojo\u0161ais:",
-		"id": "Anda juga dapat mendelegasikan pengidentifikasi yang berbeda untuk menggunakan provider OpenID ini. Untuk melakukan hal itu, anda harus menambahkan <code>&lt;head&gt;<\/code>-element ke halaman web pengidentifikasi tersebut.",
-		"sr": "Ovom davaocu OpenID digitalnih identiteta mo\u017eete dodeliti i druga\u010diji identifikator. Da biste to uradili, morate dodati slede\u0107i sadr\u017eaj u <code>&lt;head&gt;<\/code> element web stranice tog identifikatora:",
-		"ro": "Pute\u021bi delega un identificator diferit pentru utilizarea acestui furnizor OpenID. \u00cen acest caz, trebuie s\u0103 ad\u0103uga\u021bi urm\u0103toarele la elementul <code>&lt;head&gt;<\/code> din pagina web a identificatorului respectiv:",
-		"ru": "\u0412\u044b \u0442\u0430\u043a\u0436\u0435 \u043c\u043e\u0436\u0435\u0442\u0435 \u0432\u044b\u0434\u0435\u043b\u0438\u0442\u044c \u0434\u0440\u0443\u0433\u043e\u0439 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440 \u0434\u043b\u044f \u0440\u0430\u0431\u043e\u0442\u044b \u0441 \u0434\u0430\u043d\u043d\u044b\u043c \u043f\u0440\u043e\u0432\u0430\u0439\u0434\u0435\u0440\u043e\u043c OpenID. \u0414\u043b\u044f \u044d\u0442\u043e\u0433\u043e \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0439 \u044d\u043b\u0435\u043c\u0435\u043d\u0442 \u043d\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0435 \u0434\u0430\u043d\u043d\u043e\u0433\u043e \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u0430: <code>&lt;head&gt;<\/code>",
-		"cs": "M\u016f\u017eete tak\u00e9 delegovat r\u016fzn\u00fd identifik\u00e1tor pro pou\u017eit\u00ed tohoto OpenID poskytovatele. Mus\u00edte pro to p\u0159idat n\u00e1sleduj\u00edc\u00ed do <code>&lt;head&gt;<\/code> elementu na webov\u00e9 str\u00e1nce tohoto identifik\u00e1toru:",
-		"eu": "Identifikadore ezberdin bat ere erabil dezakezu OpenID hornitzaile hau erabiltzeko. Horretarako <code>&lt;head&gt;<\/code> elementuari hurrengoa identifikadorearen orrian gehitu behar diozu:"
-	}
-}
diff --git a/modules/openidProvider/docs/provider.txt b/modules/openidProvider/docs/provider.txt
deleted file mode 100644
index 53dac6415aadc74d39f7b85a27be7ee9279ea038..0000000000000000000000000000000000000000
--- a/modules/openidProvider/docs/provider.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-OpenID provider support
-=======================
-
-simpleSAMLphp can act as an OpenID provider.
-This allows you to integrate OpenID into an existing IdP, or to add a bridge between OpenID and SAML 2.0.
-
-To use it, you need to enable the OpenID provider module:
-
-    touch modules/openidProvider/enable
-
-You must also edit the configuration file:
-
-    cp modules/openidProvider/config-template/module_openidProvider.php config/
-    "$EDITOR" config/module_openidProvider.php
-
-
-Options
--------
-
-The following options must be set in the configuration file:
-
-`auth`
-:   The authentication source that should be used to authenticate users who access the OpenID endpoint.
-    This can be any authentication source configured in `config/authsources.php`.
-
-:   To configure this as a bridge, set up a `saml` authentication source, and use that one.
-
-`username_attribute`
-:   The name of the attribute that contains the username of the user.
-
-
-`filestore`
-:   A path to a directory where the OpenID provider can save data.
-    This directory must be writeable by the web server.
-
-
-Testing
--------
-
-To test your provider, go to the authentication tab on the frontpage.
-There you will find a link to the OpenID provider.
-Click that link and log in.
-
-Once you are logged in, the OpenID identifier for your user will be displayed.
-Use that identifier with an OpenID consumer to test authentication.
-
-
-Delegation
-----------
-
-The OpenID identifier created by the simpleSAMLphp OpenID provider is quite long and hard to type.
-To use a simpler identifier, you can delegate accesses from the simple identifier to the OpenID provider.
-Your OpenID page will list two `<link>`-elements that you can add to any web page in order to turn it into your OpenID identifier.
-
-For example, to use `myid.example.org` as your OpeNID identifier, add the `<link>`-elements to the web page which handles `http://myid.example.org/`.
-
diff --git a/modules/openidProvider/hooks/hook_frontpage.php b/modules/openidProvider/hooks/hook_frontpage.php
deleted file mode 100644
index 8e2ef12238aed668f45476c86aefcc5270972c2c..0000000000000000000000000000000000000000
--- a/modules/openidProvider/hooks/hook_frontpage.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Hook to add the OpenID provider to the authentication tab.
- *
- * @param array &$links  The links on the frontpage, split into sections.
- */
-function openidProvider_hook_frontpage(&$links) {
-	assert('is_array($links)');
-	assert('array_key_exists("links", $links)');
-
-	$links['auth'][] = array(
-		'href' => SimpleSAML_Module::getModuleURL('openidProvider/user.php'),
-		'text' => '{openidProvider:openidProvider:title_no_user}',
-	);
-}
diff --git a/modules/openidProvider/lib/Server.php b/modules/openidProvider/lib/Server.php
deleted file mode 100644
index 7d0d18ea0f345a4ae901544231a1f3f3a130b1b0..0000000000000000000000000000000000000000
--- a/modules/openidProvider/lib/Server.php
+++ /dev/null
@@ -1,488 +0,0 @@
-<?php
-
-/*
- * Disable strict error reporting, since the OpenID library
- * used is PHP4-compatible, and not PHP5 strict-standards compatible.
- */
-SimpleSAML_Utilities::maskErrors(E_NOTICE | E_STRICT);
-if (defined('E_DEPRECATED')) {
-	/* PHP 5.3 also has E_DEPRECATED. */
-	SimpleSAML_Utilities::maskErrors(constant('E_DEPRECATED'));
-}
-
-/* Add the OpenID library search path. */
-set_include_path(get_include_path() . PATH_SEPARATOR . dirname(dirname(dirname(dirname(__FILE__)))) . '/lib');
-include_once  dirname(dirname(dirname(dirname(__FILE__)))) . '/lib/Auth/OpenID/SReg.php';
-include_once  dirname(dirname(dirname(dirname(__FILE__)))) . '/lib/Auth/OpenID/AX.php';
-
-/**
- * Helper class for the OpenID provider code.
- *
- * @package simpleSAMLphp
- */
-class sspmod_openidProvider_Server {
-
-	/**
-	 * The authentication source for this provider.
-	 *
-	 * @var SimpleSAML_Auth_Simple
-	 */
-	private $authSource;
-
-
-	/**
-	 * The attribute name where the username is stored.
-	 *
-	 * @var string
-	 */
-	private $usernameAttribute;
-
-  /**
-   * authproc configuration option
-   *
-   * @var array
-   */
-  private $authProc;
-  
-	/**
-	 * The OpenID server.
-	 *
-	 * @var Auth_OpenID_Server
-	 */
-	private $server;
-
-
-	/**
-	 * The directory which contains the trust roots for the users.
-	 *
-	 * @var string
-	 */
-	private $trustStoreDir;
-
-
-	/**
-	 * The instance of the OpenID provider class.
-	 *
-	 * @var sspmod_openidProvider_Server
-	 */
-	private static $instance;
-
-
-	/**
-	 * Retrieve the OpenID provider class.
-	 *
-	 * @return sspmod_openidProvider_Server  The OpenID Provider class.
-	 */
-	public static function getInstance() {
-
-		if (self::$instance === NULL) {
-			self::$instance = new sspmod_openidProvider_Server();
-		}
-		return self::$instance;
-	}
-
-
-	/**
-	 * The constructor for the OpenID provider class.
-	 *
-	 * Initializes and validates the configuration.
-	 */
-	private function __construct() {
-
-		$config = SimpleSAML_Configuration::getConfig('module_openidProvider.php');
-
-		$this->authSource = new SimpleSAML_Auth_Simple($config->getString('auth'));
-		$this->usernameAttribute = $config->getString('username_attribute');
-		$this->authProc = array( 'authproc' => $config->getArray('authproc', array()));
-
-		try {
-			$store = new Auth_OpenID_FileStore($config->getString('filestore'));
-			$this->server = new Auth_OpenID_Server($store, $this->getServerURL());
-		} catch (Exception $e) {
-			throw $e;
-		}
-
-		$this->trustStoreDir = realpath($config->getString('filestore')) . '/truststore';
-		if (!is_dir($this->trustStoreDir)) {
-			$res = mkdir($this->trustStoreDir, 0777, TRUE);
-			if (!$res) {
-				throw new SimpleSAML_Error_Exception('Failed to create directory: ' . $this->trustStoreDir);
-			}
-		}
-
-	}
-
-
-	/**
-	 * Retrieve the authentication source used by the OpenID Provider.
-	 *
-	 * @return SimpleSAML_Auth_Simple  The authentication source.
-	 */
-	public function getAuthSource() {
-
-		return $this->authSource;
-	}
-
-
-	/**
-	 * Retrieve the current user ID.
-	 *
-	 * @return string  The current user ID, or NULL if the user isn't authenticated.
-	 */
-	public function getUserId() {
-
-		if (!$this->authSource->isAuthenticated()) {
-			return NULL;
-		}
-
-		$attributes = $this->authSource->getAttributes();
-		if (!array_key_exists($this->usernameAttribute, $attributes)) {
-			throw new SimpleSAML_Error_Exception('Missing username attribute ' .
-				var_export($this->usernameAttribute, TRUE) . ' in the attributes of the user.');
-		}
-
-		$values = array_values($attributes[$this->usernameAttribute]);
-		if (empty($values)) {
-			throw new SimpleSAML_Error_Exception('Username attribute was empty.');
-		}
-		if (count($values) > 1) {
-			throw new SimpleSAML_Error_Exception('More than one attribute value in username.');
-		}
-
-		$userId = $values[0];
-		return $userId;
-	}
-
-
-	/**
-	 * Retrieve the current identity.
-	 *
-	 * @return string  The current identity, or NULL if the user isn't authenticated.
-	 */
-	public function getIdentity() {
-
-		$userId = $this->getUserId();
-		if ($userId === NULL) {
-			return NULL;
-		}
-
-		$identity = SimpleSAML_Module::getModuleURL('openidProvider/user.php/' . $userId);
-		return $identity;
-	}
-
-
-	/**
-	 * Retrieve the URL of the server.
-	 *
-	 * @return string  The URL of the OpenID server.
-	 */
-	public function getServerURL() {
-
-		return SimpleSAML_Module::getModuleURL('openidProvider/server.php');
-	}
-
-
-	/**
-	 * Get the file that contains the trust roots for the user.
-	 *
-	 * @param string $identity  The identity of the user.
-	 * @return string  The file name.
-	 */
-	private function getTrustFile($identity) {
-		assert('is_string($identity)');
-
-		$path = $this->trustStoreDir . '/' . sha1($identity) . '.serialized';
-		return $path;
-	}
-
-
-	/**
-	 * Get the sites the user trusts.
-	 *
-	 * @param string $identity  The identity of the user.
-	 * @param array $trustRoots  The trust roots the user trusts.
-	 */
-	public function saveTrustRoots($identity, array $trustRoots) {
-		assert('is_string($identity)');
-
-		$file = $this->getTrustFile($identity);
-		$tmpFile = $file . '.new.' . getmypid();
-
-		$data = serialize($trustRoots);
-
-		$ok = file_put_contents($tmpFile, $data);
-		if ($ok === FALSE) {
-			throw new SimpleSAML_Error_Exception('Failed to save file ' . var_export($tmpFile, TRUE));
-		}
-
-		$ok = rename($tmpFile, $file);
-		if ($ok === FALSE) {
-			throw new SimpleSAML_Error_Exception('Failed rename ' . var_export($tmpFile, TRUE) .
-				' to ' . var_export($file, TRUE) . '.');
-		}
-	}
-
-
-	/**
-	 * Get the sites the user trusts.
-	 *
-	 * @param string $identity  The identity of the user.
-	 * @return array  The trust roots the user trusts.
-	 */
-	public function getTrustRoots($identity) {
-		assert('is_string($identity)');
-
-		$file = $this->getTrustFile($identity);
-
-		if (!file_exists($file)) {
-			return array();
-		}
-
-		$data = file_get_contents($file);
-		if ($data === FALSE) {
-			throw new SimpleSAML_Error_Exception('Failed to load file ' .
-				var_export($file, TRUE). '.');
-		}
-
-		$data = unserialize($data);
-		if ($data === FALSE) {
-			throw new SimpleSAML_Error_Exception('Error unserializing trust roots from file ' .
-				var_export($file, TRUE) . '.');
-		}
-
-		return $data;
-	}
-
-
-	/**
-	 * Add the given trust root to the user.
-	 *
-	 * @param string $identity  The identity of the user.
-	 * @param string $trustRoot  The trust root.
-	 */
-	public function addTrustRoot($identity, $trustRoot) {
-		assert('is_string($identity)');
-		assert('is_string($trustRoot)');
-
-		$trs = $this->getTrustRoots($identity);
-		if (!in_array($trustRoot, $trs, TRUE)) {
-			$trs[] = $trustRoot;
-		}
-
-		$this->saveTrustRoots($identity, $trs);
-	}
-
-
-	/**
-	 * Remove the given trust root from the trust list of the user.
-	 *
-	 * @param string $identity  The identity of the user.
-	 * @param string $trustRoot  The trust root.
-	 */
-	public function removeTrustRoot($identity, $trustRoot) {
-		assert('is_string($identity)');
-		assert('is_string($trustRoot)');
-
-		$trs = $this->getTrustRoots($identity);
-
-		$i = array_search($trustRoot, $trs, TRUE);
-		if ($i === FALSE) {
-			return;
-		}
-		array_splice($trs, $i, 1, array());
-		$this->saveTrustRoots($identity, $trs);
-	}
-
-
-	/**
-	 * Is the given trust root trusted by the user?
-	 *
-	 * @param string $identity  The identity of the user.
-	 * @param string $trustRoot  The trust root.
-	 * @return TRUE if it is trusted, FALSE if not.
-	 */
-	private function isTrusted($identity, $trustRoot) {
-		assert('is_string($identity)');
-		assert('is_string($trustRoot)');
-
-		$trs = $this->getTrustRoots($identity);
-		return in_array($trustRoot, $trs, TRUE);
-	}
-
-
-	/**
-	 * Save the state, and return a URL that can contain a reference to the state.
-	 *
-	 * @param string $page  The name of the page.
-	 * @param array $state  The state array.
-	 * @return string  A URL with the state ID as a parameter.
-	 */
-	private function getStateURL($page, array $state) {
-		assert('is_string($page)');
-
-		$stateId = SimpleSAML_Auth_State::saveState($state, 'openidProvider:resumeState');
-		$stateURL = SimpleSAML_Module::getModuleURL('openidProvider/' . $page);
-		$stateURL = SimpleSAML_Utilities::addURLparameter($stateURL, array('StateID' => $stateId));
-
-		return $stateURL;
-	}
-
-
-	/**
-	 * Retrieve state by ID.
-	 *
-	 * @param string $stateId  The state ID.
-	 * @return array  The state array.
-	 */
-	public function loadState($stateId) {
-		assert('is_string($stateId)');
-
-		// sanitize the input
-		$sid = SimpleSAML_Utilities::parseStateID($stateId);
-		if (!is_null($sid['url'])) {
-			SimpleSAML_Utilities::checkURLAllowed($sid['url']);
-		}
-
-		return SimpleSAML_Auth_State::loadState($stateId, 'openidProvider:resumeState');
-	}
-
-
-	/**
-	 * Send an OpenID response.
-	 *
-	 * This function never returns.
-	 *
-	 * @param Auth_OpenID_ServerResponse $response  The response.
-	 */
-	private function sendResponse(Auth_OpenID_ServerResponse $response) {
-
-		SimpleSAML_Logger::debug('openidProvider::sendResponse');
-
-		$webresponse = $this->server->encodeResponse($response);
-
-		if ($webresponse->code !== 200) {
-			header('HTTP/1.1 ' . $webresponse->code, TRUE, $webresponse->code);
-		}
-
-		foreach ($webresponse->headers as $k => $v) {
-			header($k . ': ' . $v);
-		}
-		header('Connection: Close');
-
-		print($webresponse->body);
-		exit(0);
-	}
-
-
-	/**
-	 * Process a request.
-	 *
-	 * This function never returns.
-	 *
-	 * @param Auth_OpenID_Request $request  The request we are processing.
-	 */
-	public function processRequest(array $state) {
-		assert('isset($state["request"])');
-
-		$request = $state['request'];
-
-    	$sreg_req = Auth_OpenID_SRegRequest::fromOpenIDRequest($request);
-    	$ax_req = Auth_OpenId_AX_FetchRequest::fromOpenIDRequest($request);
-    
-     	/* In resume.php there should be a way to display data requested through sreg or ax. */
-
-		if (!$this->authSource->isAuthenticated()) {
-			if ($request->immediate) {
-				/* Not logged in, and we cannot show a login form. */
-				$this->sendResponse($request->answer(FALSE));
-			}
-
-			$resumeURL = $this->getStateURL('resume.php', $state);
-			$this->authSource->requireAuth(array('ReturnTo' => $resumeURL));
-		}
-
-		$identity = $this->getIdentity();
-		assert('$identity !== FALSE'); /* Should always be logged in here. */
-
-		if (!$request->idSelect() && $identity !== $request->identity) {
-			/* The identity in the request doesn't match the one of the logged in user. */
-			throw new SimpleSAML_Error_Exception('Logged in as different user than the one requested.');
-		}
-
-		if ($this->isTrusted($identity, $request->trust_root)) {
-			$trusted = TRUE;
-		} elseif (isset($state['TrustResponse'])) {
-			$trusted = (bool)$state['TrustResponse'];
-		} else {
-			if ($request->immediate) {
-				/* Not trusted, and we cannot show a trust-form. */
-				$this->sendResponse($request->answer(FALSE));
-			}
-
-			$trustURL = $this->getStateURL('trust.php', $state);
-			SimpleSAML_Utilities::redirectTrustedURL($trustURL);
-		}
-
-		if (!$trusted) {
-			/* The user doesn't trust this site. */
-			$this->sendResponse($request->answer(FALSE));
-		}
-      
-    	$response = $request->answer(TRUE, NULL, $identity);
-
-    	//Process attributes
-    	$attributes = $this->authSource->getAttributes();
-    	foreach ($attributes as $key=>$attr) {
-            if (is_array($attr) && count($attr) === 1) {
-                    $attributes[$key] = $attr[0];
-            }
-    	}
-
-    	$pc = new SimpleSAML_Auth_ProcessingChain($this->authProc, array(), 'idp');
-    	$state = array(
-            'Attributes'=>$attributes,
-            'isPassive'=>TRUE
-    	);
-
-    	$pc->processStatePassive($state);
-    	$attributes = $state['Attributes'];
-
-    	//Process SREG requests
-    	$sreg_resp = Auth_OpenID_SRegResponse::extractResponse($sreg_req, $attributes);
-    	$sreg_resp->toMessage($response->fields);
-
-    	//Process AX requests
-    	$ax_resp = new Auth_OpenID_AX_FetchResponse();
-    	foreach($ax_req->iterTypes() as $type_uri) {
-            if(isset($attributes[$type_uri])) {
-                    $ax_resp->addValue($type_uri, $attributes[$type_uri]);
-            }
-    	}
-    	$ax_resp->toMessage($response->fields);
-
-		/* The user is authenticated, and trusts this site. */
-		$this->sendResponse($response);
-	}
-
-
-	/**
-	 * Receive an incoming request.
-	 *
-	 * This function never returns.
-	 */
-	public function receiveRequest() {
-
-		$request = $this->server->decodeRequest();
-
-		if (!in_array($request->mode, array('checkid_immediate', 'checkid_setup'), TRUE)) {
-			$this->sendResponse($this->server->handleRequest($request));
-		}
-
-		$state = array(
-			'request' => $request,
-		);
-
-		$this->processRequest($state);
-	}
-
-}
diff --git a/modules/openidProvider/templates/trust.tpl.php b/modules/openidProvider/templates/trust.tpl.php
deleted file mode 100644
index 5cbb595335424957910f2c7f54aeccef469e38ea..0000000000000000000000000000000000000000
--- a/modules/openidProvider/templates/trust.tpl.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-$this->includeAtTemplateBase('includes/header.php');
-?>
-
-<div class="form">
-<?php
-$params = array(
-	'%SITEURL%' => '<code>' . htmlspecialchars($this->data['trustRoot']) . '</code>',
-	);
-echo('<p>' . $this->t('{openidProvider:openidProvider:confirm_question}', $params) . '</p>');
-?>
-<form method="post" action="?">
-<input type="hidden" name="StateID" value="<?php echo htmlspecialchars($this->data['StateID']); ?>" />
-
-<input type="checkbox" name="TrustRemember" value="on" id="remember" />
-<label for="TrustRemember"><?php echo($this->t('{openidProvider:openidProvider:remember}')); ?></label>
-<br />
-
-<input type="submit" name="TrustYes" value="<?php echo($this->t('{openidProvider:openidProvider:confirm}')); ?>" />
-<input type="submit" name="TrustNo" value="<?php echo($this->t('{openidProvider:openidProvider:notconfirm}')); ?>" />
-
-</form>
-</div>
-
-<?php
-$this->includeAtTemplateBase('includes/footer.php');
-?>
\ No newline at end of file
diff --git a/modules/openidProvider/templates/user.tpl.php b/modules/openidProvider/templates/user.tpl.php
deleted file mode 100644
index 9e466e87a35eb0ef28d4c25be3637dbf4f9a5be8..0000000000000000000000000000000000000000
--- a/modules/openidProvider/templates/user.tpl.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-$identity = $this->data['identity'];
-$loggedInAs = $this->data['loggedInAs'];
-$loginURL = $this->data['loginURL'];
-$logoutURL = $this->data['logoutURL'];
-$ownPage = $this->data['ownPage'];
-$serverURL = $this->data['serverURL'];
-$trustedSites = $this->data['trustedSites'];
-$userId = $this->data['userId'];
-$userIdURL = $this->data['userIdURL'];
-$xrdsURL = $this->data['xrdsURL'];
-
-header('X-XRDS-Location: ' . $xrdsURL);
-
-if ($userId !== FALSE) {
-	$title = $this->t('{openidProvider:openidProvider:title_user}', array('%USERID%' => htmlspecialchars($userId)));
-} else {
-	$title = $this->t('{openidProvider:openidProvider:title_no_user}');
-}
-
-$serverLink = '<link rel="openid.server" href="' . htmlspecialchars($serverURL) . '" />' . "\n";
-$serverLink .= '<link rel="openid2.provider" href="' . htmlspecialchars($serverURL) . '" />';
-$delegateLink = '<link rel="openid.delegate" href="' . htmlspecialchars($userIdURL) . '" />' . "\n";
-$delegateLink .= '<link rel="openid2.local_id" href="' . htmlspecialchars($userIdURL) . '" />';
-
-$this->data['header'] = $title;
-$this->data['head'] = $serverLink;
-$this->includeAtTemplateBase('includes/header.php');
-
-echo('<h2>' . $title . '</h2>');
-
-if ($userId !== FALSE) {
-	echo('<p>' . $this->t('{openidProvider:openidProvider:user_page_for}', array('%USERID%' => htmlspecialchars($userId))) . '</p>');
-}
-
-if ($loggedInAs === NULL) {
-	echo('<p><a href="' . htmlspecialchars($loginURL) . '">' . $this->t('{openidProvider:openidProvider:login_view_own_page}') . '</a></p>');
-} elseif (!$ownPage) {
-	echo('<p><a href="' . htmlspecialchars($identity) . '">' . $this->t('{openidProvider:openidProvider:view_own_page}') . '</a></p>');
-}
-
-if ($ownPage) {
-
-
-	echo('<h3>Using your OpenID</h3>');
-	echo('<p>');
-	echo($this->t('{openidProvider:openidProvider:your_identifier}') . '<br />');
-	echo('<code>' . htmlspecialchars($userIdURL) . '</code>');
-	echo('</p>');
-	echo('<p>');
-	echo($this->t('{openidProvider:openidProvider:howto_delegate}'));
-	echo('<br />');
-	echo('<pre>' . htmlspecialchars($serverLink) . "\n" . htmlspecialchars($delegateLink) . '</pre>');
-	echo('</p>');
-
-	echo('<h3>' . $this->t('{openidProvider:openidProvider:trustlist_trustedsites}') . '</h3>');
-	if (count($trustedSites) > 0) {
-		echo('<div class="form">');
-		echo('<form method="post" action="?">');
-		echo('<ul>');
-
-		foreach ($trustedSites as $site) {
-			echo '<li>';
-			echo '<input type="submit" name="remove_' . bin2hex($site) .
-				'" value="' . $this->t('{openidProvider:openidProvider:trustlist_remove}') . '" />';
-			echo ' <code>' . htmlspecialchars($site) . '</code>';
-			echo '</li>';
-		}
-		echo('</ul>');
-		echo('</form>');
-		echo('</div>');
-	} else {
-		echo('<p>' . $this->t('{openidProvider:openidProvider:trustlist_nosites}') . '</p>');
-	}
-
-	echo('<h3>' . $this->t('{openidProvider:openidProvider:logout_title}') . '</h3>');
-	echo('<p><a href="' . htmlspecialchars($logoutURL) . '">' . $this->t('{openidProvider:openidProvider:logout}') . '</a></p>');
-}
-
-$this->includeAtTemplateBase('includes/footer.php');
-?>
\ No newline at end of file
diff --git a/modules/openidProvider/www/resume.php b/modules/openidProvider/www/resume.php
deleted file mode 100644
index 7d09be588d27a9c0e6833a0d703357934b9542da..0000000000000000000000000000000000000000
--- a/modules/openidProvider/www/resume.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if (!is_string($_REQUEST['StateID'])) {
-	throw new SimpleSAML_Error_BadRequest('Missing StateID-parameter');
-}
-
-$server = sspmod_openidProvider_Server::getInstance();
-$state = $server->loadState($_REQUEST['StateID']);
-$server->processRequest($state);
diff --git a/modules/openidProvider/www/server.php b/modules/openidProvider/www/server.php
deleted file mode 100644
index 4d06c1ae69f9d1abe874c4d7b71ac29a41d63695..0000000000000000000000000000000000000000
--- a/modules/openidProvider/www/server.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-SimpleSAML_Logger::info('OpenID - Provider: Accessing OpenID Provider endpoint');
-
-$server = sspmod_openidProvider_Server::getInstance();
-$server->receiveRequest();
diff --git a/modules/openidProvider/www/trust.php b/modules/openidProvider/www/trust.php
deleted file mode 100644
index a48d05ab3361819948f53c80792578623d04ab6f..0000000000000000000000000000000000000000
--- a/modules/openidProvider/www/trust.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-if (!is_string($_REQUEST['StateID'])) {
-	throw new SimpleSAML_Error_BadRequest('Missing StateID-parameter.');
-}
-$StateID = $_REQUEST['StateID'];
-
-$server = sspmod_openidProvider_Server::getInstance();
-$state = $server->loadState($_REQUEST['StateID']);
-
-$trustRoot = $state['request']->trust_root;
-$identity = $server->getIdentity();
-if ($identity === NULL) {
-	$server->processRequest($state);
-}
-
-
-if (isset($_REQUEST['TrustYes'])) {
-	if (isset($_REQUEST['TrustRemember'])) {
-		$server->addTrustRoot($identity, $trustRoot);
-	}
-
-	$state['TrustResponse'] = TRUE;
-	$server->processRequest($state);
-}
-
-if (isset($_REQUEST['TrustNo'])) {
-	$state['TrustResponse'] = FALSE;
-	$server->processRequest($state);
-}
-
-$globalConfig = SimpleSAML_Configuration::getInstance();
-$t = new SimpleSAML_XHTML_Template($globalConfig, 'openidProvider:trust.tpl.php');
-$t->data['StateID'] = $_REQUEST['StateID'];
-$t->data['trustRoot'] = $trustRoot;
-$t->show();
diff --git a/modules/openidProvider/www/user.php b/modules/openidProvider/www/user.php
deleted file mode 100644
index 74aa1a7c822bcb2d40be445e6a70e6efeeec7b96..0000000000000000000000000000000000000000
--- a/modules/openidProvider/www/user.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-if (isset($_SERVER['PATH_INFO'])) {
-	$userId = substr($_SERVER['PATH_INFO'], 1);
-} else {
-	$userId = FALSE;
-}
-
-$globalConfig = SimpleSAML_Configuration::getInstance();
-$server = sspmod_openidProvider_Server::getInstance();
-$identity = $server->getIdentity();
-
-if (!$userId && $identity) {
-	/*
-	 * We are accessing the front-page, but are logged in.
-	 * Redirect to the correct page.
-	 */
-	SimpleSAML_Utilities::redirectTrustedURL($identity);
-}
-
-/* Determine whether we are at the users own page. */
-if ($userId && $userId === $server->getUserId()) {
-	$ownPage = TRUE;
-} else {
-	$ownPage = FALSE;
-}
-
-if ($_SERVER['REQUEST_METHOD'] === 'POST') {
-	if ($ownPage) {
-		foreach ($_POST as $k => $v) {
-			$op = explode('_', $k, 2);
-			if (count($op) == 1 || $op[0] !== 'remove') {
-				continue;
-			}
-
-			$site = $op[1];
-			$site = pack("H*" , $site);
-			$server->removeTrustRoot($identity, $site);
-		}
-	}
-
-	SimpleSAML_Utilities::redirectTrustedURL($identity);
-}
-
-if ($ownPage) {
-	$trustedSites = $server->getTrustRoots($identity);
-} else {
-	$trustedSites = array();
-}
-
-$userBase = SimpleSAML_Module::getModuleURL('openidProvider/user.php');
-
-$xrds = SimpleSAML_Module::getModuleURL('openidProvider/xrds.php');
-if ($userId !== FALSE) {
-	$xrds = SimpleSAML_Utilities::addURLparameter($xrds, array('user' => $userId));
-}
-
-$as = $server->getAuthSource();
-$t = new SimpleSAML_XHTML_Template($globalConfig, 'openidProvider:user.tpl.php');
-$t->data['identity'] = $identity;
-$t->data['loggedInAs'] = $server->getUserId();
-$t->data['loginURL'] = $as->getLoginURL($userBase);
-$t->data['logoutURL'] = $as->getLogoutURL();
-$t->data['ownPage'] = $ownPage;
-$t->data['serverURL'] = $server->getServerURL();
-$t->data['trustedSites'] = $trustedSites;
-$t->data['userId'] = $userId;
-$t->data['userIdURL'] = $userBase . '/' . $userId;
-$t->data['xrdsURL'] = $xrds;
-
-$t->show();
-exit(0);
diff --git a/modules/openidProvider/www/xrds.php b/modules/openidProvider/www/xrds.php
deleted file mode 100644
index 6fd6daa6d9c8e3a378409647fbe579897016c124..0000000000000000000000000000000000000000
--- a/modules/openidProvider/www/xrds.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * This endpoint returns an XRDS document describing this server.
- *
- * @package simpleSAMLphp
- */
-
-if (isset($_REQUEST['user'])) {
-	$user = (string)$_REQUEST['user'];
-	$serviceTypes = array(
-		'http://specs.openid.net/auth/2.0/signon',
-		'http://openid.net/server/1.0',
-		'http://openid.net/server/1.1',
-	);
-} else {
-	$user = NULL;
-	$serviceTypes = array(
-		'http://specs.openid.net/auth/2.0/server',
-	);
-}
-
-$server = sspmod_openidProvider_Server::getInstance();
-
-$serverURL = $server->getServerURL();
-
-header('Content-Type: application/xrds+xml');
-
-echo('<?xml version="1.0" encoding="UTF-8"?>' . "\n");
-echo('<xrds:XRDS xmlns:xrds="xri://$xrds" xmlns="xri://$xrd*($v*2.0)">');
-echo('<XRD>');
-echo('<Service priority="0">');
-
-foreach ($serviceTypes as $t) {
-	echo('<Type>' . htmlspecialchars($t) . '</Type>');
-}
-
-echo('<URI>' . htmlspecialchars($serverURL) . '</URI>');
-
-if ($user !== NULL) {
-	$localId = SimpleSAML_Module::getModuleURL('openidProvider/user.php') . '/' . $user;
-	echo('<LocalID>' . htmlspecialchars($localId) . '</LocalID>');
-}
-
-echo('</Service>');
-echo('</XRD>');
-echo('</xrds:XRDS>');