From 0cebcd78aef347a41e29e233018a64648c2dfd2a Mon Sep 17 00:00:00 2001
From: Per Christian Moen <per.christian.moen@nav.no>
Date: Fri, 30 Aug 2024 10:41:44 +0200
Subject: [PATCH] Fjerner ubrukte bussgrensesnitt

---
 psak-esb-wsclient-legacy/pom.xml              | 139 ---------
 ...renasakWSEXP_PSAKArenasakHttp_Service.wsdl |  25 --
 ...ragsakWSEXP_PSAKBidragsakHttp_Service.wsdl |  25 --
 ...DokBrevSCAEXP_PSAKDokBrevHttp_Service.wsdl |  22 --
 ...ullmaktWSEXP_PSAKFullmaktHttp_Service.wsdl |  67 ----
 ...elseWSEXP_PSAKHenvendelseHttp_Service.wsdl | 127 --------
 ...ndlerWSEXP_PSAKSamhandlerHttp_Service.wsdl |  70 -----
 ...sopphold_PSAKInstitusjonsoppholdWSEXP.wsdl |  61 ----
 ...psak-navorgenhet_PSAKNAVOrgEnhetWSEXP.wsdl | 118 --------
 .../wsdl/no/nav/inf/PSAKArenasak.wsdl         |  41 ---
 .../wsdl/no/nav/inf/PSAKBidragsak.wsdl        |  41 ---
 .../wsdl/no/nav/inf/PSAKDokBrev.wsdl          |  35 ---
 .../wsdl/no/nav/inf/PSAKFullmakt.wsdl         | 140 ---------
 .../wsdl/no/nav/inf/PSAKHenvendelse.wsdl      | 285 ------------------
 .../no/nav/inf/PSAKInstitusjonsopphold.wsdl   | 121 --------
 .../wsdl/no/nav/inf/PSAKNAVOrgEnhet.wsdl      | 255 ----------------
 .../wsdl/no/nav/inf/PSAKSamhandler.wsdl       | 146 ---------
 .../psakpselv/asbo/ASBOPenUnderkategori.xsd   |   8 -
 .../asbo/bidragsak/ASBOPenForskuddSak.xsd     |  15 -
 .../bidragsak/ASBOPenHentForskuddRequest.xsd  |   9 -
 .../brev/ASBOPenHentBrevklientURLRequest.xsd  |  13 -
 .../brev/ASBOPenHentBrevklientURLResponse.xsd |   8 -
 .../asbo/fullmakt/ASBOPenFullmakt.xsd         |  26 --
 .../asbo/fullmakt/ASBOPenFullmaktListe.xsd    |   9 -
 .../ASBOPenHentFullmaktListeRequest.xsd       |   9 -
 .../asbo/henvendelse/ASBOPenData.xsd          |   8 -
 .../ASBOPenHentStatistikkRequest.xsd          |  10 -
 .../asbo/henvendelse/ASBOPenHenvendelse.xsd   |  31 --
 .../henvendelse/ASBOPenHenvendelseListe.xsd   |   9 -
 .../asbo/henvendelse/ASBOPenStatistikk.xsd    |  12 -
 .../henvendelse/ASBOPenStatistikkElement.xsd  |   9 -
 .../ASBOPenInstitusjon.xsd                    |  25 --
 .../ASBOPenInstitusjonsOpphold.xsd            |  16 -
 .../ASBOPenFinnArenaNAVEnhetListeRequest.xsd  |  13 -
 .../ASBOPenFinnNAVEnhetRequest.xsd            |   9 -
 ...ForvaltningsenhetTilPersonListeRequest.xsd |  10 -
 .../ASBOPenHentNAVEnhetListeRequest.xsd       |  11 -
 ...SBOPenHentSpesialEnhetTilPersonRequest.xsd |   9 -
 .../asbo/navorgenhet/ASBOPenNAVEnhet.xsd      |  19 --
 .../asbo/navorgenhet/ASBOPenNAVEnhetListe.xsd |   9 -
 .../psakpselv/asbo/oppgave/ASBOPenOppgave.xsd |  39 ---
 .../asbo/oppgave/ASBOPenOppgaveId.xsd         |   8 -
 .../asbo/samhandler/ASBOPenAlternativId.xsd   |  12 -
 .../asbo/samhandler/ASBOPenAvdeling.xsd       |  39 ---
 .../ASBOPenFinnSamhandlerRequest.xsd          |  11 -
 .../ASBOPenHentSamhandlerRequest.xsd          |   9 -
 .../asbo/samhandler/ASBOPenKonto.xsd          |  15 -
 .../asbo/samhandler/ASBOPenSamhandler.xsd     |  17 --
 .../samhandler/ASBOPenSamhandlerListe.xsd     |   9 -
 .../fullmakt/FaultPenFullmaktIkkeFunnet.xsd   |  11 -
 .../FaultPenHenvendelseIkkeFunnet.xsd         |  11 -
 .../FaultPenFnrIkkeFunnet.xsd                 |  11 -
 .../FaultPenInstitusjonsoppholdIkkeFunnet.xsd |  11 -
 .../FaultPenOppholdPeriodeIdIkkeFunnet.xsd    |  11 -
 .../FaultPenNAVEnhetIkkeFunnet.xsd            |  11 -
 .../FaultPenPersonManglerEnhet.xsd            |  13 -
 .../FaultPenOffentligIdIkkeFunnet.xsd         |  11 -
 .../FaultPenSamhandlerIkkeFunnet.xsd          |  11 -
 58 files changed, 2275 deletions(-)
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/PSAKArenasakWSEXP_PSAKArenasakHttp_Service.wsdl
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/PSAKBidragsakWSEXP_PSAKBidragsakHttp_Service.wsdl
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/PSAKDokBrevSCAEXP_PSAKDokBrevHttp_Service.wsdl
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/PSAKFullmaktWSEXP_PSAKFullmaktHttp_Service.wsdl
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/PSAKHenvendelseWSEXP_PSAKHenvendelseHttp_Service.wsdl
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/PSAKSamhandlerWSEXP_PSAKSamhandlerHttp_Service.wsdl
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/nav-cons-pen-psak-institusjonsopphold_PSAKInstitusjonsoppholdWSEXP.wsdl
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/nav-cons-pen-psak-navorgenhet_PSAKNAVOrgEnhetWSEXP.wsdl
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKArenasak.wsdl
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKBidragsak.wsdl
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKDokBrev.wsdl
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKFullmakt.wsdl
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKHenvendelse.wsdl
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKInstitusjonsopphold.wsdl
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKNAVOrgEnhet.wsdl
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKSamhandler.wsdl
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/ASBOPenUnderkategori.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/bidragsak/ASBOPenForskuddSak.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/bidragsak/ASBOPenHentForskuddRequest.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/brev/ASBOPenHentBrevklientURLRequest.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/brev/ASBOPenHentBrevklientURLResponse.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/fullmakt/ASBOPenFullmakt.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/fullmakt/ASBOPenFullmaktListe.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/fullmakt/ASBOPenHentFullmaktListeRequest.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/henvendelse/ASBOPenData.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/henvendelse/ASBOPenHentStatistikkRequest.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/henvendelse/ASBOPenHenvendelse.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/henvendelse/ASBOPenHenvendelseListe.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/henvendelse/ASBOPenStatistikk.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/henvendelse/ASBOPenStatistikkElement.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/institusjonsopphold/ASBOPenInstitusjon.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/institusjonsopphold/ASBOPenInstitusjonsOpphold.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/navorgenhet/ASBOPenFinnArenaNAVEnhetListeRequest.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/navorgenhet/ASBOPenFinnNAVEnhetRequest.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/navorgenhet/ASBOPenHentForvaltningsenhetTilPersonListeRequest.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/navorgenhet/ASBOPenHentNAVEnhetListeRequest.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/navorgenhet/ASBOPenHentSpesialEnhetTilPersonRequest.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/navorgenhet/ASBOPenNAVEnhet.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/navorgenhet/ASBOPenNAVEnhetListe.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/oppgave/ASBOPenOppgave.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/oppgave/ASBOPenOppgaveId.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/samhandler/ASBOPenAlternativId.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/samhandler/ASBOPenAvdeling.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/samhandler/ASBOPenFinnSamhandlerRequest.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/samhandler/ASBOPenHentSamhandlerRequest.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/samhandler/ASBOPenKonto.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/samhandler/ASBOPenSamhandler.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/samhandler/ASBOPenSamhandlerListe.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/fullmakt/FaultPenFullmaktIkkeFunnet.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/henvendelse/FaultPenHenvendelseIkkeFunnet.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/institusjonsopphold/FaultPenFnrIkkeFunnet.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/institusjonsopphold/FaultPenInstitusjonsoppholdIkkeFunnet.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/institusjonsopphold/FaultPenOppholdPeriodeIdIkkeFunnet.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/navorgenhet/FaultPenNAVEnhetIkkeFunnet.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/navorgenhet/FaultPenPersonManglerEnhet.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/samhandler/FaultPenOffentligIdIkkeFunnet.xsd
 delete mode 100644 psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/samhandler/FaultPenSamhandlerIkkeFunnet.xsd

diff --git a/psak-esb-wsclient-legacy/pom.xml b/psak-esb-wsclient-legacy/pom.xml
index eda05a2..605a242 100644
--- a/psak-esb-wsclient-legacy/pom.xml
+++ b/psak-esb-wsclient-legacy/pom.xml
@@ -45,39 +45,6 @@
                             <wsdlOptions>
                                 <!-- -nexclude is used to reuse PCOM versions of certain common types -->
 
-                                <!-- PSAK Fullmakt -->
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/PSAKFullmaktWSEXP_PSAKFullmaktHttp_Service.wsdl</wsdl>
-                                    <extraargs>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-cons-pen-psak-fullmakt/no/nav/inf=no.nav.inf.psak.fullmakt</extraarg>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-cons-pen-psak-fullmakt/no/nav/inf/Binding=no.nav.inf.psak.fullmakt</extraarg>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/fullmakt=no.nav.lib.pen.psakpselv.asbo.fullmakt</extraarg>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/fullmakt=no.nav.lib.pen.psakpselv.fault.fullmakt</extraarg>
-                                    </extraargs>
-                                </wsdlOption>
-
-                                <!-- PSAK NAVOrgEnhet -->
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/nav-cons-pen-psak-navorgenhet_PSAKNAVOrgEnhetWSEXP.wsdl
-                                    </wsdl>
-                                    <extraargs>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-cons-pen-psak-navorgenhet/no/nav/inf=no.nav.inf.psak.navorgenhet</extraarg>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-cons-pen-psak-navorgenhet/no/nav/inf/Binding=no.nav.inf.psak.navorgenhet</extraarg>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/navorgenhet=no.nav.lib.pen.psakpselv.asbo.navorgenhet</extraarg>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo=no.nav.lib.pen.psakpselv.asbo</extraarg>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/navorgenhet=no.nav.lib.pen.psakpselv.fault.navorgenhet</extraarg>
-                                    </extraargs>
-                                </wsdlOption>
-
                                 <!-- PSAK Person -->
                                 <wsdlOption>
                                     <wsdl>${basedir}/src/main/resources/wsdl/nav-cons-pen-psak-person_PSAKPersonWSEXP.wsdl</wsdl>
@@ -129,53 +96,6 @@
                                     </extraargs>
                                 </wsdlOption>
 
-                                <!-- PSAK Institusjonsopphold -->
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/nav-cons-pen-psak-institusjonsopphold_PSAKInstitusjonsoppholdWSEXP.wsdl</wsdl>
-                                    <extraargs>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-cons-pen-psak-institusjonsopphold/no/nav/inf=no.nav.inf.psak.instopphold</extraarg>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-cons-pen-psak-institusjonsopphold/no/nav/inf/Binding=no.nav.inf.psak.instopphold</extraarg>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/institusjonsopphold=no.nav.lib.pen.psakpselv.asbo.institusjonsopphold</extraarg>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo=no.nav.lib.pen.psakpselv.asbo</extraarg>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/institusjonsopphold=no.nav.lib.pen.psakpselv.fault.institusjonsopphold</extraarg>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/samhandler=no.nav.lib.pen.psakpselv.fault.samhandler</extraarg>
-                                    </extraargs>
-                                </wsdlOption>
-
-                                <!-- PSAK Arenasak -->
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/PSAKArenasakWSEXP_PSAKArenasakHttp_Service.wsdl</wsdl>
-                                    <extraargs>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-cons-pen-psak-arenasak/no/nav/inf=no.nav.inf.psak.arenasak</extraarg>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-cons-pen-psak-arenasak/no/nav/inf/Binding=no.nav.inf.psak.arenasak</extraarg>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/arenasak=no.nav.lib.pen.psakpselv.asbo.arenasak</extraarg>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo=no.nav.lib.pen.psakpselv.asbo</extraarg>
-                                    </extraargs>
-                                </wsdlOption>
-
-                                <!-- PSAK Bidragsak -->
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/PSAKBidragsakWSEXP_PSAKBidragsakHttp_Service.wsdl</wsdl>
-                                    <extraargs>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-cons-pen-psak-bidragsak/no/nav/inf=no.nav.inf.psak.bidragsak</extraarg>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-cons-pen-psak-bidragsak/no/nav/inf/Binding=no.nav.inf.psak.bidragsak</extraarg>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/bidragsak=no.nav.lib.pen.psakpselv.asbo.bidragsak</extraarg>
-                                    </extraargs>
-                                </wsdlOption>
-
                                 <!-- PSAK Infotrygdsak -->
                                 <wsdlOption>
                                     <wsdl>${basedir}/src/main/resources/wsdl/PSAKInfotrygdsakWSEXP_PSAKInfotrygdsakHttp_Service.wsdl</wsdl>
@@ -191,65 +111,6 @@
                                     </extraargs>
                                 </wsdlOption>
 
-                                <!-- PSAK DokBrev -->
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/PSAKDokBrevSCAEXP_PSAKDokBrevHttp_Service.wsdl</wsdl>
-                                    <extraargs>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-cons-pen-psak-dokbrev/no/nav/inf/PSAKDokBrev=no.nav.inf.psak.dokbrev</extraarg>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-cons-pen-psak-dokbrev/no/nav/inf/PSAKDokBrev/Binding=no.nav.inf.psak.dokbrev</extraarg>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/brev=no.nav.lib.pen.psakpselv.asbo.brev</extraarg>
-                                    </extraargs>
-                                </wsdlOption>
-
-                                <!-- Enhet -->
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/no/nav/virksomhet/tjenester/enhet/v1/Binding.wsdl</wsdl>
-                                </wsdlOption>
-
-                                <!-- PSAK Henvendelse (due to PCOM stuff) -->
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/PSAKHenvendelseWSEXP_PSAKHenvendelseHttp_Service.wsdl</wsdl>
-                                    <extraargs>
-                                        <extraarg>-xjc-Xbg</extraarg>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-cons-pen-psak-henvendelse/no/nav/inf=no.nav.inf.psak.henvendelse</extraarg>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-cons-pen-psak-henvendelse/no/nav/inf/Binding=no.nav.inf.psak.henvendelse</extraarg>
-                                        <extraarg>-nexclude</extraarg>
-                                        <extraarg>http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/henvendelse=no.nav.lib.pen.psakpselv.asbo.henvendelse</extraarg>
-                                        <extraarg>-nexclude</extraarg>
-                                        <extraarg>http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/oppgave=no.nav.lib.pen.psakpselv.asbo.oppgave</extraarg>
-                                        <extraarg>-nexclude</extraarg>
-                                        <extraarg>http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo=no.nav.lib.pen.psakpselv.asbo</extraarg>
-                                        <extraarg>-nexclude</extraarg>
-                                        <extraarg>http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault=no.nav.lib.pen.psakpselv.fault</extraarg>
-                                        <extraarg>-nexclude</extraarg>
-                                        <extraarg>http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/henvendelse=no.nav.lib.pen.psakpselv.fault.henvendelse</extraarg>
-                                    </extraargs>
-                                </wsdlOption>
-
-                                <!-- PSAK Samhandler (domain in pcom) -->
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/PSAKSamhandlerWSEXP_PSAKSamhandlerHttp_Service.wsdl</wsdl>
-                                    <extraargs>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-cons-pen-psak-samhandler/no/nav/inf=no.nav.inf.psak.samhandler</extraarg>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>http://nav-cons-pen-psak-samhandler/no/nav/inf/Binding=no.nav.inf.psak.samhandler</extraarg>
-                                        <extraarg>-nexclude</extraarg>
-                                        <extraarg>http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo=no.nav.lib.pen.psakpselv.asbo</extraarg>
-                                        <extraarg>-nexclude</extraarg>
-                                        <extraarg>http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/samhandler=no.nav.lib.pen.psakpselv.asbo.samhandler</extraarg>
-                                        <extraarg>-nexclude</extraarg>
-                                        <extraarg>http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault=no.nav.lib.pen.psakpselv.fault</extraarg>
-                                        <extraarg>-nexclude</extraarg>
-                                        <extraarg>http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/samhandler=no.nav.lib.pen.psakpselv.fault.samhandler</extraarg>
-                                    </extraargs>
-                                </wsdlOption>
-
                                 <!-- PSAK Samordning (domain in pcom) -->
                                 <wsdlOption>
                                     <wsdl>${basedir}/src/main/resources/wsdl/nav-cons-pen-psak-samordning_PSAKSamordningWSEXP.wsdl</wsdl>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/PSAKArenasakWSEXP_PSAKArenasakHttp_Service.wsdl b/psak-esb-wsclient-legacy/src/main/resources/wsdl/PSAKArenasakWSEXP_PSAKArenasakHttp_Service.wsdl
deleted file mode 100644
index f1b4d7d..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/PSAKArenasakWSEXP_PSAKArenasakHttp_Service.wsdl
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="PSAKArenasakWSEXP_PSAKArenasakHttp_Service" targetNamespace="http://nav-cons-pen-psak-arenasak/no/nav/inf/Binding" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:Port_0="http://nav-cons-pen-psak-arenasak/no/nav/inf" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:this="http://nav-cons-pen-psak-arenasak/no/nav/inf/Binding">
-  <import namespace="http://nav-cons-pen-psak-arenasak/no/nav/inf" location="no/nav/inf/PSAKArenasak.wsdl">
-    </import>
-  <binding name="PSAKArenasakWSEXP_PSAKArenasakHttpBinding" type="Port_0:PSAKArenasak">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <operation name="hentSaksInfoListe">
-      <soap:operation/>
-      <input name="hentSaksInfoListeRequest">
-        <soap:body use="literal"/>
-      </input>
-      <output name="hentSaksInfoListeResponse">
-        <soap:body use="literal"/>
-      </output>
-      <fault name="faultPenGenerisk">
-        <soap:fault name="faultPenGenerisk" use="literal"/>
-      </fault>
-    </operation>
-  </binding>
-  <service name="PSAKArenasakWSEXP_PSAKArenasakHttpService">
-    <port name="PSAKArenasakWSEXP_PSAKArenasakHttpPort" binding="this:PSAKArenasakWSEXP_PSAKArenasakHttpBinding">
-      <soap:address location="http://localhost:9080/nav-cons-pen-psak-arenasakWeb/sca/PSAKArenasakWSEXP"/>
-    </port>
-  </service>
-</definitions>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/PSAKBidragsakWSEXP_PSAKBidragsakHttp_Service.wsdl b/psak-esb-wsclient-legacy/src/main/resources/wsdl/PSAKBidragsakWSEXP_PSAKBidragsakHttp_Service.wsdl
deleted file mode 100644
index 48861d5..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/PSAKBidragsakWSEXP_PSAKBidragsakHttp_Service.wsdl
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="PSAKBidragsakWSEXP_PSAKBidragsakHttp_Service" targetNamespace="http://nav-cons-pen-psak-bidragsak/no/nav/inf/Binding" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:Port_0="http://nav-cons-pen-psak-bidragsak/no/nav/inf" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:this="http://nav-cons-pen-psak-bidragsak/no/nav/inf/Binding">
-  <import namespace="http://nav-cons-pen-psak-bidragsak/no/nav/inf" location="no/nav/inf/PSAKBidragsak.wsdl">
-    </import>
-  <binding name="PSAKBidragsakWSEXP_PSAKBidragsakHttpBinding" type="Port_0:PSAKBidragsak">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <operation name="hentForskudd">
-      <soap:operation/>
-      <input name="hentForskuddRequest">
-        <soap:body use="literal"/>
-      </input>
-      <output name="hentForskuddResponse">
-        <soap:body use="literal"/>
-      </output>
-      <fault name="faultPenGenerisk">
-        <soap:fault name="faultPenGenerisk" use="literal"/>
-      </fault>
-    </operation>
-  </binding>
-  <service name="PSAKBidragsakWSEXP_PSAKBidragsakHttpService">
-    <port name="PSAKBidragsakWSEXP_PSAKBidragsakHttpPort" binding="this:PSAKBidragsakWSEXP_PSAKBidragsakHttpBinding">
-      <soap:address location="http://localhost:9080/nav-cons-pen-psak-bidragsakWeb/sca/PSAKBidragsakWSEXP"/>
-    </port>
-  </service>
-</definitions>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/PSAKDokBrevSCAEXP_PSAKDokBrevHttp_Service.wsdl b/psak-esb-wsclient-legacy/src/main/resources/wsdl/PSAKDokBrevSCAEXP_PSAKDokBrevHttp_Service.wsdl
deleted file mode 100644
index 2541df3..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/PSAKDokBrevSCAEXP_PSAKDokBrevHttp_Service.wsdl
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="PSAKDokBrevSCAEXP_PSAKDokBrevHttp_Service" targetNamespace="http://nav-cons-pen-psak-dokbrev/no/nav/inf/PSAKDokBrev/Binding" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:Port_0="http://nav-cons-pen-psak-dokbrev/no/nav/inf/PSAKDokBrev" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:this="http://nav-cons-pen-psak-dokbrev/no/nav/inf/PSAKDokBrev/Binding">
-  <import namespace="http://nav-cons-pen-psak-dokbrev/no/nav/inf/PSAKDokBrev" location="no/nav/inf/PSAKDokBrev.wsdl">
-    </import>
-  <binding name="PSAKDokBrevSCAEXP_PSAKDokBrevHttpBinding" type="Port_0:PSAKDokBrev">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <operation name="hentBrevklientURL">
-      <soap:operation/>
-      <input name="hentBrevklientURLRequest">
-        <soap:body use="literal"/>
-      </input>
-      <output name="hentBrevklientURLResponse">
-        <soap:body use="literal"/>
-      </output>
-    </operation>
-  </binding>
-  <service name="PSAKDokBrevSCAEXP_PSAKDokBrevHttpService">
-    <port name="PSAKDokBrevSCAEXP_PSAKDokBrevHttpPort" binding="this:PSAKDokBrevSCAEXP_PSAKDokBrevHttpBinding">
-      <soap:address location="http://localhost:9080/nav-cons-pen-psak-dokbrevWeb/sca/PSAKDokBrevSCAEXP"/>
-    </port>
-  </service>
-</definitions>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/PSAKFullmaktWSEXP_PSAKFullmaktHttp_Service.wsdl b/psak-esb-wsclient-legacy/src/main/resources/wsdl/PSAKFullmaktWSEXP_PSAKFullmaktHttp_Service.wsdl
deleted file mode 100644
index 7cf0bc2..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/PSAKFullmaktWSEXP_PSAKFullmaktHttp_Service.wsdl
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="PSAKFullmaktWSEXP_PSAKFullmaktHttp_Service" targetNamespace="http://nav-cons-pen-psak-fullmakt/no/nav/inf/Binding" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:Port_0="http://nav-cons-pen-psak-fullmakt/no/nav/inf" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:this="http://nav-cons-pen-psak-fullmakt/no/nav/inf/Binding">
-  <import namespace="http://nav-cons-pen-psak-fullmakt/no/nav/inf" location="no/nav/inf/PSAKFullmakt.wsdl">
-    </import>
-  <binding name="PSAKFullmaktWSEXP_PSAKFullmaktHttpBinding" type="Port_0:PSAKFullmakt">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <operation name="hentFullmaktListe">
-      <soap:operation/>
-      <input name="hentFullmaktListeRequest">
-        <soap:body use="literal"/>
-      </input>
-      <output name="hentFullmaktListeResponse">
-        <soap:body use="literal"/>
-      </output>
-      <fault name="faultPenGenerisk">
-        <soap:fault name="faultPenGenerisk" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="lagreFullmakt">
-      <soap:operation/>
-      <input name="lagreFullmaktRequest">
-        <soap:body use="literal"/>
-      </input>
-      <output name="lagreFullmaktResponse">
-        <soap:body use="literal"/>
-      </output>
-      <fault name="faultPenFullmaktIkkeFunnet">
-        <soap:fault name="faultPenFullmaktIkkeFunnet" use="literal"/>
-      </fault>
-      <fault name="faultPenGenerisk">
-        <soap:fault name="faultPenGenerisk" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="opprettFullmakt">
-      <soap:operation/>
-      <input name="opprettFullmaktRequest">
-        <soap:body use="literal"/>
-      </input>
-      <output name="opprettFullmaktResponse">
-        <soap:body use="literal"/>
-      </output>
-      <fault name="faultPenGenerisk">
-        <soap:fault name="faultPenGenerisk" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="slettFullmakt">
-      <soap:operation/>
-      <input name="slettFullmaktRequest">
-        <soap:body use="literal"/>
-      </input>
-      <output name="slettFullmaktResponse">
-        <soap:body use="literal"/>
-      </output>
-      <fault name="faultPenFullmaktIkkeFunnet">
-        <soap:fault name="faultPenFullmaktIkkeFunnet" use="literal"/>
-      </fault>
-      <fault name="faultPenGenerisk">
-        <soap:fault name="faultPenGenerisk" use="literal"/>
-      </fault>
-    </operation>
-  </binding>
-  <service name="PSAKFullmaktWSEXP_PSAKFullmaktHttpService">
-    <port name="PSAKFullmaktWSEXP_PSAKFullmaktHttpPort" binding="this:PSAKFullmaktWSEXP_PSAKFullmaktHttpBinding">
-      <soap:address location="http://localhost:9080/nav-cons-pen-psak-fullmaktWeb/sca/PSAKFullmaktWSEXP"/>
-    </port>
-  </service>
-</definitions>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/PSAKHenvendelseWSEXP_PSAKHenvendelseHttp_Service.wsdl b/psak-esb-wsclient-legacy/src/main/resources/wsdl/PSAKHenvendelseWSEXP_PSAKHenvendelseHttp_Service.wsdl
deleted file mode 100644
index bc943de..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/PSAKHenvendelseWSEXP_PSAKHenvendelseHttp_Service.wsdl
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="PSAKHenvendelseWSEXP_PSAKHenvendelseHttp_Service" targetNamespace="http://nav-cons-pen-psak-henvendelse/no/nav/inf/Binding" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:Port_0="http://nav-cons-pen-psak-henvendelse/no/nav/inf" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:this="http://nav-cons-pen-psak-henvendelse/no/nav/inf/Binding">
-  <import namespace="http://nav-cons-pen-psak-henvendelse/no/nav/inf" location="no/nav/inf/PSAKHenvendelse.wsdl">
-    </import>
-  <binding name="PSAKHenvendelseWSEXP_PSAKHenvendelseHttpBinding" type="Port_0:PSAKHenvendelse">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <operation name="opprettHenvendelse">
-      <soap:operation soapAction=""/>
-      <input name="opprettHenvendelseRequest">
-        <soap:body use="literal"/>
-      </input>
-      <output name="opprettHenvendelseResponse">
-        <soap:body use="literal"/>
-      </output>
-      <fault name="faultPenGenerisk">
-        <soap:fault name="faultPenGenerisk" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="lagreHenvendelse">
-      <soap:operation soapAction=""/>
-      <input name="lagreHenvendelseRequest">
-        <soap:body use="literal"/>
-      </input>
-      <output name="lagreHenvendelseResponse">
-        <soap:body use="literal"/>
-      </output>
-      <fault name="faultPenHenvendelseIkkeFunnet">
-        <soap:fault name="faultPenHenvendelseIkkeFunnet" use="literal"/>
-      </fault>
-      <fault name="faultPenGenerisk">
-        <soap:fault name="faultPenGenerisk" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="hentHenvendelse">
-      <soap:operation soapAction=""/>
-      <input name="hentHenvendelseRequest">
-        <soap:body use="literal"/>
-      </input>
-      <output name="hentHenvendelseResponse">
-        <soap:body use="literal"/>
-      </output>
-      <fault name="faultPenHenvendelseIkkeFunnet">
-        <soap:fault name="faultPenHenvendelseIkkeFunnet" use="literal"/>
-      </fault>
-      <fault name="faultPenGenerisk">
-        <soap:fault name="faultPenGenerisk" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="hentHenvendelseListe">
-      <soap:operation soapAction=""/>
-      <input name="hentHenvendelseListeRequest">
-        <soap:body use="literal"/>
-      </input>
-      <output name="hentHenvendelseListeResponse">
-        <soap:body use="literal"/>
-      </output>
-      <fault name="faultPenGenerisk">
-        <soap:fault name="faultPenGenerisk" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="hentStatistikkAntall">
-      <soap:operation soapAction=""/>
-      <input name="hentStatistikkAntallRequest">
-        <soap:body use="literal"/>
-      </input>
-      <output name="hentStatistikkAntallResponse">
-        <soap:body use="literal"/>
-      </output>
-      <fault name="faultPenGenerisk">
-        <soap:fault name="faultPenGenerisk" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="hentStatistikkHenvendelseGjelder">
-      <soap:operation soapAction=""/>
-      <input name="hentStatistikkHenvendelseGjelderRequest">
-        <soap:body use="literal"/>
-      </input>
-      <output name="hentStatistikkHenvendelseGjelderResponse">
-        <soap:body use="literal"/>
-      </output>
-      <fault name="faultPenGenerisk">
-        <soap:fault name="faultPenGenerisk" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="hentStatistikkPrKanal">
-      <soap:operation soapAction=""/>
-      <input name="hentStatistikkPrKanalRequest">
-        <soap:body use="literal"/>
-      </input>
-      <output name="hentStatistikkPrKanalResponse">
-        <soap:body use="literal"/>
-      </output>
-      <fault name="faultPenGenerisk">
-        <soap:fault name="faultPenGenerisk" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="hentStatistikkPrType">
-      <soap:operation soapAction=""/>
-      <input name="hentStatistikkPrTypeRequest">
-        <soap:body use="literal"/>
-      </input>
-      <output name="hentStatistikkPrTypeResponse">
-        <soap:body use="literal"/>
-      </output>
-      <fault name="faultPenGenerisk">
-        <soap:fault name="faultPenGenerisk" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="erTidsbrukAktivert">
-      <soap:operation soapAction=""/>
-      <input name="erTidsbrukAktivertRequest">
-        <soap:body use="literal"/>
-      </input>
-      <output name="erTidsbrukAktivertResponse">
-        <soap:body use="literal"/>
-      </output>
-      <fault name="faultPenGenerisk">
-        <soap:fault name="faultPenGenerisk" use="literal"/>
-      </fault>
-    </operation>
-  </binding>
-  <service name="PSAKHenvendelseWSEXP_PSAKHenvendelseHttpService">
-    <port name="PSAKHenvendelseWSEXP_PSAKHenvendelseHttpPort" binding="this:PSAKHenvendelseWSEXP_PSAKHenvendelseHttpBinding">
-      <soap:address location="http://localhost:9080/nav-cons-pen-psak-henvendelseWeb/sca/PSAKHenvendelseWSEXP"/>
-    </port>
-  </service>
-</definitions>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/PSAKSamhandlerWSEXP_PSAKSamhandlerHttp_Service.wsdl b/psak-esb-wsclient-legacy/src/main/resources/wsdl/PSAKSamhandlerWSEXP_PSAKSamhandlerHttp_Service.wsdl
deleted file mode 100644
index 5026c59..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/PSAKSamhandlerWSEXP_PSAKSamhandlerHttp_Service.wsdl
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="PSAKSamhandlerWSEXP_PSAKSamhandlerHttp_Service" targetNamespace="http://nav-cons-pen-psak-samhandler/no/nav/inf/Binding" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:Port_0="http://nav-cons-pen-psak-samhandler/no/nav/inf" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:this="http://nav-cons-pen-psak-samhandler/no/nav/inf/Binding">
-  <import namespace="http://nav-cons-pen-psak-samhandler/no/nav/inf" location="no/nav/inf/PSAKSamhandler.wsdl">
-    </import>
-  <binding name="PSAKSamhandlerWSEXP_PSAKSamhandlerHttpBinding" type="Port_0:PSAKSamhandler">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <operation name="hentSamhandler">
-      <soap:operation/>
-      <input name="hentSamhandlerRequest">
-        <soap:body use="literal"/>
-      </input>
-      <output name="hentSamhandlerResponse">
-        <soap:body use="literal"/>
-      </output>
-      <fault name="faultPenSamhandlerIkkeFunnet">
-        <soap:fault name="faultPenSamhandlerIkkeFunnet" use="literal"/>
-      </fault>
-      <fault name="faultPenGenerisk">
-        <soap:fault name="faultPenGenerisk" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="lagreSamhandler">
-      <soap:operation/>
-      <input name="lagreSamhandlerRequest">
-        <soap:body use="literal"/>
-      </input>
-      <output name="lagreSamhandlerResponse">
-        <soap:body use="literal"/>
-      </output>
-      <fault name="faultPenSamhandlerIkkeFunnet">
-        <soap:fault name="faultPenSamhandlerIkkeFunnet" use="literal"/>
-      </fault>
-      <fault name="faultPenGenerisk">
-        <soap:fault name="faultPenGenerisk" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="opprettSamhandler">
-      <soap:operation/>
-      <input name="opprettSamhandlerRequest">
-        <soap:body use="literal"/>
-      </input>
-      <output name="opprettSamhandlerResponse">
-        <soap:body use="literal"/>
-      </output>
-      <fault name="faultPenGenerisk">
-        <soap:fault name="faultPenGenerisk" use="literal"/>
-      </fault>
-      <fault name="faultPenOffentligIdIkkeFunnet">
-        <soap:fault name="faultPenOffentligIdIkkeFunnet" use="literal"/>
-      </fault>
-    </operation>
-    <operation name="finnSamhandler">
-      <soap:operation/>
-      <input name="finnSamhandlerRequest">
-        <soap:body use="literal"/>
-      </input>
-      <output name="finnSamhandlerResponse">
-        <soap:body use="literal"/>
-      </output>
-      <fault name="faultPenGenerisk">
-        <soap:fault name="faultPenGenerisk" use="literal"/>
-      </fault>
-    </operation>
-  </binding>
-  <service name="PSAKSamhandlerWSEXP_PSAKSamhandlerHttpService">
-    <port name="PSAKSamhandlerWSEXP_PSAKSamhandlerHttpPort" binding="this:PSAKSamhandlerWSEXP_PSAKSamhandlerHttpBinding">
-      <soap:address location="http://localhost:9080/nav-cons-pen-psak-samhandlerWeb/sca/PSAKSamhandlerWSEXP"/>
-    </port>
-  </service>
-</definitions>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/nav-cons-pen-psak-institusjonsopphold_PSAKInstitusjonsoppholdWSEXP.wsdl b/psak-esb-wsclient-legacy/src/main/resources/wsdl/nav-cons-pen-psak-institusjonsopphold_PSAKInstitusjonsoppholdWSEXP.wsdl
deleted file mode 100644
index 6410bd7..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/nav-cons-pen-psak-institusjonsopphold_PSAKInstitusjonsoppholdWSEXP.wsdl
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="PSAKInstitusjonsoppholdWSEXP_PSAKInstitusjonsoppholdHttp_Service" targetNamespace="http://nav-cons-pen-psak-institusjonsopphold/no/nav/inf/Binding" xmlns:Port_0="http://nav-cons-pen-psak-institusjonsopphold/no/nav/inf" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:this="http://nav-cons-pen-psak-institusjonsopphold/no/nav/inf/Binding">
-  <wsdl:import namespace="http://nav-cons-pen-psak-institusjonsopphold/no/nav/inf" location="no/nav/inf/PSAKInstitusjonsopphold.wsdl">
-    </wsdl:import>
-  <wsdl:binding name="PSAKInstitusjonsoppholdWSEXP_PSAKInstitusjonsoppholdHttpBinding" type="Port_0:PSAKInstitusjonsopphold">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="lagreInstitusjonsopphold">
-      <soap:operation soapAction=""/>
-      <wsdl:input name="lagreInstitusjonsoppholdRequest">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="lagreInstitusjonsoppholdResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="faultPenOppholdPeriodeIdIkkeFunnet">
-        <soap:fault name="faultPenOppholdPeriodeIdIkkeFunnet" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="faultPenFnrIkkeFunnet">
-        <soap:fault name="faultPenFnrIkkeFunnet" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="faultPenGenerisk">
-        <soap:fault name="faultPenGenerisk" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="opprettInstitusjonsopphold">
-      <soap:operation soapAction=""/>
-      <wsdl:input name="opprettInstitusjonsoppholdRequest">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="opprettInstitusjonsoppholdResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="faultPenFnrIkkeFunnet">
-        <soap:fault name="faultPenFnrIkkeFunnet" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="faultPenGenerisk">
-        <soap:fault name="faultPenGenerisk" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="slettInstitusjonsopphold">
-      <soap:operation soapAction=""/>
-      <wsdl:input name="slettInstitusjonsoppholdRequest">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="slettInstitusjonsoppholdResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="faultPenInstitusjonsoppholdIkkeFunnet">
-        <soap:fault name="faultPenInstitusjonsoppholdIkkeFunnet" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="faultPenGenerisk">
-        <soap:fault name="faultPenGenerisk" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="PSAKInstitusjonsoppholdWSEXP_PSAKInstitusjonsoppholdHttpService">
-    <wsdl:port name="PSAKInstitusjonsoppholdWSEXP_PSAKInstitusjonsoppholdHttpPort" binding="this:PSAKInstitusjonsoppholdWSEXP_PSAKInstitusjonsoppholdHttpBinding">
-      <soap:address location="http://localhost:9080/nav-cons-pen-psak-institusjonsoppholdWeb/sca/PSAKInstitusjonsoppholdWSEXP"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/nav-cons-pen-psak-navorgenhet_PSAKNAVOrgEnhetWSEXP.wsdl b/psak-esb-wsclient-legacy/src/main/resources/wsdl/nav-cons-pen-psak-navorgenhet_PSAKNAVOrgEnhetWSEXP.wsdl
deleted file mode 100644
index abde64d..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/nav-cons-pen-psak-navorgenhet_PSAKNAVOrgEnhetWSEXP.wsdl
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="PSAKNAVOrgEnhetWSEXP_PSAKNAVOrgEnhetHttp_Service" targetNamespace="http://nav-cons-pen-psak-navorgenhet/no/nav/inf/Binding" xmlns:Port_0="http://nav-cons-pen-psak-navorgenhet/no/nav/inf" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:this="http://nav-cons-pen-psak-navorgenhet/no/nav/inf/Binding">
-  <wsdl:import namespace="http://nav-cons-pen-psak-navorgenhet/no/nav/inf" location="no/nav/inf/PSAKNAVOrgEnhet.wsdl">
-    </wsdl:import>
-  <wsdl:binding name="PSAKNAVOrgEnhetWSEXP_PSAKNAVOrgEnhetHttpBinding" type="Port_0:PSAKNAVOrgEnhet">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="hentNAVEnhet">
-      <soap:operation soapAction=""/>
-      <wsdl:input name="hentNAVEnhetRequest">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="hentNAVEnhetResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="faultPenNAVEnhetIkkeFunnet">
-        <soap:fault name="faultPenNAVEnhetIkkeFunnet" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="faultPenGenerisk">
-        <soap:fault name="faultPenGenerisk" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="hentNAVEnhetListe">
-      <soap:operation soapAction=""/>
-      <wsdl:input name="hentNAVEnhetListeRequest">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="hentNAVEnhetListeResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="faultPenNAVEnhetIkkeFunnet">
-        <soap:fault name="faultPenNAVEnhetIkkeFunnet" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="faultPenGenerisk">
-        <soap:fault name="faultPenGenerisk" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="hentNAVEnhetGruppeListe">
-      <soap:operation soapAction=""/>
-      <wsdl:input name="hentNAVEnhetGruppeListeRequest">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="hentNAVEnhetGruppeListeResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="faultPenNAVEnhetIkkeFunnet">
-        <soap:fault name="faultPenNAVEnhetIkkeFunnet" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="faultPenGenerisk">
-        <soap:fault name="faultPenGenerisk" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="hentSpesialenhetTilPerson">
-      <soap:operation soapAction=""/>
-      <wsdl:input name="hentSpesialenhetTilPersonRequest">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="hentSpesialenhetTilPersonResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="faultPenNAVEnhetIkkeFunnet">
-        <soap:fault name="faultPenNAVEnhetIkkeFunnet" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="faultPenGenerisk">
-        <soap:fault name="faultPenGenerisk" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="faultPenPersonIkkeFunnet">
-        <soap:fault name="faultPenPersonIkkeFunnet" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="finnNAVEnhet">
-      <soap:operation soapAction=""/>
-      <wsdl:input name="finnNAVEnhetRequest">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="finnNAVEnhetResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="faultPenGenerisk">
-        <soap:fault name="faultPenGenerisk" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="finnArenaNAVEnhetListe">
-      <soap:operation soapAction=""/>
-      <wsdl:input name="finnArenaNAVEnhetListeRequest">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="finnArenaNAVEnhetListeResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="faultPenGenerisk">
-        <soap:fault name="faultPenGenerisk" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="hentForvaltningsenhetTilPersonListe">
-      <soap:operation soapAction=""/>
-      <wsdl:input name="hentForvaltningsenhetTilPersonListeRequest">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="hentForvaltningsenhetTilPersonListeResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="faultPenNAVEnhetIkkeFunnet">
-        <soap:fault name="faultPenNAVEnhetIkkeFunnet" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="faultPenPersonManglerEnhet">
-        <soap:fault name="faultPenPersonManglerEnhet" use="literal"/>
-      </wsdl:fault>
-      <wsdl:fault name="faultPenPersonIkkeFunnet">
-        <soap:fault name="faultPenPersonIkkeFunnet" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="PSAKNAVOrgEnhetWSEXP_PSAKNAVOrgEnhetHttpService">
-    <wsdl:port name="PSAKNAVOrgEnhetWSEXP_PSAKNAVOrgEnhetHttpPort" binding="this:PSAKNAVOrgEnhetWSEXP_PSAKNAVOrgEnhetHttpBinding">
-      <soap:address location="http://localhost:9080/nav-cons-pen-psak-navorgenhetWeb/sca/PSAKNAVOrgEnhetWSEXP"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKArenasak.wsdl b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKArenasak.wsdl
deleted file mode 100644
index c70f003..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKArenasak.wsdl
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:bons1="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/arenasak" xmlns:bons2="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" xmlns:bons3="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/arenasak" xmlns:tns="http://nav-cons-pen-psak-arenasak/no/nav/inf" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="PSAKArenasak" targetNamespace="http://nav-cons-pen-psak-arenasak/no/nav/inf">
-  <wsdl:types>
-    <xsd:schema xmlns:bons0="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo" targetNamespace="http://nav-cons-pen-psak-arenasak/no/nav/inf" xmlns:bons1="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/arenasak" xmlns:bons2="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" xmlns:bons3="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/arenasak" xmlns:tns="http://nav-cons-pen-psak-arenasak/no/nav/inf" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" schemaLocation="../lib/pen/psakpselv/fault/FaultPenGenerisk.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo" schemaLocation="../lib/pen/psakpselv/asbo/ASBOPenSaksInfoListe.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo" schemaLocation="../lib/pen/psakpselv/asbo/ASBOPenSaksInfo.xsd"/>
-            <xsd:element name="hentSaksInfoListe">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentSakListeRequest" nillable="true" type="bons0:ASBOPenSaksInfo"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="hentSaksInfoListeResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentSakListeResponse" nillable="true" type="bons0:ASBOPenSaksInfoListe"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="hentSaksInfoListe_faultPenGenerisk" type="bons2:FaultPenGenerisk"/>
-        </xsd:schema>
-  </wsdl:types>
-    <wsdl:message name="hentSaksInfoListeRequestMsg">
-    <wsdl:part element="tns:hentSaksInfoListe" name="hentSaksInfoListeParameters"/>
-  </wsdl:message>
-    <wsdl:message name="hentSaksInfoListeResponseMsg">
-    <wsdl:part element="tns:hentSaksInfoListeResponse" name="hentSaksInfoListeResult"/>
-  </wsdl:message>
-    <wsdl:message name="hentSaksInfoListe_faultPenGeneriskMsg">
-    <wsdl:part element="tns:hentSaksInfoListe_faultPenGenerisk" name="faultPenGenerisk"/>
-  </wsdl:message>
-    <wsdl:portType name="PSAKArenasak">
-    <wsdl:operation name="hentSaksInfoListe">
-      <wsdl:input message="tns:hentSaksInfoListeRequestMsg" name="hentSaksInfoListeRequest"/>
-      <wsdl:output message="tns:hentSaksInfoListeResponseMsg" name="hentSaksInfoListeResponse"/>
-      <wsdl:fault message="tns:hentSaksInfoListe_faultPenGeneriskMsg" name="faultPenGenerisk"/>
-        </wsdl:operation>
-  </wsdl:portType>
-</wsdl:definitions>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKBidragsak.wsdl b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKBidragsak.wsdl
deleted file mode 100644
index a4bc0c3..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKBidragsak.wsdl
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:bons1="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/bidragsak" xmlns:bons2="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" xmlns:tns="http://nav-cons-pen-psak-bidragsak/no/nav/inf" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="PSAKBidragsak" targetNamespace="http://nav-cons-pen-psak-bidragsak/no/nav/inf">
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://nav-cons-pen-psak-bidragsak/no/nav/inf" xmlns:bons1="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/bidragsak" xmlns:bons2="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" xmlns:tns="http://nav-cons-pen-psak-bidragsak/no/nav/inf" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" schemaLocation="../lib/pen/psakpselv/fault/FaultPenGenerisk.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/bidragsak" schemaLocation="../lib/pen/psakpselv/asbo/bidragsak/ASBOPenHentForskuddRequest.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/bidragsak" schemaLocation="../lib/pen/psakpselv/asbo/bidragsak/ASBOPenForskuddSak.xsd"/>
-            <xsd:element name="hentForskudd">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentForskuddRequest" nillable="true" type="bons1:ASBOPenHentForskuddRequest"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="hentForskuddResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentForskuddResponse" nillable="true" type="bons1:ASBOPenForskuddSak"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="hentForskudd_faultPenGenerisk" type="bons2:FaultPenGenerisk"/>
-    </xsd:schema>
-  </wsdl:types>
-    <wsdl:message name="hentForskuddRequestMsg">
-    <wsdl:part element="tns:hentForskudd" name="hentForskuddParameters"/>
-  </wsdl:message>
-    <wsdl:message name="hentForskuddResponseMsg">
-    <wsdl:part element="tns:hentForskuddResponse" name="hentForskuddResult"/>
-  </wsdl:message>
-    <wsdl:message name="hentForskudd_faultPenGeneriskMsg">
-    <wsdl:part element="tns:hentForskudd_faultPenGenerisk" name="faultPenGenerisk"/>
-  </wsdl:message>
-    <wsdl:portType name="PSAKBidragsak">
-    <wsdl:operation name="hentForskudd">
-      <wsdl:input message="tns:hentForskuddRequestMsg" name="hentForskuddRequest"/>
-      <wsdl:output message="tns:hentForskuddResponseMsg" name="hentForskuddResponse"/>
-      <wsdl:fault message="tns:hentForskudd_faultPenGeneriskMsg" name="faultPenGenerisk"/>
-    </wsdl:operation>
-  </wsdl:portType>
-</wsdl:definitions>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKDokBrev.wsdl b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKDokBrev.wsdl
deleted file mode 100644
index 72ed3d9..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKDokBrev.wsdl
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:bons1="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/dokbrev" xmlns:bons2="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/brev" xmlns:tns="http://nav-cons-pen-psak-dokbrev/no/nav/inf/PSAKDokBrev" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="PSAKDokBrev" targetNamespace="http://nav-cons-pen-psak-dokbrev/no/nav/inf/PSAKDokBrev">
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://nav-cons-pen-psak-dokbrev/no/nav/inf/PSAKDokBrev" xmlns:bons1="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/dokbrev" xmlns:bons2="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/brev" xmlns:tns="http://nav-cons-pen-psak-dokbrev/no/nav/inf/PSAKDokBrev" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/brev" schemaLocation="../lib/pen/psakpselv/asbo/brev/ASBOPenHentBrevklientURLResponse.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/brev" schemaLocation="../lib/pen/psakpselv/asbo/brev/ASBOPenHentBrevklientURLRequest.xsd"/>
-            <xsd:element name="hentBrevklientURL">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentBrevklientURLRequest" nillable="true" type="bons2:ASBOPenHentBrevklientURLRequest"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-            <xsd:element name="hentBrevklientURLResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentBrevklientURLResponse" nillable="true" type="bons2:ASBOPenHentBrevklientURLResponse"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-        </xsd:schema>
-  </wsdl:types>
-    <wsdl:message name="hentBrevklientURLRequestMsg">
-    <wsdl:part element="tns:hentBrevklientURL" name="hentBrevklientURLParameters"/>
-  </wsdl:message>
-    <wsdl:message name="hentBrevklientURLResponseMsg">
-    <wsdl:part element="tns:hentBrevklientURLResponse" name="hentBrevklientURLResult"/>
-  </wsdl:message>
-    <wsdl:portType name="PSAKDokBrev">
-        <wsdl:operation name="hentBrevklientURL">
-      <wsdl:input message="tns:hentBrevklientURLRequestMsg" name="hentBrevklientURLRequest"/>
-      <wsdl:output message="tns:hentBrevklientURLResponseMsg" name="hentBrevklientURLResponse"/>
-    </wsdl:operation>
-    </wsdl:portType>
-</wsdl:definitions>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKFullmakt.wsdl b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKFullmakt.wsdl
deleted file mode 100644
index c847602..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKFullmakt.wsdl
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:bons1="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/fullmakt" xmlns:bons2="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" xmlns:bons3="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/fullmakt" xmlns:tns="http://nav-cons-pen-psak-fullmakt/no/nav/inf" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="PSAKFullmakt" targetNamespace="http://nav-cons-pen-psak-fullmakt/no/nav/inf">
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://nav-cons-pen-psak-fullmakt/no/nav/inf" xmlns:bons1="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/fullmakt" xmlns:bons2="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" xmlns:bons3="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/fullmakt" xmlns:tns="http://nav-cons-pen-psak-fullmakt/no/nav/inf" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/fullmakt" schemaLocation="../lib/pen/psakpselv/asbo/fullmakt/ASBOPenFullmaktListe.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/fullmakt" schemaLocation="../lib/pen/psakpselv/asbo/fullmakt/ASBOPenHentFullmaktListeRequest.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" schemaLocation="../lib/pen/psakpselv/fault/FaultPenGenerisk.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/fullmakt" schemaLocation="../lib/pen/psakpselv/asbo/fullmakt/ASBOPenFullmakt.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/fullmakt" schemaLocation="../lib/pen/psakpselv/fault/fullmakt/FaultPenFullmaktIkkeFunnet.xsd"/>
-            <xsd:element name="hentFullmaktListe">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentFullmaktListeRequest" nillable="true" type="bons1:ASBOPenHentFullmaktListeRequest"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="hentFullmaktListeResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentFullmaktListeResponse" nillable="true" type="bons1:ASBOPenFullmaktListe"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="lagreFullmakt">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="lagreFullmaktRequest" nillable="true" type="bons1:ASBOPenFullmakt"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="lagreFullmaktResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="lagreFullmaktResponse" nillable="true" type="bons1:ASBOPenFullmakt"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="opprettFullmakt">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="opprettFullmaktRequest" nillable="true" type="bons1:ASBOPenFullmakt"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="opprettFullmaktResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="opprettFullmaktResponse" nillable="true" type="bons1:ASBOPenFullmakt"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="hentFullmaktListe_faultPenGenerisk" type="bons2:FaultPenGenerisk"/>
-      <xsd:element name="lagreFullmakt_faultPenGenerisk" type="bons2:FaultPenGenerisk"/>
-      <xsd:element name="opprettFullmakt_faultPenGenerisk" type="bons2:FaultPenGenerisk"/>
-            <xsd:element name="slettFullmakt">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="slettFullmaktRequest" nillable="true" type="bons1:ASBOPenFullmakt"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-            <xsd:element name="slettFullmaktResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="slettFullmaktResponse" nillable="true" type="bons1:ASBOPenFullmakt"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-            <xsd:element name="slettFullmakt_faultPenFullmaktIkkeFunnet" type="bons3:FaultPenFullmaktIkkeFunnet"/>
-            <xsd:element name="slettFullmakt_faultPenGenerisk" type="bons2:FaultPenGenerisk"/>
-            <xsd:element name="lagreFullmakt_faultPenFullmaktIkkeFunnet" type="bons3:FaultPenFullmaktIkkeFunnet"/>
-        </xsd:schema>
-  </wsdl:types>
-    <wsdl:message name="hentFullmaktListeRequestMsg">
-    <wsdl:part element="tns:hentFullmaktListe" name="hentFullmaktListeParameters"/>
-  </wsdl:message>
-    <wsdl:message name="hentFullmaktListeResponseMsg">
-    <wsdl:part element="tns:hentFullmaktListeResponse" name="hentFullmaktListeResult"/>
-  </wsdl:message>
-    <wsdl:message name="lagreFullmaktRequestMsg">
-    <wsdl:part element="tns:lagreFullmakt" name="lagreFullmaktParameters"/>
-  </wsdl:message>
-    <wsdl:message name="lagreFullmaktResponseMsg">
-    <wsdl:part element="tns:lagreFullmaktResponse" name="lagreFullmaktResult"/>
-  </wsdl:message>
-    <wsdl:message name="opprettFullmaktRequestMsg">
-    <wsdl:part element="tns:opprettFullmakt" name="opprettFullmaktParameters"/>
-  </wsdl:message>
-    <wsdl:message name="opprettFullmaktResponseMsg">
-    <wsdl:part element="tns:opprettFullmaktResponse" name="opprettFullmaktResult"/>
-  </wsdl:message>
-    <wsdl:message name="hentFullmaktListe_faultPenGeneriskMsg">
-    <wsdl:part element="tns:hentFullmaktListe_faultPenGenerisk" name="faultPenGenerisk"/>
-  </wsdl:message>
-    <wsdl:message name="lagreFullmakt_faultPenGeneriskMsg">
-    <wsdl:part element="tns:lagreFullmakt_faultPenGenerisk" name="faultPenGenerisk"/>
-  </wsdl:message>
-    <wsdl:message name="opprettFullmakt_faultPenGeneriskMsg">
-    <wsdl:part element="tns:opprettFullmakt_faultPenGenerisk" name="faultPenGenerisk"/>
-  </wsdl:message>
-    <wsdl:message name="slettFullmaktRequestMsg">
-    <wsdl:part element="tns:slettFullmakt" name="slettFullmaktParameters"/>
-  </wsdl:message>
-    <wsdl:message name="slettFullmaktResponseMsg">
-    <wsdl:part element="tns:slettFullmaktResponse" name="slettFullmaktResult"/>
-  </wsdl:message>
-    <wsdl:message name="slettFullmakt_faultPenFullmaktIkkeFunnetMsg">
-    <wsdl:part element="tns:slettFullmakt_faultPenFullmaktIkkeFunnet" name="faultPenFullmaktIkkeFunnet"/>
-  </wsdl:message>
-    <wsdl:message name="slettFullmakt_faultPenGeneriskMsg">
-    <wsdl:part element="tns:slettFullmakt_faultPenGenerisk" name="faultPenGenerisk"/>
-  </wsdl:message>
-    <wsdl:message name="lagreFullmakt_faultPenFullmaktIkkeFunnetMsg">
-    <wsdl:part element="tns:lagreFullmakt_faultPenFullmaktIkkeFunnet" name="faultPenFullmaktIkkeFunnet"/>
-  </wsdl:message>
-    <wsdl:portType name="PSAKFullmakt">
-    <wsdl:operation name="hentFullmaktListe">
-      <wsdl:input message="tns:hentFullmaktListeRequestMsg" name="hentFullmaktListeRequest"/>
-      <wsdl:output message="tns:hentFullmaktListeResponseMsg" name="hentFullmaktListeResponse"/>
-      <wsdl:fault message="tns:hentFullmaktListe_faultPenGeneriskMsg" name="faultPenGenerisk"/>
-    </wsdl:operation>
-    <wsdl:operation name="lagreFullmakt">
-      <wsdl:input message="tns:lagreFullmaktRequestMsg" name="lagreFullmaktRequest"/>
-      <wsdl:output message="tns:lagreFullmaktResponseMsg" name="lagreFullmaktResponse"/>
-      <wsdl:fault message="tns:lagreFullmakt_faultPenGeneriskMsg" name="faultPenGenerisk"/>
-            <wsdl:fault message="tns:lagreFullmakt_faultPenFullmaktIkkeFunnetMsg" name="faultPenFullmaktIkkeFunnet"/>
-        </wsdl:operation>
-    <wsdl:operation name="opprettFullmakt">
-      <wsdl:input message="tns:opprettFullmaktRequestMsg" name="opprettFullmaktRequest"/>
-      <wsdl:output message="tns:opprettFullmaktResponseMsg" name="opprettFullmaktResponse"/>
-      <wsdl:fault message="tns:opprettFullmakt_faultPenGeneriskMsg" name="faultPenGenerisk"/>
-    </wsdl:operation>
-        <wsdl:operation name="slettFullmakt">
-      <wsdl:input message="tns:slettFullmaktRequestMsg" name="slettFullmaktRequest"/>
-      <wsdl:output message="tns:slettFullmaktResponseMsg" name="slettFullmaktResponse"/>
-            <wsdl:fault message="tns:slettFullmakt_faultPenFullmaktIkkeFunnetMsg" name="faultPenFullmaktIkkeFunnet"/>
-            <wsdl:fault message="tns:slettFullmakt_faultPenGeneriskMsg" name="faultPenGenerisk"/>
-        </wsdl:operation>
-    </wsdl:portType>
-</wsdl:definitions>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKHenvendelse.wsdl b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKHenvendelse.wsdl
deleted file mode 100644
index bbf85de..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKHenvendelse.wsdl
+++ /dev/null
@@ -1,285 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:bons1="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/henvendelse" xmlns:tns="http://nav-cons-pen-psak-henvendelse/no/nav/inf" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="PSAKHenvendelse" targetNamespace="http://nav-cons-pen-psak-henvendelse/no/nav/inf">
-  <wsdl:types>
-    <xsd:schema xmlns:bons2="http://nav-lib-cons-pen/no/nav/lib/pen/asbo" xmlns:bons3="http://nav-lib-cons-pen/no/nav/lib/pen/fault" xmlns:bons5="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/henvendelse" xmlns:bons6="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/henvendelse" xmlns:bons7="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" targetNamespace="http://nav-cons-pen-psak-henvendelse/no/nav/inf" xmlns:bons1="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/henvendelse" xmlns:tns="http://nav-cons-pen-psak-henvendelse/no/nav/inf" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/henvendelse" schemaLocation="../lib/pen/psakpselv/asbo/henvendelse/ASBOPenHentStatistikkRequest.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/henvendelse" schemaLocation="../lib/pen/psakpselv/asbo/henvendelse/ASBOPenHenvendelseListe.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/henvendelse" schemaLocation="../lib/pen/psakpselv/asbo/henvendelse/ASBOPenStatistikk.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" schemaLocation="../lib/pen/psakpselv/fault/FaultPenGenerisk.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/henvendelse" schemaLocation="../lib/pen/psakpselv/fault/henvendelse/FaultPenHenvendelseIkkeFunnet.xsd"/>
-      <xsd:element name="opprettHenvendelse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="opprettHenvendelseRequest" nillable="true" type="bons1:ASBOPenHenvendelse"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="opprettHenvendelseResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="opprettHenvendelseResponse" nillable="true" type="bons1:ASBOPenHenvendelse"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="lagreHenvendelse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="lagreHenvendelseRequest" nillable="true" type="bons1:ASBOPenHenvendelse"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="lagreHenvendelseResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="lagreHenvendelseResponse" nillable="true" type="bons1:ASBOPenHenvendelse"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="hentHenvendelse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentHenvendelseRequest" nillable="true" type="bons1:ASBOPenHenvendelse"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="hentHenvendelseResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentHenvendelseResponse" nillable="true" type="bons1:ASBOPenHenvendelse"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="hentHenvendelseListe">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentHenvendelseListeRequest" nillable="true" type="bons1:ASBOPenHenvendelse"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="hentHenvendelseListeResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentHenvendelseListeResponse" nillable="true" type="bons1:ASBOPenHenvendelseListe"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="hentStatistikkAntall">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentStatstikkAntallRequest" nillable="true" type="bons1:ASBOPenHentStatistikkRequest"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="hentStatistikkAntallResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentStatistikkAntallResponse" nillable="true" type="bons1:ASBOPenStatistikk"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="hentStatistikkHenvendelseGjelder">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentStatistikkHenvendelseGjelderRequest" nillable="true" type="bons1:ASBOPenHentStatistikkRequest"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="hentStatistikkHenvendelseGjelderResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentStatistikkHenvendeseGjelderResponse" nillable="true" type="bons1:ASBOPenStatistikk"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="hentStatistikkPrKanal">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentStatistikkPrKanalRequest" nillable="true" type="bons1:ASBOPenHentStatistikkRequest"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="hentStatistikkPrKanalResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentStatistikkPrKanalResponse" nillable="true" type="bons1:ASBOPenStatistikk"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="hentStatistikkPrType">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentStatistikkPrTypeRequest" nillable="true" type="bons1:ASBOPenHentStatistikkRequest"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="hentStatistikkPrTypeResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentStatistikkPrTypeResponse" nillable="true" type="bons1:ASBOPenStatistikk"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="erTidsbrukAktivert">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="erTidsbrukAktivertRequest" nillable="true" type="bons1:ASBOPenHenvendelse"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="erTidsbrukAktivertResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="erTidsbrukAktivertResponse" nillable="true" type="xsd:boolean"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="opprettHenvendelse_faultPenGenerisk" type="bons7:FaultPenGenerisk"/>
-      <xsd:element name="lagreHenvendelse_faultPenGenerisk" type="bons7:FaultPenGenerisk"/>
-      <xsd:element name="erTidsbrukAktivert_faultPenGenerisk" type="bons7:FaultPenGenerisk"/>
-      <xsd:element name="hentStatistikkPrType_faultPenGenerisk" type="bons7:FaultPenGenerisk"/>
-      <xsd:element name="hentStatistikkPrKanal_faultPenGenerisk" type="bons7:FaultPenGenerisk"/>
-      <xsd:element name="hentStatistikkHenvendelseGjelder_faultPenGenerisk" type="bons7:FaultPenGenerisk"/>
-      <xsd:element name="hentStatistikkAntall_faultPenGenerisk" type="bons7:FaultPenGenerisk"/>
-      <xsd:element name="hentHenvendelseListe_faultPenGenerisk" type="bons7:FaultPenGenerisk"/>
-      <xsd:element name="hentHenvendelse_faultPenGenerisk" type="bons7:FaultPenGenerisk"/>
-            <xsd:element name="lagreHenvendelse_faultPenHenvendelseIkkeFunnet" type="bons5:FaultPenHenvendelseIkkeFunnet"/>
-            <xsd:element name="hentHenvendelse_faultPenHenvendelseIkkeFunnet" type="bons5:FaultPenHenvendelseIkkeFunnet"/>
-        </xsd:schema>
-  </wsdl:types>
-    <wsdl:message name="opprettHenvendelseRequestMsg">
-    <wsdl:part element="tns:opprettHenvendelse" name="opprettHenvendelseParameters"/>
-  </wsdl:message>
-    <wsdl:message name="opprettHenvendelseResponseMsg">
-    <wsdl:part element="tns:opprettHenvendelseResponse" name="opprettHenvendelseResult"/>
-  </wsdl:message>
-    <wsdl:message name="lagreHenvendelseRequestMsg">
-    <wsdl:part element="tns:lagreHenvendelse" name="lagreHenvendelseParameters"/>
-  </wsdl:message>
-    <wsdl:message name="lagreHenvendelseResponseMsg">
-    <wsdl:part element="tns:lagreHenvendelseResponse" name="lagreHenvendelseResult"/>
-  </wsdl:message>
-    <wsdl:message name="hentHenvendelseRequestMsg">
-    <wsdl:part element="tns:hentHenvendelse" name="hentHenvendelseParameters"/>
-  </wsdl:message>
-    <wsdl:message name="hentHenvendelseResponseMsg">
-    <wsdl:part element="tns:hentHenvendelseResponse" name="hentHenvendelseResult"/>
-  </wsdl:message>
-    <wsdl:message name="hentHenvendelseListeRequestMsg">
-    <wsdl:part element="tns:hentHenvendelseListe" name="hentHenvendelseListeParameters"/>
-  </wsdl:message>
-    <wsdl:message name="hentHenvendelseListeResponseMsg">
-    <wsdl:part element="tns:hentHenvendelseListeResponse" name="hentHenvendelseListeResult"/>
-  </wsdl:message>
-    <wsdl:message name="hentStatistikkAntallRequestMsg">
-    <wsdl:part element="tns:hentStatistikkAntall" name="hentStatistikkAntallParameters"/>
-  </wsdl:message>
-    <wsdl:message name="hentStatistikkAntallResponseMsg">
-    <wsdl:part element="tns:hentStatistikkAntallResponse" name="hentStatistikkAntallResult"/>
-  </wsdl:message>
-    <wsdl:message name="hentStatistikkHenvendelseGjelderRequestMsg">
-    <wsdl:part element="tns:hentStatistikkHenvendelseGjelder" name="hentStatistikkHenvendelseGjelderParameters"/>
-  </wsdl:message>
-    <wsdl:message name="hentStatistikkHenvendelseGjelderResponseMsg">
-    <wsdl:part element="tns:hentStatistikkHenvendelseGjelderResponse" name="hentStatistikkHenvendelseGjelderResult"/>
-  </wsdl:message>
-    <wsdl:message name="hentStatistikkPrKanalRequestMsg">
-    <wsdl:part element="tns:hentStatistikkPrKanal" name="hentStatistikkPrKanalParameters"/>
-  </wsdl:message>
-    <wsdl:message name="hentStatistikkPrKanalResponseMsg">
-    <wsdl:part element="tns:hentStatistikkPrKanalResponse" name="hentStatistikkPrKanalResult"/>
-  </wsdl:message>
-    <wsdl:message name="hentStatistikkPrTypeRequestMsg">
-    <wsdl:part element="tns:hentStatistikkPrType" name="hentStatistikkPrTypeParameters"/>
-  </wsdl:message>
-    <wsdl:message name="hentStatistikkPrTypeResponseMsg">
-    <wsdl:part element="tns:hentStatistikkPrTypeResponse" name="hentStatistikkPrTypeResult"/>
-  </wsdl:message>
-    <wsdl:message name="erTidsbrukAktivertRequestMsg">
-    <wsdl:part element="tns:erTidsbrukAktivert" name="erTidsbrukAktivertParameters"/>
-  </wsdl:message>
-    <wsdl:message name="erTidsbrukAktivertResponseMsg">
-    <wsdl:part element="tns:erTidsbrukAktivertResponse" name="erTidsbrukAktivertResult"/>
-  </wsdl:message>
-    <wsdl:message name="opprettHenvendelse_faultPenGeneriskMsg">
-    <wsdl:part element="tns:opprettHenvendelse_faultPenGenerisk" name="faultPenGenerisk"/>
-  </wsdl:message>
-    <wsdl:message name="lagreHenvendelse_faultPenGeneriskMsg">
-    <wsdl:part element="tns:lagreHenvendelse_faultPenGenerisk" name="faultPenGenerisk"/>
-  </wsdl:message>
-    <wsdl:message name="erTidsbrukAktivert_faultPenGeneriskMsg">
-    <wsdl:part element="tns:erTidsbrukAktivert_faultPenGenerisk" name="faultPenGenerisk"/>
-  </wsdl:message>
-    <wsdl:message name="hentStatistikkPrType_faultPenGeneriskMsg">
-    <wsdl:part element="tns:hentStatistikkPrType_faultPenGenerisk" name="faultPenGenerisk"/>
-  </wsdl:message>
-    <wsdl:message name="hentStatistikkPrKanal_faultPenGeneriskMsg">
-    <wsdl:part element="tns:hentStatistikkPrKanal_faultPenGenerisk" name="faultPenGenerisk"/>
-  </wsdl:message>
-    <wsdl:message name="hentStatistikkHenvendelseGjelder_faultPenGeneriskMsg">
-    <wsdl:part element="tns:hentStatistikkHenvendelseGjelder_faultPenGenerisk" name="faultPenGenerisk"/>
-  </wsdl:message>
-    <wsdl:message name="hentStatistikkAntall_faultPenGeneriskMsg">
-    <wsdl:part element="tns:hentStatistikkAntall_faultPenGenerisk" name="faultPenGenerisk"/>
-  </wsdl:message>
-    <wsdl:message name="hentHenvendelseListe_faultPenGeneriskMsg">
-    <wsdl:part element="tns:hentHenvendelseListe_faultPenGenerisk" name="faultPenGenerisk"/>
-  </wsdl:message>
-    <wsdl:message name="hentHenvendelse_faultPenGeneriskMsg">
-    <wsdl:part element="tns:hentHenvendelse_faultPenGenerisk" name="faultPenGenerisk"/>
-  </wsdl:message>
-    <wsdl:message name="lagreHenvendelse_faultPenHenvendelseIkkeFunnetMsg">
-    <wsdl:part element="tns:lagreHenvendelse_faultPenHenvendelseIkkeFunnet" name="faultPenHenvendelseIkkeFunnet"/>
-  </wsdl:message>
-    <wsdl:message name="hentHenvendelse_faultPenHenvendelseIkkeFunnetMsg">
-    <wsdl:part element="tns:hentHenvendelse_faultPenHenvendelseIkkeFunnet" name="faultPenHenvendelseIkkeFunnet"/>
-  </wsdl:message>
-    <wsdl:portType name="PSAKHenvendelse">
-    <wsdl:operation name="opprettHenvendelse">
-      <wsdl:input message="tns:opprettHenvendelseRequestMsg" name="opprettHenvendelseRequest"/>
-      <wsdl:output message="tns:opprettHenvendelseResponseMsg" name="opprettHenvendelseResponse"/>
-      <wsdl:fault message="tns:opprettHenvendelse_faultPenGeneriskMsg" name="faultPenGenerisk"/>
-        </wsdl:operation>
-    <wsdl:operation name="lagreHenvendelse">
-      <wsdl:input message="tns:lagreHenvendelseRequestMsg" name="lagreHenvendelseRequest"/>
-      <wsdl:output message="tns:lagreHenvendelseResponseMsg" name="lagreHenvendelseResponse"/>
-      <wsdl:fault message="tns:lagreHenvendelse_faultPenGeneriskMsg" name="faultPenGenerisk"/>
-            <wsdl:fault message="tns:lagreHenvendelse_faultPenHenvendelseIkkeFunnetMsg" name="faultPenHenvendelseIkkeFunnet"/>
-        </wsdl:operation>
-    <wsdl:operation name="hentHenvendelse">
-      <wsdl:input message="tns:hentHenvendelseRequestMsg" name="hentHenvendelseRequest"/>
-      <wsdl:output message="tns:hentHenvendelseResponseMsg" name="hentHenvendelseResponse"/>
-      <wsdl:fault message="tns:hentHenvendelse_faultPenGeneriskMsg" name="faultPenGenerisk"/>
-            <wsdl:fault message="tns:hentHenvendelse_faultPenHenvendelseIkkeFunnetMsg" name="faultPenHenvendelseIkkeFunnet"/>
-        </wsdl:operation>
-    <wsdl:operation name="hentHenvendelseListe">
-      <wsdl:input message="tns:hentHenvendelseListeRequestMsg" name="hentHenvendelseListeRequest"/>
-      <wsdl:output message="tns:hentHenvendelseListeResponseMsg" name="hentHenvendelseListeResponse"/>
-      <wsdl:fault message="tns:hentHenvendelseListe_faultPenGeneriskMsg" name="faultPenGenerisk"/>
-        </wsdl:operation>
-    <wsdl:operation name="hentStatistikkAntall">
-      <wsdl:input message="tns:hentStatistikkAntallRequestMsg" name="hentStatistikkAntallRequest"/>
-      <wsdl:output message="tns:hentStatistikkAntallResponseMsg" name="hentStatistikkAntallResponse"/>
-      <wsdl:fault message="tns:hentStatistikkAntall_faultPenGeneriskMsg" name="faultPenGenerisk"/>
-        </wsdl:operation>
-    <wsdl:operation name="hentStatistikkHenvendelseGjelder">
-      <wsdl:input message="tns:hentStatistikkHenvendelseGjelderRequestMsg" name="hentStatistikkHenvendelseGjelderRequest"/>
-      <wsdl:output message="tns:hentStatistikkHenvendelseGjelderResponseMsg" name="hentStatistikkHenvendelseGjelderResponse"/>
-      <wsdl:fault message="tns:hentStatistikkHenvendelseGjelder_faultPenGeneriskMsg" name="faultPenGenerisk"/>
-        </wsdl:operation>
-    <wsdl:operation name="hentStatistikkPrKanal">
-      <wsdl:input message="tns:hentStatistikkPrKanalRequestMsg" name="hentStatistikkPrKanalRequest"/>
-      <wsdl:output message="tns:hentStatistikkPrKanalResponseMsg" name="hentStatistikkPrKanalResponse"/>
-      <wsdl:fault message="tns:hentStatistikkPrKanal_faultPenGeneriskMsg" name="faultPenGenerisk"/>
-        </wsdl:operation>
-    <wsdl:operation name="hentStatistikkPrType">
-      <wsdl:input message="tns:hentStatistikkPrTypeRequestMsg" name="hentStatistikkPrTypeRequest"/>
-      <wsdl:output message="tns:hentStatistikkPrTypeResponseMsg" name="hentStatistikkPrTypeResponse"/>
-      <wsdl:fault message="tns:hentStatistikkPrType_faultPenGeneriskMsg" name="faultPenGenerisk"/>
-        </wsdl:operation>
-    <wsdl:operation name="erTidsbrukAktivert">
-      <wsdl:input message="tns:erTidsbrukAktivertRequestMsg" name="erTidsbrukAktivertRequest"/>
-      <wsdl:output message="tns:erTidsbrukAktivertResponseMsg" name="erTidsbrukAktivertResponse"/>
-      <wsdl:fault message="tns:erTidsbrukAktivert_faultPenGeneriskMsg" name="faultPenGenerisk"/>
-        </wsdl:operation>
-  </wsdl:portType>
-</wsdl:definitions>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKInstitusjonsopphold.wsdl b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKInstitusjonsopphold.wsdl
deleted file mode 100644
index e4dfa54..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKInstitusjonsopphold.wsdl
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions name="PSAKInstitusjonsopphold" targetNamespace="http://nav-cons-pen-psak-institusjonsopphold/no/nav/inf" xmlns:bons5="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/institusjonsopphold" xmlns:bons6="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/institusjonsopphold" xmlns:bons7="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" xmlns:tns="http://nav-cons-pen-psak-institusjonsopphold/no/nav/inf" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://nav-cons-pen-psak-institusjonsopphold/no/nav/inf">     
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/institusjonsopphold" schemaLocation="../lib/pen/psakpselv/asbo/institusjonsopphold/ASBOPenInstitusjonsOpphold.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/institusjonsopphold" schemaLocation="../lib/pen/psakpselv/fault/institusjonsopphold/FaultPenFnrIkkeFunnet.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/institusjonsopphold" schemaLocation="../lib/pen/psakpselv/fault/institusjonsopphold/FaultPenInstitusjonsoppholdIkkeFunnet.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/institusjonsopphold" schemaLocation="../lib/pen/psakpselv/fault/institusjonsopphold/FaultPenOppholdPeriodeIdIkkeFunnet.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/samhandler" schemaLocation="../lib/pen/psakpselv/fault/samhandler/FaultPenSamhandlerIkkeFunnet.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" schemaLocation="../lib/pen/psakpselv/fault/FaultPenGenerisk.xsd"/>
-      <xsd:element name="lagreInstitusjonsopphold">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="lagreInstitusjonsoppholdRequest" nillable="true" type="bons5:ASBOPenInstitusjonsOpphold"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="lagreInstitusjonsoppholdResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="lagreInstitusjonsoppholdResponse" nillable="true" type="bons5:ASBOPenInstitusjonsOpphold"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="lagreInstitusjonsopphold_faultPenFnrIkkeFunnet" type="bons6:FaultPenFnrIkkeFunnet"/>
-      <xsd:element name="lagreInstitusjonsopphold_faultPenOppholdPeriodeIdIkkeFunnet" type="bons6:FaultPenOppholdPeriodeIdIkkeFunnet"/>
-      <xsd:element name="lagreInstitusjonsopphold_faultPenGenerisk" type="bons7:FaultPenGenerisk"/>
-      <xsd:element name="opprettInstitusjonsopphold">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="opprettInstitusjonsoppholdRequest" nillable="true" type="bons5:ASBOPenInstitusjonsOpphold"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="opprettInstitusjonsoppholdResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="opprettInstitusjonsoppholdResponse" nillable="true" type="bons5:ASBOPenInstitusjonsOpphold"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="opprettInstitusjonsopphold_faultPenFnrIkkeFunnet" type="bons6:FaultPenFnrIkkeFunnet"/>
-      <xsd:element name="opprettInstitusjonsopphold_faultPenGenerisk" type="bons7:FaultPenGenerisk"/>
-      <xsd:element name="slettInstitusjonsopphold">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="slettInstitusjonsoppholdRequest" nillable="true" type="bons5:ASBOPenInstitusjonsOpphold"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="slettInstitusjonsoppholdResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="tomResponse" nillable="true" type="xsd:string"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="slettInstitusjonsopphold_faultPenInstitusjonsoppholdIkkeFunnet" type="bons6:FaultPenInstitusjonsoppholdIkkeFunnet"/>
-      <xsd:element name="slettInstitusjonsopphold_faultPenGenerisk" type="bons7:FaultPenGenerisk"/>
-        </xsd:schema>
-  </wsdl:types>
-    <wsdl:message name="lagreInstitusjonsoppholdRequestMsg">
-    <wsdl:part element="tns:lagreInstitusjonsopphold" name="lagreInstitusjonsoppholdParameters"/>
-  </wsdl:message>
-    <wsdl:message name="lagreInstitusjonsoppholdResponseMsg">
-    <wsdl:part element="tns:lagreInstitusjonsoppholdResponse" name="lagreInstitusjonsoppholdResult"/>
-  </wsdl:message>
-    <wsdl:message name="lagreInstitusjonsopphold_faultPenFnrIkkeFunnetMsg">
-    <wsdl:part element="tns:lagreInstitusjonsopphold_faultPenFnrIkkeFunnet" name="faultPenFnrIkkeFunnet"/>
-  </wsdl:message>
-    <wsdl:message name="lagreInstitusjonsopphold_faultPenOppholdPeriodeIdIkkeFunnetMsg">
-    <wsdl:part element="tns:lagreInstitusjonsopphold_faultPenOppholdPeriodeIdIkkeFunnet" name="faultPenOppholdPeriodeIdIkkeFunnet"/>
-  </wsdl:message>
-    <wsdl:message name="lagreInstitusjonsopphold_faultPenGeneriskMsg">
-    <wsdl:part element="tns:lagreInstitusjonsopphold_faultPenGenerisk" name="faultPenGenerisk"/>
-  </wsdl:message>
-    <wsdl:message name="opprettInstitusjonsoppholdRequestMsg">
-    <wsdl:part element="tns:opprettInstitusjonsopphold" name="opprettInstitusjonsoppholdParameters"/>
-  </wsdl:message>
-    <wsdl:message name="opprettInstitusjonsoppholdResponseMsg">
-    <wsdl:part element="tns:opprettInstitusjonsoppholdResponse" name="opprettInstitusjonsoppholdResult"/>
-  </wsdl:message>
-    <wsdl:message name="opprettInstitusjonsopphold_faultPenFnrIkkeFunnetMsg">
-    <wsdl:part element="tns:opprettInstitusjonsopphold_faultPenFnrIkkeFunnet" name="faultPenFnrIkkeFunnet"/>
-  </wsdl:message>
-    <wsdl:message name="opprettInstitusjonsopphold_faultPenGeneriskMsg">
-    <wsdl:part element="tns:opprettInstitusjonsopphold_faultPenGenerisk" name="faultPenGenerisk"/>
-  </wsdl:message>
-    <wsdl:message name="slettInstitusjonsoppholdRequestMsg">
-    <wsdl:part element="tns:slettInstitusjonsopphold" name="slettInstitusjonsoppholdParameters"/>
-  </wsdl:message>
-    <wsdl:message name="slettInstitusjonsoppholdResponseMsg">
-    <wsdl:part element="tns:slettInstitusjonsoppholdResponse" name="slettInstitusjonsoppholdResult"/>
-  </wsdl:message>
-    <wsdl:message name="slettInstitusjonsopphold_faultPenInstitusjonsoppholdIkkeFunnetMsg">
-    <wsdl:part element="tns:slettInstitusjonsopphold_faultPenInstitusjonsoppholdIkkeFunnet" name="faultPenInstitusjonsoppholdIkkeFunnet"/>
-  </wsdl:message>
-    <wsdl:message name="slettInstitusjonsopphold_faultPenGeneriskMsg">
-    <wsdl:part element="tns:slettInstitusjonsopphold_faultPenGenerisk" name="faultPenGenerisk"/>
-  </wsdl:message>
-    <wsdl:portType name="PSAKInstitusjonsopphold">
-    <wsdl:operation name="lagreInstitusjonsopphold">
-      <wsdl:input message="tns:lagreInstitusjonsoppholdRequestMsg" name="lagreInstitusjonsoppholdRequest"/>
-      <wsdl:output message="tns:lagreInstitusjonsoppholdResponseMsg" name="lagreInstitusjonsoppholdResponse"/>
-      <wsdl:fault message="tns:lagreInstitusjonsopphold_faultPenFnrIkkeFunnetMsg" name="faultPenFnrIkkeFunnet"/>
-      <wsdl:fault message="tns:lagreInstitusjonsopphold_faultPenOppholdPeriodeIdIkkeFunnetMsg" name="faultPenOppholdPeriodeIdIkkeFunnet"/>
-      <wsdl:fault message="tns:lagreInstitusjonsopphold_faultPenGeneriskMsg" name="faultPenGenerisk"/>
-    </wsdl:operation>
-    <wsdl:operation name="opprettInstitusjonsopphold">
-      <wsdl:input message="tns:opprettInstitusjonsoppholdRequestMsg" name="opprettInstitusjonsoppholdRequest"/>
-      <wsdl:output message="tns:opprettInstitusjonsoppholdResponseMsg" name="opprettInstitusjonsoppholdResponse"/>
-      <wsdl:fault message="tns:opprettInstitusjonsopphold_faultPenFnrIkkeFunnetMsg" name="faultPenFnrIkkeFunnet"/>
-      <wsdl:fault message="tns:opprettInstitusjonsopphold_faultPenGeneriskMsg" name="faultPenGenerisk"/>
-    </wsdl:operation>
-    <wsdl:operation name="slettInstitusjonsopphold">
-      <wsdl:input message="tns:slettInstitusjonsoppholdRequestMsg" name="slettInstitusjonsoppholdRequest"/>
-      <wsdl:output message="tns:slettInstitusjonsoppholdResponseMsg" name="slettInstitusjonsoppholdResponse"/>
-      <wsdl:fault message="tns:slettInstitusjonsopphold_faultPenInstitusjonsoppholdIkkeFunnetMsg" name="faultPenInstitusjonsoppholdIkkeFunnet"/>
-      <wsdl:fault message="tns:slettInstitusjonsopphold_faultPenGeneriskMsg" name="faultPenGenerisk"/>
-    </wsdl:operation>
-  </wsdl:portType>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKNAVOrgEnhet.wsdl b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKNAVOrgEnhet.wsdl
deleted file mode 100644
index 8752c5c..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKNAVOrgEnhet.wsdl
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:bons1="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/navorgenhet" xmlns:bons2="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/navorgenhet" xmlns:bons3="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" xmlns:tns="http://nav-cons-pen-psak-navorgenhet/no/nav/inf" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="PSAKNAVOrgEnhet" targetNamespace="http://nav-cons-pen-psak-navorgenhet/no/nav/inf">
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://nav-cons-pen-psak-navorgenhet/no/nav/inf" xmlns:bons1="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/navorgenhet" xmlns:bons2="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/navorgenhet" xmlns:bons3="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" xmlns:tns="http://nav-cons-pen-psak-navorgenhet/no/nav/inf" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/navorgenhet" schemaLocation="../lib/pen/psakpselv/fault/navorgenhet/FaultPenPersonManglerEnhet.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/navorgenhet" schemaLocation="../lib/pen/psakpselv/asbo/navorgenhet/ASBOPenHentForvaltningsenhetTilPersonListeRequest.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/navorgenhet" schemaLocation="../lib/pen/psakpselv/asbo/navorgenhet/ASBOPenFinnArenaNAVEnhetListeRequest.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" schemaLocation="../lib/pen/psakpselv/fault/FaultPenPersonIkkeFunnet.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/navorgenhet" schemaLocation="../lib/pen/psakpselv/asbo/navorgenhet/ASBOPenNAVEnhet.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/navorgenhet" schemaLocation="../lib/pen/psakpselv/asbo/navorgenhet/ASBOPenHentSpesialEnhetTilPersonRequest.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/navorgenhet" schemaLocation="../lib/pen/psakpselv/asbo/navorgenhet/ASBOPenFinnNAVEnhetRequest.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/navorgenhet" schemaLocation="../lib/pen/psakpselv/asbo/navorgenhet/ASBOPenNAVEnhetListe.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/navorgenhet" schemaLocation="../lib/pen/psakpselv/asbo/navorgenhet/ASBOPenHentNAVEnhetListeRequest.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/navorgenhet" schemaLocation="../lib/pen/psakpselv/fault/navorgenhet/FaultPenNAVEnhetIkkeFunnet.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" schemaLocation="../lib/pen/psakpselv/fault/FaultPenGenerisk.xsd"/>
-      <xsd:element name="hentNAVEnhet">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentNAVEnhetRequest" nillable="true" type="bons1:ASBOPenNAVEnhet"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="hentNAVEnhetResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentNAVEnhetResponse" nillable="true" type="bons1:ASBOPenNAVEnhet"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="hentNAVEnhetListe">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentNAVEnhetListeRequest" nillable="true" type="bons1:ASBOPenHentNAVEnhetListeRequest"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="hentNAVEnhetListeResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentNAVEnhetListeResponse" nillable="true" type="bons1:ASBOPenNAVEnhetListe"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="hentNAVEnhetGruppeListe">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentNAVEnhetGruppeListeRequest" nillable="true" type="bons1:ASBOPenNAVEnhet"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="hentNAVEnhetGruppeListeResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentNAVEnhetGruppeListeResponse" nillable="true" type="bons1:ASBOPenNAVEnhetListe"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="hentSpesialenhetTilPerson">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentSpesialenhetTilPersonRequest" nillable="true" type="bons1:ASBOPenHentSpesialEnhetTilPersonRequest"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="hentSpesialenhetTilPersonResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentSpesialenhetTilPersonResponse" nillable="true" type="bons1:ASBOPenNAVEnhetListe"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="finnNAVEnhet">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="finnNAVEnhetRequest" nillable="true" type="bons1:ASBOPenFinnNAVEnhetRequest"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="finnNAVEnhetResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="finnNAVEnhetResponse" nillable="true" type="bons1:ASBOPenNAVEnhetListe"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="hentNAVEnhet_faultPenNAVEnhetIkkeFunnet" type="bons2:FaultPenNAVEnhetIkkeFunnet"/>
-      <xsd:element name="hentNAVEnhet_faultPenGenerisk" type="bons3:FaultPenGenerisk"/>
-      <xsd:element name="hentNAVEnhetListe_faultPenNAVEnhetIkkeFunnet" type="bons2:FaultPenNAVEnhetIkkeFunnet"/>
-      <xsd:element name="hentNAVEnhetListe_faultPenGenerisk" type="bons3:FaultPenGenerisk"/>
-      <xsd:element name="hentNAVEnhetGruppeListe_faultPenNAVEnhetIkkeFunnet" type="bons2:FaultPenNAVEnhetIkkeFunnet"/>
-      <xsd:element name="hentNAVEnhetGruppeListe_faultPenGenerisk" type="bons3:FaultPenGenerisk"/>
-      <xsd:element name="hentSpesialenhetTilPerson_faultPenPersonIkkeFunnet" type="bons3:FaultPenPersonIkkeFunnet"/>
-      <xsd:element name="hentSpesialenhetTilPerson_faultPenNAVEnhetIkkeFunnet" type="bons2:FaultPenNAVEnhetIkkeFunnet"/>
-      <xsd:element name="hentSpesialenhetTilPerson_faultPenGenerisk" type="bons3:FaultPenGenerisk"/>
-      <xsd:element name="finnNAVEnhet_faultPenGenerisk" type="bons3:FaultPenGenerisk"/>
-            <xsd:element name="finnArenaNAVEnhetListe">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="finnArenaNAVEnhetListeRequest" nillable="true" type="bons1:ASBOPenFinnArenaNAVEnhetListeRequest"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-            <xsd:element name="finnArenaNAVEnhetListeResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="finnArenaNAVEnhetListeResponse" nillable="true" type="bons1:ASBOPenNAVEnhetListe"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-            <xsd:element name="hentForvaltningsenhetTilPersonListe">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentForvaltningsenhetTilPersonListeRequest" nillable="true" type="bons1:ASBOPenHentForvaltningsenhetTilPersonListeRequest"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-            <xsd:element name="hentForvaltningsenhetTilPersonListeResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentForvaltningsenhetTilPersonListeResponse" nillable="true" type="bons1:ASBOPenNAVEnhetListe"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-            <xsd:element name="FaultPenPersonManglerEnhet_element" nillable="true" type="bons2:FaultPenPersonManglerEnhet"/>
-        </xsd:schema>
-  </wsdl:types>
-    <wsdl:message name="hentNAVEnhetRequestMsg">
-    <wsdl:part element="tns:hentNAVEnhet" name="hentNAVEnhetParameters"/>
-  </wsdl:message>
-    <wsdl:message name="hentNAVEnhetResponseMsg">
-    <wsdl:part element="tns:hentNAVEnhetResponse" name="hentNAVEnhetResult"/>
-  </wsdl:message>
-    <wsdl:message name="hentNAVEnhetListeRequestMsg">
-    <wsdl:part element="tns:hentNAVEnhetListe" name="hentNAVEnhetListeParameters"/>
-  </wsdl:message>
-    <wsdl:message name="hentNAVEnhetListeResponseMsg">
-    <wsdl:part element="tns:hentNAVEnhetListeResponse" name="hentNAVEnhetListeResult"/>
-  </wsdl:message>
-    <wsdl:message name="hentNAVEnhetGruppeListeRequestMsg">
-    <wsdl:part element="tns:hentNAVEnhetGruppeListe" name="hentNAVEnhetGruppeListeParameters"/>
-  </wsdl:message>
-    <wsdl:message name="hentNAVEnhetGruppeListeResponseMsg">
-    <wsdl:part element="tns:hentNAVEnhetGruppeListeResponse" name="hentNAVEnhetGruppeListeResult"/>
-  </wsdl:message>
-    <wsdl:message name="hentSpesialenhetTilPersonRequestMsg">
-    <wsdl:part element="tns:hentSpesialenhetTilPerson" name="hentSpesialenhetTilPersonParameters"/>
-  </wsdl:message>
-    <wsdl:message name="hentSpesialenhetTilPersonResponseMsg">
-    <wsdl:part element="tns:hentSpesialenhetTilPersonResponse" name="hentSpesialenhetTilPersonResult"/>
-  </wsdl:message>
-    <wsdl:message name="finnNAVEnhetRequestMsg">
-    <wsdl:part element="tns:finnNAVEnhet" name="finnNAVEnhetParameters"/>
-  </wsdl:message>
-    <wsdl:message name="finnNAVEnhetResponseMsg">
-    <wsdl:part element="tns:finnNAVEnhetResponse" name="finnNAVEnhetResult"/>
-  </wsdl:message>
-    <wsdl:message name="hentNAVEnhet_faultPenNAVEnhetIkkeFunnetMsg">
-    <wsdl:part element="tns:hentNAVEnhet_faultPenNAVEnhetIkkeFunnet" name="faultPenNAVEnhetIkkeFunnet"/>
-  </wsdl:message>
-    <wsdl:message name="hentNAVEnhet_faultPenGeneriskMsg">
-    <wsdl:part element="tns:hentNAVEnhet_faultPenGenerisk" name="faultPenGenerisk"/>
-  </wsdl:message>
-    <wsdl:message name="hentNAVEnhetListe_faultPenNAVEnhetIkkeFunnetMsg">
-    <wsdl:part element="tns:hentNAVEnhetListe_faultPenNAVEnhetIkkeFunnet" name="faultPenNAVEnhetIkkeFunnet"/>
-  </wsdl:message>
-    <wsdl:message name="hentNAVEnhetListe_faultPenGeneriskMsg">
-    <wsdl:part element="tns:hentNAVEnhetListe_faultPenGenerisk" name="faultPenGenerisk"/>
-  </wsdl:message>
-    <wsdl:message name="hentNAVEnhetGruppeListe_faultPenNAVEnhetIkkeFunnetMsg">
-    <wsdl:part element="tns:hentNAVEnhetGruppeListe_faultPenNAVEnhetIkkeFunnet" name="faultPenNAVEnhetIkkeFunnet"/>
-  </wsdl:message>
-    <wsdl:message name="hentNAVEnhetGruppeListe_faultPenGeneriskMsg">
-    <wsdl:part element="tns:hentNAVEnhetGruppeListe_faultPenGenerisk" name="faultPenGenerisk"/>
-  </wsdl:message>
-    <wsdl:message name="hentSpesialenhetTilPerson_faultPenPersonIkkeFunnetMsg">
-    <wsdl:part element="tns:hentSpesialenhetTilPerson_faultPenPersonIkkeFunnet" name="faultPenPersonIkkeFunnet"/>
-  </wsdl:message>
-    <wsdl:message name="hentSpesialenhetTilPerson_faultPenNAVEnhetIkkeFunnetMsg">
-    <wsdl:part element="tns:hentSpesialenhetTilPerson_faultPenNAVEnhetIkkeFunnet" name="faultPenNAVEnhetIkkeFunnet"/>
-  </wsdl:message>
-    <wsdl:message name="hentSpesialenhetTilPerson_faultPenGeneriskMsg">
-    <wsdl:part element="tns:hentSpesialenhetTilPerson_faultPenGenerisk" name="faultPenGenerisk"/>
-  </wsdl:message>
-    <wsdl:message name="finnNAVEnhet_faultPenGeneriskMsg">
-    <wsdl:part element="tns:finnNAVEnhet_faultPenGenerisk" name="faultPenGenerisk"/>
-  </wsdl:message>
-    <wsdl:message name="finnArenaNAVEnhetListeRequestMsg">
-    <wsdl:part element="tns:finnArenaNAVEnhetListe" name="finnArenaNAVEnhetListeParameters"/>
-  </wsdl:message>
-    <wsdl:message name="finnArenaNAVEnhetListeResponseMsg">
-    <wsdl:part element="tns:finnArenaNAVEnhetListeResponse" name="finnArenaNAVEnhetListeResult"/>
-  </wsdl:message>
-    <wsdl:message name="finnArenaNAVEnhetListe_faultPenGeneriskMsg">
-    <wsdl:part element="tns:hentNAVEnhet_faultPenGenerisk" name="faultPenGenerisk"/>
-  </wsdl:message>
-    <wsdl:message name="hentForvaltningsenhetTilPersonListeRequestMsg">
-    <wsdl:part element="tns:hentForvaltningsenhetTilPersonListe" name="hentForvaltningsenhetTilPersonListeParameters"/>
-  </wsdl:message>
-    <wsdl:message name="hentForvaltningsenhetTilPersonListeResponseMsg">
-    <wsdl:part element="tns:hentForvaltningsenhetTilPersonListeResponse" name="hentForvaltningsenhetTilPersonListeResult"/>
-  </wsdl:message>
-    <wsdl:message name="hentForvaltningsenhetTilPersonListe_faultPenPersonIkkeFunnetMsg">
-    <wsdl:part element="tns:hentSpesialenhetTilPerson_faultPenPersonIkkeFunnet" name="faultPenPersonIkkeFunnet"/>
-  </wsdl:message>
-    <wsdl:message name="hentForvaltningsenhetTilPersonListe_faultPenNAVEnhetIkkeFunnetMsg">
-    <wsdl:part element="tns:hentNAVEnhet_faultPenNAVEnhetIkkeFunnet" name="faultPenNAVEnhetIkkeFunnet"/>
-  </wsdl:message>
-    <wsdl:message name="hentForvaltningsenhetTilPersonListe_faultPenPersonManglerEnhetMsg">
-    <wsdl:part element="tns:FaultPenPersonManglerEnhet_element" name="faultPenPersonManglerEnhet"/>
-  </wsdl:message>
-    <wsdl:portType name="PSAKNAVOrgEnhet">
-    <wsdl:operation name="hentNAVEnhet">
-      <wsdl:input message="tns:hentNAVEnhetRequestMsg" name="hentNAVEnhetRequest"/>
-      <wsdl:output message="tns:hentNAVEnhetResponseMsg" name="hentNAVEnhetResponse"/>
-      <wsdl:fault message="tns:hentNAVEnhet_faultPenNAVEnhetIkkeFunnetMsg" name="faultPenNAVEnhetIkkeFunnet"/>
-      <wsdl:fault message="tns:hentNAVEnhet_faultPenGeneriskMsg" name="faultPenGenerisk"/>
-    </wsdl:operation>
-    <wsdl:operation name="hentNAVEnhetListe">
-      <wsdl:input message="tns:hentNAVEnhetListeRequestMsg" name="hentNAVEnhetListeRequest"/>
-      <wsdl:output message="tns:hentNAVEnhetListeResponseMsg" name="hentNAVEnhetListeResponse"/>
-      <wsdl:fault message="tns:hentNAVEnhetListe_faultPenNAVEnhetIkkeFunnetMsg" name="faultPenNAVEnhetIkkeFunnet"/>
-      <wsdl:fault message="tns:hentNAVEnhetListe_faultPenGeneriskMsg" name="faultPenGenerisk"/>
-    </wsdl:operation>
-    <wsdl:operation name="hentNAVEnhetGruppeListe">
-      <wsdl:input message="tns:hentNAVEnhetGruppeListeRequestMsg" name="hentNAVEnhetGruppeListeRequest"/>
-      <wsdl:output message="tns:hentNAVEnhetGruppeListeResponseMsg" name="hentNAVEnhetGruppeListeResponse"/>
-      <wsdl:fault message="tns:hentNAVEnhetGruppeListe_faultPenNAVEnhetIkkeFunnetMsg" name="faultPenNAVEnhetIkkeFunnet"/>
-      <wsdl:fault message="tns:hentNAVEnhetGruppeListe_faultPenGeneriskMsg" name="faultPenGenerisk"/>
-    </wsdl:operation>
-    <wsdl:operation name="hentSpesialenhetTilPerson">
-      <wsdl:input message="tns:hentSpesialenhetTilPersonRequestMsg" name="hentSpesialenhetTilPersonRequest"/>
-      <wsdl:output message="tns:hentSpesialenhetTilPersonResponseMsg" name="hentSpesialenhetTilPersonResponse"/>
-      <wsdl:fault message="tns:hentSpesialenhetTilPerson_faultPenPersonIkkeFunnetMsg" name="faultPenPersonIkkeFunnet"/>
-      <wsdl:fault message="tns:hentSpesialenhetTilPerson_faultPenNAVEnhetIkkeFunnetMsg" name="faultPenNAVEnhetIkkeFunnet"/>
-      <wsdl:fault message="tns:hentSpesialenhetTilPerson_faultPenGeneriskMsg" name="faultPenGenerisk"/>
-    </wsdl:operation>
-    <wsdl:operation name="finnNAVEnhet">
-      <wsdl:input message="tns:finnNAVEnhetRequestMsg" name="finnNAVEnhetRequest"/>
-      <wsdl:output message="tns:finnNAVEnhetResponseMsg" name="finnNAVEnhetResponse"/>
-      <wsdl:fault message="tns:finnNAVEnhet_faultPenGeneriskMsg" name="faultPenGenerisk"/>
-    </wsdl:operation>
-        <wsdl:operation name="finnArenaNAVEnhetListe">
-      <wsdl:input message="tns:finnArenaNAVEnhetListeRequestMsg" name="finnArenaNAVEnhetListeRequest"/>
-      <wsdl:output message="tns:finnArenaNAVEnhetListeResponseMsg" name="finnArenaNAVEnhetListeResponse"/>
-      <wsdl:fault message="tns:finnArenaNAVEnhetListe_faultPenGeneriskMsg" name="faultPenGenerisk"/>
-    </wsdl:operation>
-        <wsdl:operation name="hentForvaltningsenhetTilPersonListe">
-      <wsdl:input message="tns:hentForvaltningsenhetTilPersonListeRequestMsg" name="hentForvaltningsenhetTilPersonListeRequest"/>
-      <wsdl:output message="tns:hentForvaltningsenhetTilPersonListeResponseMsg" name="hentForvaltningsenhetTilPersonListeResponse"/>
-      <wsdl:fault message="tns:hentForvaltningsenhetTilPersonListe_faultPenPersonIkkeFunnetMsg" name="faultPenPersonIkkeFunnet"/>
-      <wsdl:fault message="tns:hentForvaltningsenhetTilPersonListe_faultPenNAVEnhetIkkeFunnetMsg" name="faultPenNAVEnhetIkkeFunnet"/>
-            <wsdl:fault message="tns:hentForvaltningsenhetTilPersonListe_faultPenPersonManglerEnhetMsg" name="faultPenPersonManglerEnhet"/>
-        </wsdl:operation>
-    </wsdl:portType>
-</wsdl:definitions>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKSamhandler.wsdl b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKSamhandler.wsdl
deleted file mode 100644
index 7dfeb61..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/inf/PSAKSamhandler.wsdl
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:bons1="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" xmlns:bons2="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/samhandler" xmlns:bons3="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/samhandler" xmlns:bons4="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/samhandler" xmlns:bons5="http://nav-lib-frg/no/nav/lib/frg/gbo" xmlns:tns="http://nav-cons-pen-psak-samhandler/no/nav/inf" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="PSAKSamhandler" targetNamespace="http://nav-cons-pen-psak-samhandler/no/nav/inf">
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://nav-cons-pen-psak-samhandler/no/nav/inf" xmlns:bons1="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" xmlns:bons2="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/samhandler" xmlns:bons3="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/samhandler" xmlns:bons4="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/samhandler" xmlns:bons5="http://nav-lib-frg/no/nav/lib/frg/gbo" xmlns:tns="http://nav-cons-pen-psak-samhandler/no/nav/inf" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/samhandler" schemaLocation="../lib/pen/psakpselv/asbo/samhandler/ASBOPenFinnSamhandlerRequest.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/samhandler" schemaLocation="../lib/pen/psakpselv/asbo/samhandler/ASBOPenHentSamhandlerRequest.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/samhandler" schemaLocation="../lib/pen/psakpselv/asbo/samhandler/ASBOPenSamhandlerListe.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/samhandler" schemaLocation="../lib/pen/psakpselv/fault/samhandler/FaultPenOffentligIdIkkeFunnet.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/samhandler" schemaLocation="../lib/pen/psakpselv/fault/samhandler/FaultPenSamhandlerIkkeFunnet.xsd"/>
-            <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" schemaLocation="../lib/pen/psakpselv/fault/FaultPenGenerisk.xsd"/>
-            <xsd:element name="hentSamhandler">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentSamhandlerRequest" nillable="true" type="bons3:ASBOPenHentSamhandlerRequest"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="hentSamhandlerResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="hentSamhandlerResponse" nillable="true" type="bons3:ASBOPenSamhandler"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="hentSamhandler_faultPenGenerisk" type="bons1:FaultPenGenerisk"/>
-      <xsd:element name="hentSamhandler_faultPenSamhandlerIkkeFunnet" type="bons2:FaultPenSamhandlerIkkeFunnet"/>
-      <xsd:element name="lagreSamhandler">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="lagreSamhandlerRequest" nillable="true" type="bons3:ASBOPenSamhandler"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="lagreSamhandlerResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="lagreSamhandlerResponse" nillable="true" type="bons3:ASBOPenSamhandler"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="lagreSamhandler_faultPenGenerisk" type="bons1:FaultPenGenerisk"/>
-      <xsd:element name="lagreSamhandler_faultPenSamhandlerIkkeFunnet" type="bons2:FaultPenSamhandlerIkkeFunnet"/>
-      <xsd:element name="opprettSamhandler">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="opprettSamhandlerRequest" nillable="true" type="bons3:ASBOPenSamhandler"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="opprettSamhandlerResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="opprettSamhandlerResponse" nillable="true" type="bons3:ASBOPenSamhandler"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="opprettSamhandler_faultPenGenerisk" type="bons1:FaultPenGenerisk"/>
-      <xsd:element name="opprettSamhandler_faultPenOffentligIdIkkeFunnet" type="bons2:FaultPenOffentligIdIkkeFunnet"/>
-      <xsd:element name="finnSamhandler">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="finnSamhandlerRequest" nillable="true" type="bons3:ASBOPenFinnSamhandlerRequest"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="finnSamhandlerResponse">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="finnSamhandlerResponse" nillable="true" type="bons3:ASBOPenSamhandlerListe"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="finnSamhandler_faultPenGenerisk" type="bons1:FaultPenGenerisk"/>
-    </xsd:schema>
-  </wsdl:types>
-    <wsdl:message name="hentSamhandlerRequestMsg">
-    <wsdl:part element="tns:hentSamhandler" name="hentSamhandlerParameters"/>
-  </wsdl:message>
-    <wsdl:message name="hentSamhandlerResponseMsg">
-    <wsdl:part element="tns:hentSamhandlerResponse" name="hentSamhandlerResult"/>
-  </wsdl:message>
-    <wsdl:message name="hentSamhandler_faultPenGeneriskMsg">
-    <wsdl:part element="tns:hentSamhandler_faultPenGenerisk" name="faultPenGenerisk"/>
-  </wsdl:message>
-    <wsdl:message name="hentSamhandler_faultPenSamhandlerIkkeFunnetMsg">
-    <wsdl:part element="tns:hentSamhandler_faultPenSamhandlerIkkeFunnet" name="faultPenSamhandlerIkkeFunnet"/>
-  </wsdl:message>
-    <wsdl:message name="lagreSamhandlerRequestMsg">
-    <wsdl:part element="tns:lagreSamhandler" name="lagreSamhandlerParameters"/>
-  </wsdl:message>
-    <wsdl:message name="lagreSamhandlerResponseMsg">
-    <wsdl:part element="tns:lagreSamhandlerResponse" name="lagreSamhandlerResult"/>
-  </wsdl:message>
-    <wsdl:message name="lagreSamhandler_faultPenGeneriskMsg">
-    <wsdl:part element="tns:lagreSamhandler_faultPenGenerisk" name="faultPenGenerisk"/>
-  </wsdl:message>
-    <wsdl:message name="lagreSamhandler_faultPenSamhandlerIkkeFunnetMsg">
-    <wsdl:part element="tns:lagreSamhandler_faultPenSamhandlerIkkeFunnet" name="faultPenSamhandlerIkkeFunnet"/>
-  </wsdl:message>
-    <wsdl:message name="opprettSamhandlerRequestMsg">
-    <wsdl:part element="tns:opprettSamhandler" name="opprettSamhandlerParameters"/>
-  </wsdl:message>
-    <wsdl:message name="opprettSamhandlerResponseMsg">
-    <wsdl:part element="tns:opprettSamhandlerResponse" name="opprettSamhandlerResult"/>
-  </wsdl:message>
-    <wsdl:message name="opprettSamhandler_faultPenGeneriskMsg">
-    <wsdl:part element="tns:opprettSamhandler_faultPenGenerisk" name="faultPenGenerisk"/>
-  </wsdl:message>
-    <wsdl:message name="opprettSamhandler_faultPenOffentligIdIkkeFunnetMsg">
-    <wsdl:part element="tns:opprettSamhandler_faultPenOffentligIdIkkeFunnet" name="faultPenOffentligIdIkkeFunnet"/>
-  </wsdl:message>
-    <wsdl:message name="finnSamhandlerRequestMsg">
-    <wsdl:part element="tns:finnSamhandler" name="finnSamhandlerParameters"/>
-  </wsdl:message>
-    <wsdl:message name="finnSamhandlerResponseMsg">
-    <wsdl:part element="tns:finnSamhandlerResponse" name="finnSamhandlerResult"/>
-  </wsdl:message>
-    <wsdl:message name="finnSamhandler_faultPenGeneriskMsg">
-    <wsdl:part element="tns:finnSamhandler_faultPenGenerisk" name="faultPenGenerisk"/>
-  </wsdl:message>
-    <wsdl:portType name="PSAKSamhandler">
-    <wsdl:operation name="hentSamhandler">
-      <wsdl:input message="tns:hentSamhandlerRequestMsg" name="hentSamhandlerRequest"/>
-      <wsdl:output message="tns:hentSamhandlerResponseMsg" name="hentSamhandlerResponse"/>
-      <wsdl:fault message="tns:hentSamhandler_faultPenGeneriskMsg" name="faultPenGenerisk"/>
-      <wsdl:fault message="tns:hentSamhandler_faultPenSamhandlerIkkeFunnetMsg" name="faultPenSamhandlerIkkeFunnet"/>
-    </wsdl:operation>
-    <wsdl:operation name="lagreSamhandler">
-      <wsdl:input message="tns:lagreSamhandlerRequestMsg" name="lagreSamhandlerRequest"/>
-      <wsdl:output message="tns:lagreSamhandlerResponseMsg" name="lagreSamhandlerResponse"/>
-      <wsdl:fault message="tns:lagreSamhandler_faultPenGeneriskMsg" name="faultPenGenerisk"/>
-      <wsdl:fault message="tns:lagreSamhandler_faultPenSamhandlerIkkeFunnetMsg" name="faultPenSamhandlerIkkeFunnet"/>
-    </wsdl:operation>
-    <wsdl:operation name="opprettSamhandler">
-      <wsdl:input message="tns:opprettSamhandlerRequestMsg" name="opprettSamhandlerRequest"/>
-      <wsdl:output message="tns:opprettSamhandlerResponseMsg" name="opprettSamhandlerResponse"/>
-      <wsdl:fault message="tns:opprettSamhandler_faultPenGeneriskMsg" name="faultPenGenerisk"/>
-      <wsdl:fault message="tns:opprettSamhandler_faultPenOffentligIdIkkeFunnetMsg" name="faultPenOffentligIdIkkeFunnet"/>
-    </wsdl:operation>
-    <wsdl:operation name="finnSamhandler">
-      <wsdl:input message="tns:finnSamhandlerRequestMsg" name="finnSamhandlerRequest"/>
-      <wsdl:output message="tns:finnSamhandlerResponseMsg" name="finnSamhandlerResponse"/>
-      <wsdl:fault message="tns:finnSamhandler_faultPenGeneriskMsg" name="faultPenGenerisk"/>
-    </wsdl:operation>
-  </wsdl:portType>
-</wsdl:definitions>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/ASBOPenUnderkategori.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/ASBOPenUnderkategori.xsd
deleted file mode 100644
index a540f88..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/ASBOPenUnderkategori.xsd
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo">
-  <xsd:complexType name="ASBOPenUnderkategori">
-    <xsd:sequence>
-      <xsd:element minOccurs="0" name="underkategoriKode" type="xsd:string"/>
-    </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/bidragsak/ASBOPenForskuddSak.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/bidragsak/ASBOPenForskuddSak.xsd
deleted file mode 100644
index e38090a..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/bidragsak/ASBOPenForskuddSak.xsd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/bidragsak">
-  <xsd:complexType name="ASBOPenForskuddSak">
-    <xsd:sequence>
-      <xsd:element minOccurs="0" name="fnr" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="fom" type="xsd:date"/>
-      <xsd:element minOccurs="0" name="tom" type="xsd:date"/>
-      <xsd:element minOccurs="0" name="stonadsKode" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="valutaKode" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="belop" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="saksId" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="beslutningsArsakKode" type="xsd:string"/>
-    </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/bidragsak/ASBOPenHentForskuddRequest.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/bidragsak/ASBOPenHentForskuddRequest.xsd
deleted file mode 100644
index 26b6fea..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/bidragsak/ASBOPenHentForskuddRequest.xsd
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/bidragsak">
-  <xsd:complexType name="ASBOPenHentForskuddRequest">
-    <xsd:sequence>
-      <xsd:element minOccurs="0" name="fnr" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="dato" type="xsd:date"/>
-    </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/brev/ASBOPenHentBrevklientURLRequest.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/brev/ASBOPenHentBrevklientURLRequest.xsd
deleted file mode 100644
index 0eb24e6..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/brev/ASBOPenHentBrevklientURLRequest.xsd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/brev">
-  <xsd:complexType name="ASBOPenHentBrevklientURLRequest">
-    <xsd:sequence>
-      <xsd:element minOccurs="0" name="systemId" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="passord" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="dokumentId" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="rootURL" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="bredde" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="hoyde" type="xsd:string"/>
-        </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/brev/ASBOPenHentBrevklientURLResponse.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/brev/ASBOPenHentBrevklientURLResponse.xsd
deleted file mode 100644
index 59288ad..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/brev/ASBOPenHentBrevklientURLResponse.xsd
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/brev">
-  <xsd:complexType name="ASBOPenHentBrevklientURLResponse">
-    <xsd:sequence>
-      <xsd:element minOccurs="0" name="brevklientURL" type="xsd:string"/>
-    </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/fullmakt/ASBOPenFullmakt.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/fullmakt/ASBOPenFullmakt.xsd
deleted file mode 100644
index a5fd9b4..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/fullmakt/ASBOPenFullmakt.xsd
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/fullmakt">
-  <xsd:complexType name="ASBOPenFullmakt">
-    <xsd:sequence>
-      <xsd:element minOccurs="0" name="fullmaktId" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="kodefullmaktType" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="kodefullmaktNiva" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="opprettetAv" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="opprettetDato" type="xsd:date"/>
-      <xsd:element minOccurs="0" name="endretAv" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="endretDato" type="xsd:date"/>
-      <xsd:element minOccurs="0" name="fomDato" type="xsd:date"/>
-      <xsd:element minOccurs="0" name="tomDato" type="xsd:date"/>
-      <xsd:element minOccurs="0" name="gyldig" type="xsd:boolean"/>
-      <xsd:element minOccurs="0" name="versjon" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="fagomrade" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="fullmaktsgiver" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="fullmaktshaver" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="fullmaktsgiverKode" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="fullmaktshaverKode" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="fullmaktshaverNavn" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="fullmaktsgiverNavn" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="sistBrukt" type="xsd:date"/>
-        </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/fullmakt/ASBOPenFullmaktListe.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/fullmakt/ASBOPenFullmaktListe.xsd
deleted file mode 100644
index a9d02f8..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/fullmakt/ASBOPenFullmaktListe.xsd
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:bons0="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/fullmakt" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/fullmakt">
-    <xsd:include schemaLocation="ASBOPenFullmakt.xsd"/>
-    <xsd:complexType name="ASBOPenFullmaktListe">
-    <xsd:sequence>
-      <xsd:element minOccurs="0" name="fullmakter" type="bons0:ASBOPenFullmakt" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/fullmakt/ASBOPenHentFullmaktListeRequest.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/fullmakt/ASBOPenHentFullmaktListeRequest.xsd
deleted file mode 100644
index 9152377..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/fullmakt/ASBOPenHentFullmaktListeRequest.xsd
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/fullmakt">
-  <xsd:complexType name="ASBOPenHentFullmaktListeRequest">
-    <xsd:sequence>
-      <xsd:element minOccurs="0" name="fnr" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="hentDetaljer" type="xsd:boolean"/>
-        </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/henvendelse/ASBOPenData.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/henvendelse/ASBOPenData.xsd
deleted file mode 100644
index efb38a9..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/henvendelse/ASBOPenData.xsd
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/henvendelse">
-  <xsd:complexType name="ASBOPenData">
-    <xsd:sequence>
-      <xsd:element minOccurs="0" name="data" type="xsd:string"/>
-    </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/henvendelse/ASBOPenHentStatistikkRequest.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/henvendelse/ASBOPenHentStatistikkRequest.xsd
deleted file mode 100644
index 8180b4b..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/henvendelse/ASBOPenHentStatistikkRequest.xsd
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/henvendelse">
-  <xsd:complexType name="ASBOPenHentStatistikkRequest">
-    <xsd:sequence>
-      <xsd:element minOccurs="0" name="enhet" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="fagomrade" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="tidsperiode" type="xsd:string"/>
-    </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/henvendelse/ASBOPenHenvendelse.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/henvendelse/ASBOPenHenvendelse.xsd
deleted file mode 100644
index 2f3fa19..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/henvendelse/ASBOPenHenvendelse.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:bons0="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo" xmlns:bons1="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/oppgave" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/henvendelse">
-    <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo" schemaLocation="../ASBOPenEndringsInfo.xsd"/>
-    <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/oppgave" schemaLocation="../oppgave/ASBOPenOppgave.xsd"/>
-    <xsd:complexType name="ASBOPenHenvendelse">
-    <xsd:sequence>
-            <xsd:element minOccurs="0" name="henvendelsesId" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="fodselsnummer" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="saksnummer" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="fagomradeKode" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="underkategori" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="henvendelsesType" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="kanal" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="beskrivelse" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="oppfolging" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="tidsbruk" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="versjon" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="regKundesenter" type="xsd:boolean"/>
-            <xsd:element minOccurs="0" name="avslattKundesenter" type="xsd:boolean"/>
-            <xsd:element minOccurs="0" name="notatBidrag" type="xsd:boolean"/>
-            <xsd:element minOccurs="0" name="journalpostIdSendt" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="journalpostIdMottatt" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="journalpostIdNotat" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="simuleringsId" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="ferdigstiltDato" type="xsd:date"/>
-            <xsd:element minOccurs="0" name="ferdigstiltAv" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="endringsInfo" type="bons0:ASBOPenEndringsInfo"/>
-            <xsd:element minOccurs="0" name="oppgave" type="bons1:ASBOPenOppgave"/>
-        </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/henvendelse/ASBOPenHenvendelseListe.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/henvendelse/ASBOPenHenvendelseListe.xsd
deleted file mode 100644
index 2451948..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/henvendelse/ASBOPenHenvendelseListe.xsd
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:bons0="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/henvendelse" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/henvendelse">
-    <xsd:include schemaLocation="ASBOPenHenvendelse.xsd"/>
-    <xsd:complexType name="ASBOPenHenvendelseListe">
-    <xsd:sequence>
-      <xsd:element maxOccurs="unbounded" minOccurs="0" name="henvendelser" type="bons0:ASBOPenHenvendelse"/>
-    </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/henvendelse/ASBOPenStatistikk.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/henvendelse/ASBOPenStatistikk.xsd
deleted file mode 100644
index a9c8df7..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/henvendelse/ASBOPenStatistikk.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:bons0="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/henvendelse" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/henvendelse">
-    <xsd:include schemaLocation="ASBOPenStatistikkElement.xsd"/>
-    <xsd:include schemaLocation="ASBOPenData.xsd"/>
-    <xsd:complexType name="ASBOPenStatistikk">
-    <xsd:sequence>
-      <xsd:element minOccurs="0" name="overskrift" type="bons0:ASBOPenStatistikkElement"/>
-      <xsd:element minOccurs="0" name="innhold" type="bons0:ASBOPenStatistikkElement" maxOccurs="unbounded"/>
-      <xsd:element maxOccurs="1" minOccurs="0" name="data" type="bons0:ASBOPenStatistikkElement"/>
-    </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/henvendelse/ASBOPenStatistikkElement.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/henvendelse/ASBOPenStatistikkElement.xsd
deleted file mode 100644
index c156cee..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/henvendelse/ASBOPenStatistikkElement.xsd
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:bons0="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/henvendelse" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/henvendelse">
-    <xsd:include schemaLocation="ASBOPenData.xsd"/>
-    <xsd:complexType name="ASBOPenStatistikkElement">
-    <xsd:sequence>
-      <xsd:element minOccurs="0" name="dataer" type="bons0:ASBOPenData" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/institusjonsopphold/ASBOPenInstitusjon.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/institusjonsopphold/ASBOPenInstitusjon.xsd
deleted file mode 100644
index 3598017..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/institusjonsopphold/ASBOPenInstitusjon.xsd
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/institusjonsopphold">
-  <xsd:complexType name="ASBOPenInstitusjon">
-    <xsd:sequence>
-      <xsd:element minOccurs="0" name="oppholdPeriodeId" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="tssEksternId" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="samhandlerNavn" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="institusjonsNr" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="oppholdType" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="datoFom" type="xsd:date"/>
-      <xsd:element minOccurs="0" name="datoTom" type="xsd:date"/>
-      <xsd:element minOccurs="0" name="datoForventetTom" type="xsd:date"/>
-      <xsd:element minOccurs="0" name="varighetType" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="kildeType" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="pasientKategori" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="overfort" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="erGyldig" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="datoOpprettet" type="xsd:date"/>
-      <xsd:element minOccurs="0" name="opprettetAv" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="datoEndret" type="xsd:date"/>
-      <xsd:element minOccurs="0" name="endretAv" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="versjon" type="xsd:string"/>
-    </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/institusjonsopphold/ASBOPenInstitusjonsOpphold.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/institusjonsopphold/ASBOPenInstitusjonsOpphold.xsd
deleted file mode 100644
index a00378f..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/institusjonsopphold/ASBOPenInstitusjonsOpphold.xsd
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:bons0="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/institusjonsopphold" xmlns:bons1="http://nav-lib-cons-pen/no/nav/lib/pen/psakpselv/asbo/institusjonsopphold" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/institusjonsopphold">
-    <xsd:include schemaLocation="ASBOPenInstitusjon.xsd"/>
-    <xsd:complexType name="ASBOPenInstitusjonsOpphold">
-    <xsd:sequence>
-      <xsd:element minOccurs="0" name="fnr" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="personId" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="datoOpprettet" type="xsd:date"/>
-      <xsd:element minOccurs="0" name="opprettetAv" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="datoEndret" type="xsd:date"/>
-      <xsd:element minOccurs="0" name="endretAv" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="versjon" type="xsd:string"/>
-      <xsd:element maxOccurs="unbounded" minOccurs="0" name="institusjoner" type="bons0:ASBOPenInstitusjon"/>
-    </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/navorgenhet/ASBOPenFinnArenaNAVEnhetListeRequest.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/navorgenhet/ASBOPenFinnArenaNAVEnhetListeRequest.xsd
deleted file mode 100644
index 61cbe46..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/navorgenhet/ASBOPenFinnArenaNAVEnhetListeRequest.xsd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/navorgenhet">
-	<xsd:complexType name="ASBOPenFinnArenaNAVEnhetListeRequest">
-		<xsd:sequence>
-			<xsd:element minOccurs="0" name="enhetNavnSokeStreng" type="xsd:string">
-			</xsd:element>
-			<xsd:element minOccurs="0" name="enhetIdSokeStreng" type="xsd:string">
-			</xsd:element>
-			<xsd:element minOccurs="0" name="maxantall" type="xsd:string">
-			</xsd:element>
-		</xsd:sequence>
-	</xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/navorgenhet/ASBOPenFinnNAVEnhetRequest.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/navorgenhet/ASBOPenFinnNAVEnhetRequest.xsd
deleted file mode 100644
index 7de285e..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/navorgenhet/ASBOPenFinnNAVEnhetRequest.xsd
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/navorgenhet">
-  <xsd:complexType name="ASBOPenFinnNAVEnhetRequest">
-    <xsd:sequence>
-      <xsd:element minOccurs="0" name="fagomradeKode" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="typeEnhet" type="xsd:string"/>
-    </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/navorgenhet/ASBOPenHentForvaltningsenhetTilPersonListeRequest.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/navorgenhet/ASBOPenHentForvaltningsenhetTilPersonListeRequest.xsd
deleted file mode 100644
index 369fa1c..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/navorgenhet/ASBOPenHentForvaltningsenhetTilPersonListeRequest.xsd
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/navorgenhet">
-	<xsd:complexType name="ASBOPenHentForvaltningsenhetTilPersonListeRequest">
-		<xsd:sequence>
-			<xsd:element minOccurs="0" name="fnr" type="xsd:string"/>
-			<xsd:element minOccurs="0" name="fagomradeKode" type="xsd:string">
-			</xsd:element>
-		</xsd:sequence>
-	</xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/navorgenhet/ASBOPenHentNAVEnhetListeRequest.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/navorgenhet/ASBOPenHentNAVEnhetListeRequest.xsd
deleted file mode 100644
index 61c5547..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/navorgenhet/ASBOPenHentNAVEnhetListeRequest.xsd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:bons0="http://nav-lib-cons-pen/no/nav/lib/frg/asbo" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:bons1="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/navorgenhet" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/navorgenhet">
-    <xsd:include schemaLocation="ASBOPenNAVEnhet.xsd"/>
-    <xsd:complexType name="ASBOPenHentNAVEnhetListeRequest">
-    <xsd:sequence>
-      <xsd:element minOccurs="0" name="NAVEnhet" type="bons1:ASBOPenNAVEnhet"/>
-      <xsd:element minOccurs="0" name="typeOrganiserer" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="typeOrganisertUnder" type="xsd:string"/>
-    </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/navorgenhet/ASBOPenHentSpesialEnhetTilPersonRequest.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/navorgenhet/ASBOPenHentSpesialEnhetTilPersonRequest.xsd
deleted file mode 100644
index cabde84..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/navorgenhet/ASBOPenHentSpesialEnhetTilPersonRequest.xsd
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/navorgenhet">
-  <xsd:complexType name="ASBOPenHentSpesialEnhetTilPersonRequest">
-    <xsd:sequence>
-      <xsd:element minOccurs="0" name="fnr" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="fagomradeKode" type="xsd:string"/>
-    </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/navorgenhet/ASBOPenNAVEnhet.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/navorgenhet/ASBOPenNAVEnhet.xsd
deleted file mode 100644
index 89a0134..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/navorgenhet/ASBOPenNAVEnhet.xsd
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:Q1="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/navorgenhet" xmlns:bons2="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/navorgenhet">
-    <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo" schemaLocation="../ASBOPenUnderkategori.xsd"/>
-    <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo" schemaLocation="../ASBOPenFagomrade.xsd"/>
-    <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo" schemaLocation="../ASBOPenAdresse.xsd"/>
-    <xsd:complexType name="ASBOPenNAVEnhet">
-    <xsd:sequence>
-      <xsd:element minOccurs="0" name="enhetsId" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="enhetsNavn" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="orgEnhetsId" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="orgNivaKode" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="versjon" type="xsd:string"/>
-      <xsd:element maxOccurs="unbounded" minOccurs="0" name="adresser" type="bons2:ASBOPenAdresse"/>
-      <xsd:element maxOccurs="unbounded" minOccurs="0" name="fagomrader" type="bons2:ASBOPenFagomrade"/>
-      <xsd:element maxOccurs="unbounded" minOccurs="0" name="underkategorier" type="bons2:ASBOPenUnderkategori"/>
-            <xsd:element minOccurs="0" name="organisertUnder" type="Q1:ASBOPenNAVEnhet"/>
-        </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/navorgenhet/ASBOPenNAVEnhetListe.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/navorgenhet/ASBOPenNAVEnhetListe.xsd
deleted file mode 100644
index 4995ea2..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/navorgenhet/ASBOPenNAVEnhetListe.xsd
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:bons0="http://nav-lib-cons-pen/no/nav/lib/frg/asbo" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:bons1="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/navorgenhet" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/navorgenhet">
-    <xsd:include schemaLocation="ASBOPenNAVEnhet.xsd"/>
-    <xsd:complexType name="ASBOPenNAVEnhetListe">
-    <xsd:sequence>
-      <xsd:element maxOccurs="unbounded" minOccurs="0" name="NAVEnheter" type="bons1:ASBOPenNAVEnhet"/>
-    </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/oppgave/ASBOPenOppgave.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/oppgave/ASBOPenOppgave.xsd
deleted file mode 100644
index 45bfb35..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/oppgave/ASBOPenOppgave.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:bons2="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/oppgave" xmlns:bons3="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/henvendelse" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/oppgave">
-    <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/henvendelse" schemaLocation="../henvendelse/ASBOPenHenvendelse.xsd"/>
-    <xsd:include schemaLocation="ASBOPenOppgaveId.xsd"/>
-    <xsd:complexType name="ASBOPenOppgave">
-    <xsd:sequence>
-            <xsd:element minOccurs="0" name="oppgaveId" type="bons2:ASBOPenOppgaveId"/>
-            <xsd:element minOccurs="0" name="fodselsnummer" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="aktivFra" type="xsd:date"/>
-            <xsd:element minOccurs="0" name="aktivTil" type="xsd:date"/>
-            <xsd:element minOccurs="0" name="ansvarligId" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="ansvarligEnhetId" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="ansvarligEnhetNavn" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="opprettetEnhetId" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="opprettetEnhetNavn" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="endretAvEnhetId" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="endretAvEnhetNavn" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="fagomrade" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="underkategori" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="oppgaveType" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="beskrivelse" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="oppfolging" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="prioritet" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="versjon" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="lest" type="xsd:boolean"/>
-            <xsd:element minOccurs="0" name="opprettetAv" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="opprettetDato" type="xsd:date"/>
-            <xsd:element minOccurs="0" name="endretAv" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="endretDato" type="xsd:date"/>
-            <xsd:element minOccurs="0" name="henvendelse" type="bons3:ASBOPenHenvendelse"/>
-            <xsd:element minOccurs="0" name="saksnummer" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="dokumentId" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="kravId" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="soknadsId" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="skannetDato" type="xsd:date"/>
-            <xsd:element minOccurs="0" name="mottattDato" type="xsd:date"/>
-        </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/oppgave/ASBOPenOppgaveId.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/oppgave/ASBOPenOppgaveId.xsd
deleted file mode 100644
index 9b3b584..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/oppgave/ASBOPenOppgaveId.xsd
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/oppgave">
-  <xsd:complexType name="ASBOPenOppgaveId">
-    <xsd:sequence>
-      <xsd:element minOccurs="0" name="oppgaveId" type="xsd:string"/>
-    </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/samhandler/ASBOPenAlternativId.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/samhandler/ASBOPenAlternativId.xsd
deleted file mode 100644
index 6ac2cca..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/samhandler/ASBOPenAlternativId.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/samhandler">
-  <xsd:complexType name="ASBOPenAlternativId">
-    <xsd:sequence>
-      <xsd:element minOccurs="0" name="alternativId" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="alternativIdKode" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="fom" type="xsd:date"/>
-      <xsd:element minOccurs="0" name="tom" type="xsd:date"/>
-      <xsd:element minOccurs="0" name="gyldig" type="xsd:boolean"/>
-    </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/samhandler/ASBOPenAvdeling.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/samhandler/ASBOPenAvdeling.xsd
deleted file mode 100644
index e2a1f9a..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/samhandler/ASBOPenAvdeling.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema
-	xmlns:bons1="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo"
-	xmlns:bons2="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/samhandler"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/samhandler">
-	<xsd:include schemaLocation="ASBOPenKonto.xsd" />
-	<xsd:import
-		namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo"
-		schemaLocation="../ASBOPenAdresse.xsd" />
-	<xsd:complexType name="ASBOPenAvdeling">
-		<xsd:sequence>
-			<xsd:element minOccurs="0" name="idTSSEkstern"
-				type="xsd:string" />
-			<xsd:element minOccurs="0" name="avdelingNavn"
-				type="xsd:string" />
-			<xsd:element minOccurs="0" name="avdelingType"
-				type="xsd:string" />
-			<xsd:element minOccurs="0" name="avdelingsnr"
-				type="xsd:string" />
-			<xsd:element minOccurs="0" name="kontaktperson"
-				type="xsd:string" />
-			<xsd:element minOccurs="0" name="ePost" type="xsd:string" />
-			<xsd:element minOccurs="0" name="telefon" type="xsd:string" />
-			<xsd:element minOccurs="0" name="mobil" type="xsd:string" />
-			<xsd:element maxOccurs="unbounded" minOccurs="0"
-				name="kontoer" type="bons2:ASBOPenKonto" />
-			<xsd:element minOccurs="0" name="aAdresse"
-				type="bons1:ASBOPenAdresse" />
-			<xsd:element minOccurs="0" name="pAdresse"
-				type="bons1:ASBOPenAdresse" />
-			<xsd:element minOccurs="0" name="tAdresse"
-				type="bons1:ASBOPenAdresse" />
-			<xsd:element minOccurs="0" name="uAdresse"
-				type="bons1:ASBOPenAdresse">
-			</xsd:element>
-		</xsd:sequence>
-	</xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/samhandler/ASBOPenFinnSamhandlerRequest.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/samhandler/ASBOPenFinnSamhandlerRequest.xsd
deleted file mode 100644
index 368e1f4..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/samhandler/ASBOPenFinnSamhandlerRequest.xsd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/samhandler">
-  <xsd:complexType name="ASBOPenFinnSamhandlerRequest">
-    <xsd:sequence>
-      <xsd:element minOccurs="0" name="navn" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="samhandlerType" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="offentligId" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="idType" type="xsd:string"/>
-    </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/samhandler/ASBOPenHentSamhandlerRequest.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/samhandler/ASBOPenHentSamhandlerRequest.xsd
deleted file mode 100644
index 6615a0e..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/samhandler/ASBOPenHentSamhandlerRequest.xsd
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/samhandler">
-  <xsd:complexType name="ASBOPenHentSamhandlerRequest">
-    <xsd:sequence>
-      <xsd:element minOccurs="0" name="idTSSEkstern" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="hentDetaljert" type="xsd:boolean"/>
-    </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/samhandler/ASBOPenKonto.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/samhandler/ASBOPenKonto.xsd
deleted file mode 100644
index 2f22e6a..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/samhandler/ASBOPenKonto.xsd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:bons1="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/samhandler">
-    <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo" schemaLocation="../ASBOPenAdresse.xsd"/>
-    <xsd:complexType name="ASBOPenKonto">
-    <xsd:sequence>
-            <xsd:element minOccurs="0" name="kontoType" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="kontonummer" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="banknavn" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="bankkode" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="swiftkode" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="valuta" type="xsd:string"/>
-            <xsd:element minOccurs="0" name="bankadresse" type="bons1:ASBOPenAdresse"/>
-        </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/samhandler/ASBOPenSamhandler.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/samhandler/ASBOPenSamhandler.xsd
deleted file mode 100644
index 5365d5f..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/samhandler/ASBOPenSamhandler.xsd
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:bons1="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo" xmlns:bons2="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/samhandler" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/samhandler">
-    <xsd:include schemaLocation="ASBOPenAlternativId.xsd"/>
-    <xsd:include schemaLocation="ASBOPenKonto.xsd"/>
-    <xsd:include schemaLocation="ASBOPenAvdeling.xsd"/>
-    <xsd:complexType name="ASBOPenSamhandler">
-    <xsd:sequence>
-      <xsd:element minOccurs="0" name="navn" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="sprak" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="samhandlerType" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="offentligId" type="xsd:string"/>
-      <xsd:element minOccurs="0" name="idType" type="xsd:string"/>
-      <xsd:element maxOccurs="unbounded" minOccurs="0" name="avdelinger" type="bons2:ASBOPenAvdeling"/>
-            <xsd:element minOccurs="0" name="alternativeIder" type="bons2:ASBOPenAlternativId" maxOccurs="unbounded"/>
-        </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/samhandler/ASBOPenSamhandlerListe.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/samhandler/ASBOPenSamhandlerListe.xsd
deleted file mode 100644
index 4d10479..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/asbo/samhandler/ASBOPenSamhandlerListe.xsd
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:bons1="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/samhandler" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/asbo/samhandler">
-    <xsd:include schemaLocation="ASBOPenSamhandler.xsd"/>
-    <xsd:complexType name="ASBOPenSamhandlerListe">
-    <xsd:sequence>
-      <xsd:element maxOccurs="unbounded" minOccurs="0" name="samhandlere" type="bons1:ASBOPenSamhandler"/>
-    </xsd:sequence>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/fullmakt/FaultPenFullmaktIkkeFunnet.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/fullmakt/FaultPenFullmaktIkkeFunnet.xsd
deleted file mode 100644
index 57b6242..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/fullmakt/FaultPenFullmaktIkkeFunnet.xsd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:bons0="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/fullmakt">
-    <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" schemaLocation="../FaultPenBase.xsd"/>
-  <xsd:complexType name="FaultPenFullmaktIkkeFunnet">
-    <xsd:complexContent>
-      <xsd:extension base="bons0:FaultPenBase">
-        <xsd:sequence/>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/henvendelse/FaultPenHenvendelseIkkeFunnet.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/henvendelse/FaultPenHenvendelseIkkeFunnet.xsd
deleted file mode 100644
index f09a519..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/henvendelse/FaultPenHenvendelseIkkeFunnet.xsd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:bons2="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/henvendelse">
-    <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" schemaLocation="../FaultPenBase.xsd"/>
-  <xsd:complexType name="FaultPenHenvendelseIkkeFunnet">
-    <xsd:complexContent>
-      <xsd:extension base="bons2:FaultPenBase">
-        <xsd:sequence/>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/institusjonsopphold/FaultPenFnrIkkeFunnet.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/institusjonsopphold/FaultPenFnrIkkeFunnet.xsd
deleted file mode 100644
index 8e7f64f..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/institusjonsopphold/FaultPenFnrIkkeFunnet.xsd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:bons2="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/institusjonsopphold">
-    <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" schemaLocation="../FaultPenBase.xsd"/>    
-  <xsd:complexType name="FaultPenFnrIkkeFunnet">
-    <xsd:complexContent>
-      <xsd:extension base="bons2:FaultPenBase">
-        <xsd:sequence/>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/institusjonsopphold/FaultPenInstitusjonsoppholdIkkeFunnet.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/institusjonsopphold/FaultPenInstitusjonsoppholdIkkeFunnet.xsd
deleted file mode 100644
index ed1461c..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/institusjonsopphold/FaultPenInstitusjonsoppholdIkkeFunnet.xsd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema  xmlns:bons2="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/institusjonsopphold">
-    <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" schemaLocation="../FaultPenBase.xsd"/>    
-  <xsd:complexType name="FaultPenInstitusjonsoppholdIkkeFunnet">
-    <xsd:complexContent>
-      <xsd:extension base="bons2:FaultPenBase">
-        <xsd:sequence/>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/institusjonsopphold/FaultPenOppholdPeriodeIdIkkeFunnet.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/institusjonsopphold/FaultPenOppholdPeriodeIdIkkeFunnet.xsd
deleted file mode 100644
index 97644e0..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/institusjonsopphold/FaultPenOppholdPeriodeIdIkkeFunnet.xsd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema  xmlns:bons2="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/institusjonsopphold">
-    <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" schemaLocation="../FaultPenBase.xsd"/>
-  <xsd:complexType name="FaultPenOppholdPeriodeIdIkkeFunnet">
-    <xsd:complexContent>
-      <xsd:extension base="bons2:FaultPenBase">
-        <xsd:sequence/>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/navorgenhet/FaultPenNAVEnhetIkkeFunnet.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/navorgenhet/FaultPenNAVEnhetIkkeFunnet.xsd
deleted file mode 100644
index 3efeb06..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/navorgenhet/FaultPenNAVEnhetIkkeFunnet.xsd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:bons2="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/navorgenhet">
-    <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" schemaLocation="../FaultPenBase.xsd"/>
-  <xsd:complexType name="FaultPenNAVEnhetIkkeFunnet">
-    <xsd:complexContent>
-      <xsd:extension base="bons2:FaultPenBase">
-        <xsd:sequence/>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/navorgenhet/FaultPenPersonManglerEnhet.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/navorgenhet/FaultPenPersonManglerEnhet.xsd
deleted file mode 100644
index 24ba174..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/navorgenhet/FaultPenPersonManglerEnhet.xsd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:bons0="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/navorgenhet">
-	<xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" schemaLocation="../FaultPenBase.xsd">
-	</xsd:import>
-	<xsd:complexType name="FaultPenPersonManglerEnhet">
-		<xsd:complexContent>
-			<xsd:extension base="bons0:FaultPenBase">
-				<xsd:sequence/>
-
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/samhandler/FaultPenOffentligIdIkkeFunnet.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/samhandler/FaultPenOffentligIdIkkeFunnet.xsd
deleted file mode 100644
index 2bba40d..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/samhandler/FaultPenOffentligIdIkkeFunnet.xsd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:bons0="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/samhandler">
-    <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" schemaLocation="../FaultPenBase.xsd"/>
-  <xsd:complexType name="FaultPenOffentligIdIkkeFunnet">
-    <xsd:complexContent>
-      <xsd:extension base="bons0:FaultPenBase">
-        <xsd:sequence/>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/samhandler/FaultPenSamhandlerIkkeFunnet.xsd b/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/samhandler/FaultPenSamhandlerIkkeFunnet.xsd
deleted file mode 100644
index 6b17af2..0000000
--- a/psak-esb-wsclient-legacy/src/main/resources/wsdl/no/nav/lib/pen/psakpselv/fault/samhandler/FaultPenSamhandlerIkkeFunnet.xsd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema  xmlns:bons2="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault/samhandler">
-    <xsd:import namespace="http://nav-lib-cons-pen-psakpselv/no/nav/lib/pen/psakpselv/fault" schemaLocation="../FaultPenBase.xsd"/>
-  <xsd:complexType name="FaultPenSamhandlerIkkeFunnet">
-    <xsd:complexContent>
-      <xsd:extension base="bons2:FaultPenBase">
-        <xsd:sequence/>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-</xsd:schema>