diff --git a/leshan-client/src/main/resources/schemas/LWM2M_Access_Control-v1_0.xml b/leshan-client/src/main/resources/schemas/LWM2M_Access_Control-v1_0.xml
deleted file mode 100644
index 95cf1028..00000000
--- a/leshan-client/src/main/resources/schemas/LWM2M_Access_Control-v1_0.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<!--
-FILE INFORMATION
-
-OMA Permanent Document
-   File: OMA-SUP-XML_LWM2M_Access_Control-V1_0-20131210-C
-   Type: xml
-
-Public Reachable Information
-   Path: http://www.openmobilealliance.org/tech/profiles
-   Name: LWM2M_Access_Control-v1_0.xml
-
-NORMATIVE INFORMATION
-
-  Information about this file can be found in the latest revision of
-
-    OMA-TS-LightweightM2M-V1_0
-
-  This is available at http://www.openmobilealliance.org/
-
-  Send comments to technical-comments@mail.openmobilealliance.org
-
-CHANGE HISTORY
-
-22102013 File created, see OMA-DM-LightweightM2M-2013-0164-INP_LWM2M_Objects_XML_files
-31102013 Incorporated CR OMA-DM-LightweightM2M-2013-0162R03-CR_Bug_Fixes, plus changes according to OMA-TS-LightweightM2M-V1_0-20131017-D
-03122013 Incorporated CR OMA-DM-LightweightM2M-2013-0172-CR_SUP_files_schema_reference
-10122013 Status changed to Candidate by TP, TP Ref # OMA-TP-2013-0368-INP_LightweightM2M_V1_0_ERP_and_ETR_for_Candidate_approval
-
-	
-LEGAL DISCLAIMER
-
-Use of this document is subject to all of the terms and conditions
-of the Use Agreement located at
-	http://www.openmobilealliance.org/UseAgreement.html
-
-You may use this document or any part of the document for internal
-or educational purposes only, provided you do not modify, edit or
-take out of context the information in this document in any manner.
-Information contained in this document may be used, at your sole
-risk, for any purposes.
-
-You may not use this document in any other manner without the prior
-written permission of the Open Mobile Alliance.  The Open Mobile
-Alliance authorizes you to copy this document, provided that you
-retain all copyright and other proprietary notices contained in the
-original materials on any copies of the materials and that you
-comply strictly with these terms.  This copyright permission does
-not constitute an endorsement of the products or services.  The
-Open Mobile Alliance assumes no responsibility for errors or
-omissions in this document.
-
-Each Open Mobile Alliance member has agreed to use reasonable
-endeavors to inform the Open Mobile Alliance in a timely manner of
-Essential IPR as it becomes aware that the Essential IPR is related
-to the prepared or published specification.  However, the members
-do not have an obligation to conduct IPR searches.  The declared
-Essential IPR is publicly available to members and non-members of
-the Open Mobile Alliance and may be found on the "OMA IPR
-Declarations" list at http://www.openmobilealliance.org/ipr.html.
-The Open Mobile Alliance has not conducted an independent IPR review
-of this document and the information contained herein, and makes no
-representations or warranties regarding third party IPR, including
-without limitation patents, copyrights or trade secret rights.  This
-document may contain inventions for which you must obtain licenses
-from third parties before making, using or selling the inventions.
-Defined terms above are set forth in the schedule to the Open Mobile
-Alliance Application Form.
-
-NO REPRESENTATIONS OR WARRANTIES (WHETHER EXPRESS OR IMPLIED) ARE
-MADE BY THE OPEN MOBILE ALLIANCE OR ANY OPEN MOBILE ALLIANCE MEMBER
-OR ITS AFFILIATES REGARDING ANY OF THE IPR'S REPRESENTED ON THE "OMA
-IPR DECLARATIONS" LIST, INCLUDING, BUT NOT LIMITED TO THE ACCURACY,
-COMPLETENESS, VALIDITY OR RELEVANCE OF THE INFORMATION OR WHETHER OR
-NOT SUCH RIGHTS ARE ESSENTIAL OR NON-ESSENTIAL.
-
-THE OPEN MOBILE ALLIANCE IS NOT LIABLE FOR AND HEREBY DISCLAIMS ANY
-DIRECT, INDIRECT, PUNITIVE, SPECIAL, INCIDENTAL, CONSEQUENTIAL, OR
-EXEMPLARY DAMAGES ARISING OUT OF OR IN CONNECTION WITH THE USE OF
-DOCUMENTS AND THE INFORMATION CONTAINED IN THE DOCUMENTS.
-
-Copyright 2013 Open Mobile Alliance Ltd.  All Rights Reserved.
-Used with the permission of the Open Mobile Alliance Ltd. under the
-terms set forth above.
--->
-
-<LWM2M xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://openmobilealliance.org/tech/profiles/LWM2M.xsd" >
-	<Object ObjectType="MODefinition">
-		<Name>LWM2M Access Control</Name>
-		<Description1><![CDATA[Access Control Object is used to check whether the LWM2M Server has access right for performing a operation.]]></Description1>
-		<ObjectID>2</ObjectID>
-		<ObjectURN>TBD</ObjectURN>
-		<MultipleInstances>Multiple</MultipleInstances>
-		<Mandatory>Optional</Mandatory>
-		<Resources>
-			<Item ID="0">
-				<Name>Object ID</Name>
-        <Operations>R</Operations>
-				<MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration>1-65534</RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[The Object ID and The Object Instance ID are applied for.]]></Description>
-			</Item>
-			<Item ID="1">
-				<Name>Object Instance ID</Name>
-        <Operations>R</Operations>
-				<MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration>0-65535</RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[See Table 14: LWM2M Identifiers.]]></Description>
-			</Item>
-			<Item ID="2">
-				<Name>ACL</Name>
-        <Operations>RW</Operations>
-				<MultipleInstances>Multiple</MultipleInstances>
-				<Mandatory>Optional</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration>16-bit</RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[Resource Instance ID MUST be the Short Server ID of a certain LWM2M Server which has an access right.
-Resource Instance ID 0 is for default Short Server ID.
-The Value of the Resource Instance contains the access rights.
-Setting each bit means the LWM2M Server has the access right for that operation. The bit order is specified as below.
-1st lsb: R(Read, Observe, Discover, Write Attributes)
-2nd lsb: W(Write)
-3rd lsb: E(Execute)
-4th lsb: D(Delete)
-5th lsb: C(Create)
-Other bits are reserved for future use]]></Description>
-			</Item>
-			<Item ID="3">
-				<Name>Access Control Owner</Name>
-        <Operations>RW</Operations>
-				<MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration>0-65535</RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[Short Server ID of a certain LWM2M Server. Only this LWM2M Server can manage these Resources of the Object Instance.
-Value MAX_ID=65535 is reserved for the Access Control Object Instances created during Bootstrap procedure.]]></Description>
-			</Item>
-		</Resources>
-		<Description2><![CDATA[==E.3.1	Object Instance Configurations==
-If a new LWM2M Server Account is added when LWM2M Client has only one LWM2M Server Account, Client MUST ensure that Access Control Object Instances for every Object Instance except Security Object Instance exist. The LWM2M Client MUST create the missing Access Control Object Instances as follows:
-−	Access Control Owner MUST be the previously existing LWM2M Server
-−	Previously existing LWM2M Server MUST have full access right.]]></Description2>
-	</Object>
-</LWM2M>
diff --git a/leshan-client/src/main/resources/schemas/LWM2M_Connectivity_Monitoring-v1_0.xml b/leshan-client/src/main/resources/schemas/LWM2M_Connectivity_Monitoring-v1_0.xml
deleted file mode 100644
index 4d72f70d..00000000
--- a/leshan-client/src/main/resources/schemas/LWM2M_Connectivity_Monitoring-v1_0.xml
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<!--
-FILE INFORMATION
-
-OMA Permanent Document
-   File: OMA-SUP-XML_LWM2M_Connectivity_Monitoring-V1_0-20131210-C
-   Type: xml
-
-Public Reachable Information
-   Path: http://www.openmobilealliance.org/tech/profiles
-   Name: LWM2M_Connectivity_Monitoring-v1_0.xml
-
-NORMATIVE INFORMATION
-
-  Information about this file can be found in the latest revision of
-
-    OMA-TS-LightweightM2M-V1_0
-
-  This is available at http://www.openmobilealliance.org/
-
-  Send comments to technical-comments@mail.openmobilealliance.org
-
-CHANGE HISTORY
-
-22102013 File created, see OMA-DM-LightweightM2M-2013-0164-INP_LWM2M_Objects_XML_files
-19112013 Editorial change, modified the OMA Copy write statement position
-03122013 Incorporated CR OMA-DM-LightweightM2M-2013-0172-CR_SUP_files_schema_reference
-10122013 Status changed to Candidate by TP, TP Ref # OMA-TP-2013-0368-INP_LightweightM2M_V1_0_ERP_and_ETR_for_Candidate_approval
-
-	
-LEGAL DISCLAIMER
-
-Use of this document is subject to all of the terms and conditions
-of the Use Agreement located at
-	http://www.openmobilealliance.org/UseAgreement.html
-
-You may use this document or any part of the document for internal
-or educational purposes only, provided you do not modify, edit or
-take out of context the information in this document in any manner.
-Information contained in this document may be used, at your sole
-risk, for any purposes.
-
-You may not use this document in any other manner without the prior
-written permission of the Open Mobile Alliance.  The Open Mobile
-Alliance authorizes you to copy this document, provided that you
-retain all copyright and other proprietary notices contained in the
-original materials on any copies of the materials and that you
-comply strictly with these terms.  This copyright permission does
-not constitute an endorsement of the products or services.  The
-Open Mobile Alliance assumes no responsibility for errors or
-omissions in this document.
-
-Each Open Mobile Alliance member has agreed to use reasonable
-endeavors to inform the Open Mobile Alliance in a timely manner of
-Essential IPR as it becomes aware that the Essential IPR is related
-to the prepared or published specification.  However, the members
-do not have an obligation to conduct IPR searches.  The declared
-Essential IPR is publicly available to members and non-members of
-the Open Mobile Alliance and may be found on the "OMA IPR
-Declarations" list at http://www.openmobilealliance.org/ipr.html.
-The Open Mobile Alliance has not conducted an independent IPR review
-of this document and the information contained herein, and makes no
-representations or warranties regarding third party IPR, including
-without limitation patents, copyrights or trade secret rights.  This
-document may contain inventions for which you must obtain licenses
-from third parties before making, using or selling the inventions.
-Defined terms above are set forth in the schedule to the Open Mobile
-Alliance Application Form.
-
-NO REPRESENTATIONS OR WARRANTIES (WHETHER EXPRESS OR IMPLIED) ARE
-MADE BY THE OPEN MOBILE ALLIANCE OR ANY OPEN MOBILE ALLIANCE MEMBER
-OR ITS AFFILIATES REGARDING ANY OF THE IPR'S REPRESENTED ON THE "OMA
-IPR DECLARATIONS" LIST, INCLUDING, BUT NOT LIMITED TO THE ACCURACY,
-COMPLETENESS, VALIDITY OR RELEVANCE OF THE INFORMATION OR WHETHER OR
-NOT SUCH RIGHTS ARE ESSENTIAL OR NON-ESSENTIAL.
-
-THE OPEN MOBILE ALLIANCE IS NOT LIABLE FOR AND HEREBY DISCLAIMS ANY
-DIRECT, INDIRECT, PUNITIVE, SPECIAL, INCIDENTAL, CONSEQUENTIAL, OR
-EXEMPLARY DAMAGES ARISING OUT OF OR IN CONNECTION WITH THE USE OF
-DOCUMENTS AND THE INFORMATION CONTAINED IN THE DOCUMENTS.
-
-Copyright 2013 Open Mobile Alliance Ltd.  All Rights Reserved.
-Used with the permission of the Open Mobile Alliance Ltd. under the
-terms set forth above.
--->
-
-<LWM2M xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://openmobilealliance.org/tech/profiles/LWM2M.xsd" >
-	<Object ObjectType="MODefinition">
-		<Name>Connectivity Monitoring</Name>
-		<Description1><![CDATA[This LWM2M Object enables monitoring of parameters related to network connectivity.
-In this general connectivity Object, the Resources are limited to the most general cases common to most network bearers. It is recommended to read the description, which refers to relevant standard development organizations (e.g. 3GPP, IEEE).
-The goal of the Connectivity Monitoring Object is to carry information reflecting the more up to date values of the current connection for monitoring purposes. Resources such as Link Quality, Radio Signal Strenght, Cell ID are retrieved during connected mode at least for cellular networks.]]></Description1>
-		<ObjectID>4</ObjectID>
-		<ObjectURN>TBD</ObjectURN>
-		<MultipleInstances>Single</MultipleInstances>
-		<Mandatory>Optional</Mandatory>
-		<Resources>
-			<Item ID="0">
-				<Name>Network Bearer</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[Indicates the network bearer used for the current LWM2M communication session from the below network bearer list.
-0~20 are Cellular Bearers
-0: GSM cellular network
-1: TD-SCDMA cellular network
-2: WCDMA cellular network
-3: CDMA2000 cellular network
-4: WiMAX cellular network
-5: LTE-TDD cellular network
-6: LTE-FDD cellular network
-7~20: Reserved for other type cellular network
-21~40 are Wireless Bearers
-21: WLAN network
-22: Bluetooth network
-23: IEEE 802.15.4 network
-24~40: Reserved for other type local wireless network
-41~50 are Wireline Bearers
-41: Ethernet
-42: DSL
-43: PLC
-44~50: reserved for others type wireline networks.]]></Description>
-			</Item>
-			<Item ID="1">
-				<Name>Available Network Bearer</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Multiple</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[Indicates list of current available network bearer. Each Resource Instance has a value from the network bearer list.]]></Description>
-			</Item>
-			<Item ID="2">
-				<Name>Radio Signal Strength</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units>dBm</Units>
-				<Description><![CDATA[This node contains the average value of the received signal strength indication used in the current network bearer in case Network Bearer Resource indicates a Cellular Network (RXLEV range 0…64) 0 is &lt; 110dBm, 64 is >-48 dBm).
-Refer to [3GPP 44.018] for more details on Network Measurement Report encoding and [3GPP 45.008] or for Wireless Networks refer to the appropriate wireless standard.]]></Description>
-			</Item>
-			<Item ID="3">
-				<Name>Link Quality</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Optional</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[This contains received link quality  e.g., LQI for IEEE 802.15.4, (Range (0..255)), RxQual Downlink (for GSM range is 0…7).
-Refer to [3GPP 44.018] for more details on Network Measurement Report encoding.]]></Description>
-			</Item>
-			<Item ID="4">
-				<Name>IP Addresses</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Multiple</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>String</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[The IP addresses assigned to the connectivity interface. (e.g. IPv4, IPv6, etc.)]]></Description>
-			</Item>
-			<Item ID="5">
-				<Name>Router IP Addresse</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Multiple</MultipleInstances>
-				<Mandatory>Optional</Mandatory>
-				<Type>String</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[The IP address of the next-hop IP router.
-Note: This IP Address doesn’t indicate the Server IP address.]]></Description>
-			</Item>
-			<Item ID="6">
-				<Name>Link Utilization</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Optional</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration>0-100</RangeEnumeration>
-				<Units>%</Units>
-				<Description><![CDATA[The average utilization of the link to the next-hop IP router in %.]]></Description>
-			</Item>
-			<Item ID="7">
-				<Name>APN</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Multiple</MultipleInstances>
-				<Mandatory>Optional</Mandatory>
-				<Type>String</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[Access Point Name in case Network Bearer Resource is a Cellular Network.]]></Description>
-			</Item>
-      <Item ID="8">
-        <Name>Cell ID</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-        <Mandatory>Optional</Mandatory>
-        <Type>Integer</Type>
-        <RangeEnumeration></RangeEnumeration>
-        <Units></Units>
-        <Description><![CDATA[Serving Cell ID in case Network Bearer Resource is a Cellular Network.
-As specified in TS [3GPP 23.003] and in [3GPP. 24.008]. Range (0…65535) in GSM/EDGE
-UTRAN Cell ID has a length of 28 bits.
-Cell Identity  in WCDMA/TD-SCDMA. Range: (0..268435455).
-LTE Cell ID has a length of 28 bits.
-Parameter definitions in [3GPP 25.331].]]></Description>
-      </Item>
-      <Item ID="9">
-        <Name>SMNC</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-        <Mandatory>Optional</Mandatory>
-        <Type>Integer</Type>
-        <RangeEnumeration></RangeEnumeration>
-        <Units>%</Units>
-        <Description><![CDATA[Serving Mobile Network Code. In case Network Bearer Resource has 0(cellular network). Range (0…999).
-As specified in TS [3GPP 23.003].]]></Description>
-      </Item>
-      <Item ID="10">
-        <Name>SMCC</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-        <Mandatory>Optional</Mandatory>
-        <Type>Integer</Type>
-        <RangeEnumeration></RangeEnumeration>
-        <Units></Units>
-        <Description><![CDATA[Serving Mobile Country Code. In case Network Bearer Resource has 0 (cellular network). Range (0…999).
-As specified in TS [3GPP 23.003].]]></Description>
-      </Item>
-    </Resources>
-		<Description2></Description2>
-	</Object>
-</LWM2M>
diff --git a/leshan-client/src/main/resources/schemas/LWM2M_Connectivity_Statistics-v1_0.xml b/leshan-client/src/main/resources/schemas/LWM2M_Connectivity_Statistics-v1_0.xml
deleted file mode 100644
index f430d3a1..00000000
--- a/leshan-client/src/main/resources/schemas/LWM2M_Connectivity_Statistics-v1_0.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<!--
-FILE INFORMATION
-
-OMA Permanent Document
-   File: OMA-SUP-XML_LWM2M_Connectivity_Statistics-V1_0-20131210-C
-   Type: xml
-
-Public Reachable Information
-   Path: http://www.openmobilealliance.org/tech/profiles
-   Name: LWM2M_Connectivity_Statistics-v1_0.xml
-
-NORMATIVE INFORMATION
-
-  Information about this file can be found in the latest revision of
-
-    OMA-TS-LightweightM2M-V1_0
-
-  This is available at http://www.openmobilealliance.org/
-
-  Send comments to technical-comments@mail.openmobilealliance.org
-
-CHANGE HISTORY
-
-22102013 File created, see OMA-DM-LightweightM2M-2013-0164-INP_LWM2M_Objects_XML_files
-31102013 Changed according to OMA-TS-LightweightM2M-V1_0-20131017-D
-03122013 Incorporated CR OMA-DM-LightweightM2M-2013-0172-CR_SUP_files_schema_reference
-10122013 Status changed to Candidate by TP, TP Ref # OMA-TP-2013-0368-INP_LightweightM2M_V1_0_ERP_and_ETR_for_Candidate_approval
-
-	
-LEGAL DISCLAIMER
-
-Use of this document is subject to all of the terms and conditions
-of the Use Agreement located at
-	http://www.openmobilealliance.org/UseAgreement.html
-
-You may use this document or any part of the document for internal
-or educational purposes only, provided you do not modify, edit or
-take out of context the information in this document in any manner.
-Information contained in this document may be used, at your sole
-risk, for any purposes.
-
-You may not use this document in any other manner without the prior
-written permission of the Open Mobile Alliance.  The Open Mobile
-Alliance authorizes you to copy this document, provided that you
-retain all copyright and other proprietary notices contained in the
-original materials on any copies of the materials and that you
-comply strictly with these terms.  This copyright permission does
-not constitute an endorsement of the products or services.  The
-Open Mobile Alliance assumes no responsibility for errors or
-omissions in this document.
-
-Each Open Mobile Alliance member has agreed to use reasonable
-endeavors to inform the Open Mobile Alliance in a timely manner of
-Essential IPR as it becomes aware that the Essential IPR is related
-to the prepared or published specification.  However, the members
-do not have an obligation to conduct IPR searches.  The declared
-Essential IPR is publicly available to members and non-members of
-the Open Mobile Alliance and may be found on the "OMA IPR
-Declarations" list at http://www.openmobilealliance.org/ipr.html.
-The Open Mobile Alliance has not conducted an independent IPR review
-of this document and the information contained herein, and makes no
-representations or warranties regarding third party IPR, including
-without limitation patents, copyrights or trade secret rights.  This
-document may contain inventions for which you must obtain licenses
-from third parties before making, using or selling the inventions.
-Defined terms above are set forth in the schedule to the Open Mobile
-Alliance Application Form.
-
-NO REPRESENTATIONS OR WARRANTIES (WHETHER EXPRESS OR IMPLIED) ARE
-MADE BY THE OPEN MOBILE ALLIANCE OR ANY OPEN MOBILE ALLIANCE MEMBER
-OR ITS AFFILIATES REGARDING ANY OF THE IPR'S REPRESENTED ON THE "OMA
-IPR DECLARATIONS" LIST, INCLUDING, BUT NOT LIMITED TO THE ACCURACY,
-COMPLETENESS, VALIDITY OR RELEVANCE OF THE INFORMATION OR WHETHER OR
-NOT SUCH RIGHTS ARE ESSENTIAL OR NON-ESSENTIAL.
-
-THE OPEN MOBILE ALLIANCE IS NOT LIABLE FOR AND HEREBY DISCLAIMS ANY
-DIRECT, INDIRECT, PUNITIVE, SPECIAL, INCIDENTAL, CONSEQUENTIAL, OR
-EXEMPLARY DAMAGES ARISING OUT OF OR IN CONNECTION WITH THE USE OF
-DOCUMENTS AND THE INFORMATION CONTAINED IN THE DOCUMENTS.
-
-Copyright 2013 Open Mobile Alliance Ltd.  All Rights Reserved.
-Used with the permission of the Open Mobile Alliance Ltd. under the
-terms set forth above.
--->
-
-<LWM2M xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://openmobilealliance.org/tech/profiles/LWM2M.xsd" >
-	<Object ObjectType="MODefinition">
-		<Name>Connectivity Statistics</Name>
-		<Description1><![CDATA[This LWM2M Objects enables client to collect statistical information and enables the LWM2M Server to retrieve these information, set the collection duration and reset the statistical parameters.]]></Description1>
-      <ObjectID>7</ObjectID>
-		<ObjectURN>TBD</ObjectURN>
-		<MultipleInstances>Single</MultipleInstances>
-		<Mandatory>Optional</Mandatory>
-		<Resources>
-			<Item ID="0">
-				<Name>SMS Tx Counter</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Optional</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[Indicate the total number of SMS successfully transmitted during the collection period.]]></Description>
-			</Item>
-			<Item ID="1">
-				<Name>SMS Rx Counter</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Optional</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[Indicate the total number of SMS successfully received during the collection period.]]></Description>
-			</Item>
-			<Item ID="2">
-				<Name>Tx Data</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Optional</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units>Kilo-Bytes</Units>
-				<Description><![CDATA[Indicate the total amount of data transmitted during the collection period.]]></Description>
-			</Item>
-			<Item ID="3">
-				<Name>Rx Data</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Optional</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units>Kilo-Bytes</Units>
-				<Description><![CDATA[Indicate the total amount of data received during the collection period.]]></Description>
-			</Item>
-			<Item ID="4">
-				<Name>Max Message Size</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Optional</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units>Byte</Units>
-				<Description><![CDATA[The maximum message size that is used during the collection period.]]></Description>
-			</Item>
-			<Item ID="5">
-				<Name>Average Message Size</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Optional</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units>Byte</Units>
-				<Description><![CDATA[The average message size that is used during the collection period.]]></Description>
-			</Item>
-      <Item ID="6">
-        <Name>StartOrReset</Name>
-        <Operations>E</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-        <Mandatory>Mandatory</Mandatory>
-        <Type></Type>
-        <RangeEnumeration></RangeEnumeration>
-        <Units></Units>
-        <Description><![CDATA[Start to collect information or reset all other Resources to zeros in this Object. For example, the first time this Resource is executed, the client starts to collect information. The second time this Resource is executed, the values of Resource 0~5 are reset to 0.]]></Description>
-      </Item>
-    </Resources>
-		<Description2></Description2>
-	</Object>
-</LWM2M>
diff --git a/leshan-client/src/main/resources/schemas/LWM2M_Device-v1_0.xml b/leshan-client/src/main/resources/schemas/LWM2M_Device-v1_0.xml
deleted file mode 100644
index 801103f3..00000000
--- a/leshan-client/src/main/resources/schemas/LWM2M_Device-v1_0.xml
+++ /dev/null
@@ -1,291 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<!--
-FILE INFORMATION
-
-OMA Permanent Document
-   File: OMA-SUP-XML_LWM2M_Device-V1_0-20131210-C
-   Type: xml
-
-Public Reachable Information
-   Path: http://www.openmobilealliance.org/tech/profiles
-   Name: LWM2M_Device-v1_0.xml
-
-NORMATIVE INFORMATION
-
-  Information about this file can be found in the latest revision of
-
-    OMA-TS-LightweightM2M-V1_0
-
-  This is available at http://www.openmobilealliance.org/
-
-  Send comments to technical-comments@mail.openmobilealliance.org
-
-CHANGE HISTORY
-
-22102013 File created, see OMA-DM-LightweightM2M-2013-0164-INP_LWM2M_Objects_XML_files
-31102013 Changed according to OMA-TS-LightweightM2M-V1_0-20131017-D
-03122013 Incorporated CR OMA-DM-LightweightM2M-2013-0172-CR_SUP_files_schema_reference
-10122013 Status changed to Candidate by TP, TP Ref # OMA-TP-2013-0368-INP_LightweightM2M_V1_0_ERP_and_ETR_for_Candidate_approval
-
-	
-LEGAL DISCLAIMER
-
-Use of this document is subject to all of the terms and conditions
-of the Use Agreement located at
-	http://www.openmobilealliance.org/UseAgreement.html
-
-You may use this document or any part of the document for internal
-or educational purposes only, provided you do not modify, edit or
-take out of context the information in this document in any manner.
-Information contained in this document may be used, at your sole
-risk, for any purposes.
-
-You may not use this document in any other manner without the prior
-written permission of the Open Mobile Alliance.  The Open Mobile
-Alliance authorizes you to copy this document, provided that you
-retain all copyright and other proprietary notices contained in the
-original materials on any copies of the materials and that you
-comply strictly with these terms.  This copyright permission does
-not constitute an endorsement of the products or services.  The
-Open Mobile Alliance assumes no responsibility for errors or
-omissions in this document.
-
-Each Open Mobile Alliance member has agreed to use reasonable
-endeavors to inform the Open Mobile Alliance in a timely manner of
-Essential IPR as it becomes aware that the Essential IPR is related
-to the prepared or published specification.  However, the members
-do not have an obligation to conduct IPR searches.  The declared
-Essential IPR is publicly available to members and non-members of
-the Open Mobile Alliance and may be found on the "OMA IPR
-Declarations" list at http://www.openmobilealliance.org/ipr.html.
-The Open Mobile Alliance has not conducted an independent IPR review
-of this document and the information contained herein, and makes no
-representations or warranties regarding third party IPR, including
-without limitation patents, copyrights or trade secret rights.  This
-document may contain inventions for which you must obtain licenses
-from third parties before making, using or selling the inventions.
-Defined terms above are set forth in the schedule to the Open Mobile
-Alliance Application Form.
-
-NO REPRESENTATIONS OR WARRANTIES (WHETHER EXPRESS OR IMPLIED) ARE
-MADE BY THE OPEN MOBILE ALLIANCE OR ANY OPEN MOBILE ALLIANCE MEMBER
-OR ITS AFFILIATES REGARDING ANY OF THE IPR'S REPRESENTED ON THE "OMA
-IPR DECLARATIONS" LIST, INCLUDING, BUT NOT LIMITED TO THE ACCURACY,
-COMPLETENESS, VALIDITY OR RELEVANCE OF THE INFORMATION OR WHETHER OR
-NOT SUCH RIGHTS ARE ESSENTIAL OR NON-ESSENTIAL.
-
-THE OPEN MOBILE ALLIANCE IS NOT LIABLE FOR AND HEREBY DISCLAIMS ANY
-DIRECT, INDIRECT, PUNITIVE, SPECIAL, INCIDENTAL, CONSEQUENTIAL, OR
-EXEMPLARY DAMAGES ARISING OUT OF OR IN CONNECTION WITH THE USE OF
-DOCUMENTS AND THE INFORMATION CONTAINED IN THE DOCUMENTS.
-
-Copyright 2013 Open Mobile Alliance Ltd.  All Rights Reserved.
-Used with the permission of the Open Mobile Alliance Ltd. under the
-terms set forth above.
--->
-
-<LWM2M xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://openmobilealliance.org/tech/profiles/LWM2M.xsd" >
-	<Object ObjectType="MODefinition">
-		<Name>Device</Name>
-		<Description1><![CDATA[This LWM2M Object provides a range of device related information which can be queried by the LWM2M Server, and a device reboot and factory reset function.]]></Description1>
-		<ObjectID>3</ObjectID>
-		<ObjectURN>TBD</ObjectURN>
-		<MultipleInstances>Single</MultipleInstances>
-		<Mandatory>Mandatory</Mandatory>
-		<Resources>
-			<Item ID="0">
-				<Name>Manufacturer</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Optional</Mandatory>
-				<Type>String</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[Human readable manufacturer name]]></Description>
-			</Item>
-			<Item ID="1">
-				<Name>Model Number</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Optional</Mandatory>
-				<Type>String</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[A model identifier (manufacturer specified string)]]></Description>
-			</Item>
-			<Item ID="2">
-				<Name>Serial Number</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Optional</Mandatory>
-				<Type>String</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[Serial Number]]></Description>
-			</Item>
-			<Item ID="3">
-				<Name>Firmware Version</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Optional</Mandatory>
-				<Type>String</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[Current firmware version]]></Description>
-			</Item>
-			<Item ID="4">
-				<Name>Reboot</Name>
-        <Operations>E</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type></Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[Reboot the LWM2M Device to restore the Device from unexpected firmware failure.]]></Description>
-			</Item>
-			<Item ID="5">
-				<Name>Factory Reset</Name>
-        <Operations>E</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Optional</Mandatory>
-				<Type></Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[Perform factory reset of the LWM2M Device to make the LWM2M Device have the same configuration as at the initial deployment.
-When this Resource is executed, “De-register” operation  MAY be sent to the LWM2M Server(s) before factory reset of the LWM2M Device.]]></Description>
-			</Item>
-			<Item ID="6">
-				<Name>Available Power Sources</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Multiple</MultipleInstances>
-				<Mandatory>Optional</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration>0-7</RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[0 – DC power
-1 – Internal Battery
-2 – External Battery
-4 – Power over Ethernet
-5 – USB
-6 – AC (Mains) power
-7 – Solar]]></Description>
-			</Item>
-			<Item ID="7">
-				<Name>Power Source Voltage</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Multiple</MultipleInstances>
-				<Mandatory>Optional</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units>mV</Units>
-				<Description><![CDATA[Present voltage for each Available Power Sources Resource Instance.
-Each Resource Instance ID MUST map to the value of Available Power Sources Resource.]]></Description>
-			</Item>
-      <Item ID="8">
-        <Name>Power Source Current</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Multiple</MultipleInstances>
-        <Mandatory>Optional</Mandatory>
-        <Type>Integer</Type>
-        <RangeEnumeration></RangeEnumeration>
-        <Units>mA</Units>
-        <Description><![CDATA[Present current for each Available Power Source]]></Description>
-      </Item>
-      <Item ID="9">
-        <Name>Battery Level</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-        <Mandatory>Optional</Mandatory>
-        <Type>Integer</Type>
-        <RangeEnumeration>0-100</RangeEnumeration>
-        <Units>%</Units>
-        <Description><![CDATA[Contains the current battery level as a percentage (with a range from 0 to 100). This value is only valid when the value of Available Power Sources Resource is 1.]]></Description>
-      </Item>
-      <Item ID="10">
-        <Name>Memory Free</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-        <Mandatory>Optional</Mandatory>
-        <Type>Integer</Type>
-        <RangeEnumeration></RangeEnumeration>
-        <Units>KB</Units>
-        <Description><![CDATA[Estimated current available amount of storage space which can store data and software in the LWM2M Device (expressed in kilobytes).]]></Description>
-      </Item>
-      <Item ID="11">
-        <Name>Error Code</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Multiple</MultipleInstances>
-        <Mandatory>Mandatory</Mandatory>
-        <Type>Integer</Type>
-        <RangeEnumeration></RangeEnumeration>
-        <Units></Units>
-        <Description><![CDATA[0=No error
-1=Low battery power
-2=External power supply off
-3=GPS module failure
-4=Low received signal strength
-5=Out of memory
-6=SMS failure
-7=IP connectivity failure
-8=Peripheral malfunction
-
-When the single Device Object Instance is initiated, there is only one error code Resource Instance whose value is equal to 0 that means no error. When the first error happens, the LWM2M Client changes error code Resource Instance to any non-zero value to indicate the error type. When any other error happens, a new error code Resource Instance is created.
-This error code Resource MAY be observed by the LWM2M Server. How to deal with LWM2M Client’s error report depends on the policy of the LWM2M Server.]]></Description>
-      </Item>
-      <Item ID="12">
-        <Name>Reset Error Code</Name>
-        <Operations>E</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-        <Mandatory>Optional</Mandatory>
-        <Type></Type>
-        <RangeEnumeration></RangeEnumeration>
-        <Units></Units>
-        <Description><![CDATA[Delete all error code Resource Instances and create only one zero-value error code that implies no error.]]></Description>
-      </Item>
-      <Item ID="13">
-        <Name>Current Time</Name>
-        <Operations>RW</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-        <Mandatory>Optional</Mandatory>
-        <Type>Time</Type>
-        <RangeEnumeration></RangeEnumeration>
-        <Units></Units>
-        <Description><![CDATA[Current UNIX time of the LWM2M Client.
-The LWM2M Client should be responsible to increase this time value as every second elapses.
-The LWM2M Server is able to write this Resource to make the LWM2M Client synchronized with the LWM2M Server.]]></Description>
-      </Item>
-      <Item ID="14">
-        <Name>UTC Offset</Name>
-        <Operations>RW</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-        <Mandatory>Optional</Mandatory>
-        <Type>String</Type>
-        <RangeEnumeration></RangeEnumeration>
-        <Units></Units>
-        <Description><![CDATA[Indicates the UTC offset currently in effect for this LWM2M Device. UTC+X [ISO 8601].]]></Description>
-      </Item>
-      <Item ID="15">
-        <Name>Timezone</Name>
-        <Operations>RW</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-        <Mandatory>Optional</Mandatory>
-        <Type>String</Type>
-        <RangeEnumeration></RangeEnumeration>
-        <Units></Units>
-        <Description><![CDATA[Indicates in which time zone the LWM2M Device is located, in IANA Timezone (TZ) database format.]]></Description>
-      </Item>
-      <Item ID="16">
-        <Name>Supported Binding and Modes</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-        <Mandatory>Mandatory</Mandatory>
-        <Type>String</Type>
-        <RangeEnumeration></RangeEnumeration>
-        <Units></Units>
-        <Description><![CDATA[Indicates which bindings and modes are supported in the LWM2M Client. The possible values of Resource are combination of "U" or "UQ" and "S" or "SQ".]]></Description>
-      </Item>
-    </Resources>
-			<Description2></Description2>
-	</Object>
-</LWM2M>
diff --git a/leshan-client/src/main/resources/schemas/LWM2M_Firmware_Update-v1_0.xml b/leshan-client/src/main/resources/schemas/LWM2M_Firmware_Update-v1_0.xml
deleted file mode 100644
index 4066121f..00000000
--- a/leshan-client/src/main/resources/schemas/LWM2M_Firmware_Update-v1_0.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<!--
-FILE INFORMATION
-
-OMA Permanent Document
-   File: OMA-SUP-XML_LWM2M_Firmware_Update-V1_0-20131210-C
-   Type: xml
-
-Public Reachable Information
-   Path: http://www.openmobilealliance.org/tech/profiles
-   Name: LWM2M_Firmware_Update-v1_0.xml
-
-NORMATIVE INFORMATION
-
-  Information about this file can be found in the latest revision of
-
-    OMA-TS-LightweightM2M-V1_0
-
-  This is available at http://www.openmobilealliance.org/
-
-  Send comments to technical-comments@mail.openmobilealliance.org
-
-CHANGE HISTORY
-
-22102013 File created, see OMA-DM-LightweightM2M-2013-0164-INP_LWM2M_Objects_XML_files
-31102013 Changed according to OMA-TS-LightweightM2M-V1_0-20131017-D
-03122013 Incorporated CR OMA-DM-LightweightM2M-2013-0172-CR_SUP_files_schema_reference
-10122013 Status changed to Candidate by TP, TP Ref # OMA-TP-2013-0368-INP_LightweightM2M_V1_0_ERP_and_ETR_for_Candidate_approval
-
-	
-LEGAL DISCLAIMER
-
-Use of this document is subject to all of the terms and conditions
-of the Use Agreement located at
-	http://www.openmobilealliance.org/UseAgreement.html
-
-You may use this document or any part of the document for internal
-or educational purposes only, provided you do not modify, edit or
-take out of context the information in this document in any manner.
-Information contained in this document may be used, at your sole
-risk, for any purposes.
-
-You may not use this document in any other manner without the prior
-written permission of the Open Mobile Alliance.  The Open Mobile
-Alliance authorizes you to copy this document, provided that you
-retain all copyright and other proprietary notices contained in the
-original materials on any copies of the materials and that you
-comply strictly with these terms.  This copyright permission does
-not constitute an endorsement of the products or services.  The
-Open Mobile Alliance assumes no responsibility for errors or
-omissions in this document.
-
-Each Open Mobile Alliance member has agreed to use reasonable
-endeavors to inform the Open Mobile Alliance in a timely manner of
-Essential IPR as it becomes aware that the Essential IPR is related
-to the prepared or published specification.  However, the members
-do not have an obligation to conduct IPR searches.  The declared
-Essential IPR is publicly available to members and non-members of
-the Open Mobile Alliance and may be found on the "OMA IPR
-Declarations" list at http://www.openmobilealliance.org/ipr.html.
-The Open Mobile Alliance has not conducted an independent IPR review
-of this document and the information contained herein, and makes no
-representations or warranties regarding third party IPR, including
-without limitation patents, copyrights or trade secret rights.  This
-document may contain inventions for which you must obtain licenses
-from third parties before making, using or selling the inventions.
-Defined terms above are set forth in the schedule to the Open Mobile
-Alliance Application Form.
-
-NO REPRESENTATIONS OR WARRANTIES (WHETHER EXPRESS OR IMPLIED) ARE
-MADE BY THE OPEN MOBILE ALLIANCE OR ANY OPEN MOBILE ALLIANCE MEMBER
-OR ITS AFFILIATES REGARDING ANY OF THE IPR'S REPRESENTED ON THE "OMA
-IPR DECLARATIONS" LIST, INCLUDING, BUT NOT LIMITED TO THE ACCURACY,
-COMPLETENESS, VALIDITY OR RELEVANCE OF THE INFORMATION OR WHETHER OR
-NOT SUCH RIGHTS ARE ESSENTIAL OR NON-ESSENTIAL.
-
-THE OPEN MOBILE ALLIANCE IS NOT LIABLE FOR AND HEREBY DISCLAIMS ANY
-DIRECT, INDIRECT, PUNITIVE, SPECIAL, INCIDENTAL, CONSEQUENTIAL, OR
-EXEMPLARY DAMAGES ARISING OUT OF OR IN CONNECTION WITH THE USE OF
-DOCUMENTS AND THE INFORMATION CONTAINED IN THE DOCUMENTS.
-
-Copyright 2013 Open Mobile Alliance Ltd.  All Rights Reserved.
-Used with the permission of the Open Mobile Alliance Ltd. under the
-terms set forth above.
--->
-
-<LWM2M xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://openmobilealliance.org/tech/profiles/LWM2M.xsd" >
-	<Object ObjectType="MODefinition">
-		<Name>Firmware Update</Name>
-		<Description1><![CDATA[This LWM2M Object enables management of firmware which is to be updated. This Object includes installing firmware package, updating firmware, and performing actions after updating firmware.]]></Description1>
-		<ObjectID>5</ObjectID>
-		<ObjectURN>TBD</ObjectURN>
-		<MultipleInstances>Single</MultipleInstances>
-		<Mandatory>Optional</Mandatory>
-		<Resources>
-			<Item ID="0">
-				<Name>Package</Name>
-        <Operations>W</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>Opaque</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[Firmware package]]></Description>
-			</Item>
-			<Item ID="1">
-				<Name>Package URI</Name>
-        <Operations>W</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>String</Type>
-				<RangeEnumeration>0-255 bytes</RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[URI from where the device can download the firmware package by an alternative mechanism. As soon the device has received the Package URI it performs the download at the next practical opportunity.]]></Description>
-			</Item>
-			<Item ID="2">
-				<Name>Update</Name>
-        <Operations>E</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type></Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[Updates firmware by using the firmware package stored in Package, or, by using the firmware downloaded from the Package URI.
-This Resource is only executable when the value of the State Resource is Downloaded.]]></Description>
-			</Item>
-			<Item ID="3">
-				<Name>State</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration>1-3</RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[Indicates current state with respect to this firmware update. This value is set by the LWM2M Client.
-1: Idle (before downloading or after updating)
-2: Downloading (The data sequence is on the way)
-3: Downloaded
-If writing the firmware package to Package Resource is done, or, if the device has downloaded the firmware package from the Package URI the state changes to Downloaded.
-If writing an empty string to Package Resource is done or writing an empty string to Package URI is done, the state changes to Idle.
-If performing the Update Resource failed, the state remains at Downloaded.
-If performing the Update Resource was successful, the state changes from Downloaded to Idle.]]></Description>
-			</Item>
-			<Item ID="4">
-				<Name>Update Supported Objects</Name>
-        <Operations>RW</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Optional</Mandatory>
-				<Type>Boolean</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[If this value is true, the LWM2M Client MUST inform the registered LWM2M Servers of Objects and Object Instances parameter by sending an Update or Registration message after the firmware update operation at the next practical opportunity if supported Objects in the LWM2M Client have changed, in order for the LWM2M Servers to promptly manage newly installed Objects.
-If false, Objects and Object Instances parameter MUST be reported at the next periodic Update message.
-The default value is false.]]></Description>
-			</Item>
-			<Item ID="5">
-				<Name>Update Result</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration>0-6</RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[Contains the result of downloading or updating the firmware
-0: Default value. Once the updating process is initiated, this Resource SHOULD be reset to default value.
-1: Firmware updated successfully,
-2: Not enough storage for the new firmware package.
-3. Out of memory during downloading process.
-4: Connection lost during downloading process.
-5: CRC check failure for new downloaded package.
-6: Unsupported package type.
-7: Invalid URI
-This Resource MAY be reported by sending Observe operation.]]></Description>
-			</Item>
-    </Resources>
-		<Description2><![CDATA[==E.6.1	Firmware Update Consideration==
-If some Objects are not supported after firmware update, the LWM2M Client MUST delete all the Object Instances of the Objects that are not supported.]]></Description2>
-	</Object>
-</LWM2M>
diff --git a/leshan-client/src/main/resources/schemas/LWM2M_Location-v1_0.xml b/leshan-client/src/main/resources/schemas/LWM2M_Location-v1_0.xml
deleted file mode 100644
index 34c6f1fa..00000000
--- a/leshan-client/src/main/resources/schemas/LWM2M_Location-v1_0.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<!--
-FILE INFORMATION
-
-OMA Permanent Document
-   File: OMA-SUP-XML_LWM2M_Location-V1_0-20131210-C
-   Type: xml
-
-Public Reachable Information
-   Path: http://www.openmobilealliance.org/tech/profiles
-   Name: LWM2M_Location-v1_0.xml
-
-NORMATIVE INFORMATION
-
-  Information about this file can be found in the latest revision of
-
-    OMA-TS-LightweightM2M-V1_0
-
-  This is available at http://www.openmobilealliance.org/
-
-  Send comments to technical-comments@mail.openmobilealliance.org
-
-CHANGE HISTORY
-
-22102013 File created, see OMA-DM-LightweightM2M-2013-0164-INP_LWM2M_Objects_XML_files
-31102013 Changed according to OMA-TS-LightweightM2M-V1_0-20131017-D
-03122013 Incorporated CR OMA-DM-LightweightM2M-2013-0172-CR_SUP_files_schema_reference
-10122013 Status changed to Candidate by TP, TP Ref # OMA-TP-2013-0368-INP_LightweightM2M_V1_0_ERP_and_ETR_for_Candidate_approval
-
-	
-LEGAL DISCLAIMER
-
-Use of this document is subject to all of the terms and conditions
-of the Use Agreement located at
-	http://www.openmobilealliance.org/UseAgreement.html
-
-You may use this document or any part of the document for internal
-or educational purposes only, provided you do not modify, edit or
-take out of context the information in this document in any manner.
-Information contained in this document may be used, at your sole
-risk, for any purposes.
-
-You may not use this document in any other manner without the prior
-written permission of the Open Mobile Alliance.  The Open Mobile
-Alliance authorizes you to copy this document, provided that you
-retain all copyright and other proprietary notices contained in the
-original materials on any copies of the materials and that you
-comply strictly with these terms.  This copyright permission does
-not constitute an endorsement of the products or services.  The
-Open Mobile Alliance assumes no responsibility for errors or
-omissions in this document.
-
-Each Open Mobile Alliance member has agreed to use reasonable
-endeavors to inform the Open Mobile Alliance in a timely manner of
-Essential IPR as it becomes aware that the Essential IPR is related
-to the prepared or published specification.  However, the members
-do not have an obligation to conduct IPR searches.  The declared
-Essential IPR is publicly available to members and non-members of
-the Open Mobile Alliance and may be found on the "OMA IPR
-Declarations" list at http://www.openmobilealliance.org/ipr.html.
-The Open Mobile Alliance has not conducted an independent IPR review
-of this document and the information contained herein, and makes no
-representations or warranties regarding third party IPR, including
-without limitation patents, copyrights or trade secret rights.  This
-document may contain inventions for which you must obtain licenses
-from third parties before making, using or selling the inventions.
-Defined terms above are set forth in the schedule to the Open Mobile
-Alliance Application Form.
-
-NO REPRESENTATIONS OR WARRANTIES (WHETHER EXPRESS OR IMPLIED) ARE
-MADE BY THE OPEN MOBILE ALLIANCE OR ANY OPEN MOBILE ALLIANCE MEMBER
-OR ITS AFFILIATES REGARDING ANY OF THE IPR'S REPRESENTED ON THE "OMA
-IPR DECLARATIONS" LIST, INCLUDING, BUT NOT LIMITED TO THE ACCURACY,
-COMPLETENESS, VALIDITY OR RELEVANCE OF THE INFORMATION OR WHETHER OR
-NOT SUCH RIGHTS ARE ESSENTIAL OR NON-ESSENTIAL.
-
-THE OPEN MOBILE ALLIANCE IS NOT LIABLE FOR AND HEREBY DISCLAIMS ANY
-DIRECT, INDIRECT, PUNITIVE, SPECIAL, INCIDENTAL, CONSEQUENTIAL, OR
-EXEMPLARY DAMAGES ARISING OUT OF OR IN CONNECTION WITH THE USE OF
-DOCUMENTS AND THE INFORMATION CONTAINED IN THE DOCUMENTS.
-
-Copyright 2013 Open Mobile Alliance Ltd.  All Rights Reserved.
-Used with the permission of the Open Mobile Alliance Ltd. under the
-terms set forth above.
--->
-
-<LWM2M xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://openmobilealliance.org/tech/profiles/LWM2M.xsd" >
-  <Object ObjectType="MODefinition">
-		<Name>Location</Name>
-		<Description1><![CDATA[This LWM2M Objects provide a range of device related information which can be queried by the LWM2M Server, and a device reboot and factory reset function.]]></Description1>
-		<ObjectID>6</ObjectID>
-		<ObjectURN>TBD</ObjectURN>
-		<MultipleInstances>Single</MultipleInstances>
-		<Mandatory>Optional</Mandatory>
-		<Resources>
-			<Item ID="0">
-				<Name>Latitude</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>String</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units>Deg</Units>
-				<Description><![CDATA[The decimal notation of latitude, e.g. -43.5723 [World Geodetic System 1984].]]></Description>
-			</Item>
-			<Item ID="1">
-				<Name>Longitude</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>String</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units>Deg</Units>
-				<Description><![CDATA[The decimal notation of longitude, e.g. 153.21760 [World Geodetic System 1984].]]></Description>
-			</Item>
-			<Item ID="2">
-				<Name>Altitude</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Optional</Mandatory>
-				<Type>String</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units>m</Units>
-				<Description><![CDATA[The decimal notation of altitude in meters above sea level.]]></Description>
-			</Item>
-			<Item ID="3">
-				<Name>Uncertainty</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Optional</Mandatory>
-				<Type>String</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units>m</Units>
-				<Description><![CDATA[The accuracy of the position in meters.]]></Description>
-			</Item>
-			<Item ID="4">
-				<Name>Velocity</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Optional</Mandatory>
-				<Type>Opaque</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units>Refers to 3GPP GAD specs</Units>
-				<Description><![CDATA[The velocity of the device as defined in 3GPP 23.032 GAD specification. This set of values may not be available if the device is static.]]></Description>
-			</Item>
-			<Item ID="5">
-				<Name>Timestamp</Name>
-        <Operations>R</Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>Time</Type>
-				<RangeEnumeration>0-6</RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[The timestamp of when the location measurement was performed.]]></Description>
-			</Item>
-    </Resources>
-		<Description2></Description2>
-	</Object>
-</LWM2M>
diff --git a/leshan-client/src/main/resources/schemas/LWM2M_Security-v1_0.xml b/leshan-client/src/main/resources/schemas/LWM2M_Security-v1_0.xml
deleted file mode 100644
index d0e3a609..00000000
--- a/leshan-client/src/main/resources/schemas/LWM2M_Security-v1_0.xml
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<!--
-FILE INFORMATION
-
-OMA Permanent Document
-   File: OMA-SUP-XML_LWM2M_Security-V1_0-20131210-C
-   Type: xml
-
-Public Reachable Information
-   Path: http://www.openmobilealliance.org/tech/profiles
-   Name: LWM2M_Security-v1_0.xml
-
-NORMATIVE INFORMATION
-
-  Information about this file can be found in the latest revision of
-
-    OMA-TS-LightweightM2M-V1_0
-
-  This is available at http://www.openmobilealliance.org/
-
-  Send comments to technical-comments@mail.openmobilealliance.org
-
-CHANGE HISTORY
-
-22102013 File created, see OMA-DM-LightweightM2M-2013-0164-INP_LWM2M_Objects_XML_files
-31102013 Changed according to OMA-TS-LightweightM2M-V1_0-20131017-D
-06112013 Changed according to OMA-TS-LightweightM2M-V1_0-20131105-D
-03122013 Incorporated CR OMA-DM-LightweightM2M-2013-0172-CR_SUP_files_schema_reference
-10122013 Status changed to Candidate by TP, TP Ref # OMA-TP-2013-0368-INP_LightweightM2M_V1_0_ERP_and_ETR_for_Candidate_approval
-
-	
-LEGAL DISCLAIMER
-
-Use of this document is subject to all of the terms and conditions
-of the Use Agreement located at
-	http://www.openmobilealliance.org/UseAgreement.html
-
-You may use this document or any part of the document for internal
-or educational purposes only, provided you do not modify, edit or
-take out of context the information in this document in any manner.
-Information contained in this document may be used, at your sole
-risk, for any purposes.
-
-You may not use this document in any other manner without the prior
-written permission of the Open Mobile Alliance.  The Open Mobile
-Alliance authorizes you to copy this document, provided that you
-retain all copyright and other proprietary notices contained in the
-original materials on any copies of the materials and that you
-comply strictly with these terms.  This copyright permission does
-not constitute an endorsement of the products or services.  The
-Open Mobile Alliance assumes no responsibility for errors or
-omissions in this document.
-
-Each Open Mobile Alliance member has agreed to use reasonable
-endeavors to inform the Open Mobile Alliance in a timely manner of
-Essential IPR as it becomes aware that the Essential IPR is related
-to the prepared or published specification.  However, the members
-do not have an obligation to conduct IPR searches.  The declared
-Essential IPR is publicly available to members and non-members of
-the Open Mobile Alliance and may be found on the "OMA IPR
-Declarations" list at http://www.openmobilealliance.org/ipr.html.
-The Open Mobile Alliance has not conducted an independent IPR review
-of this document and the information contained herein, and makes no
-representations or warranties regarding third party IPR, including
-without limitation patents, copyrights or trade secret rights.  This
-document may contain inventions for which you must obtain licenses
-from third parties before making, using or selling the inventions.
-Defined terms above are set forth in the schedule to the Open Mobile
-Alliance Application Form.
-
-NO REPRESENTATIONS OR WARRANTIES (WHETHER EXPRESS OR IMPLIED) ARE
-MADE BY THE OPEN MOBILE ALLIANCE OR ANY OPEN MOBILE ALLIANCE MEMBER
-OR ITS AFFILIATES REGARDING ANY OF THE IPR'S REPRESENTED ON THE "OMA
-IPR DECLARATIONS" LIST, INCLUDING, BUT NOT LIMITED TO THE ACCURACY,
-COMPLETENESS, VALIDITY OR RELEVANCE OF THE INFORMATION OR WHETHER OR
-NOT SUCH RIGHTS ARE ESSENTIAL OR NON-ESSENTIAL.
-
-THE OPEN MOBILE ALLIANCE IS NOT LIABLE FOR AND HEREBY DISCLAIMS ANY
-DIRECT, INDIRECT, PUNITIVE, SPECIAL, INCIDENTAL, CONSEQUENTIAL, OR
-EXEMPLARY DAMAGES ARISING OUT OF OR IN CONNECTION WITH THE USE OF
-DOCUMENTS AND THE INFORMATION CONTAINED IN THE DOCUMENTS.
-
-Copyright 2013 Open Mobile Alliance Ltd.  All Rights Reserved.
-Used with the permission of the Open Mobile Alliance Ltd. under the
-terms set forth above.
--->
-
-<LWM2M xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://openmobilealliance.org/tech/profiles/LWM2M.xsd" >
-  <Object ObjectType="MODefinition">
-		<Name>LWM2M Security</Name>
-		<Description1><![CDATA[This LWM2M Object provides the keying material of a LWM2M Client appropriate to access a specified LWM2M Server. One Object Instance SHOULD address a LWM2M Bootstrap Server.
-    These LWM2M Object Resources MUST only be changed by a LWM2M Bootstrap Server or Bootstrap from Smartcardand MUST NOT be accessible by any other LWM2M Server.]]></Description1>
-		<ObjectID>0</ObjectID>
-		<ObjectURN>TBD</ObjectURN>
-		<MultipleInstances>Multiple</MultipleInstances>
-		<Mandatory>Mandatory</Mandatory>
-		<Resources>
-			<Item ID="0">
-				<Name>LWM2M  Server URI</Name>
-        <Operations></Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>String</Type>
-				<RangeEnumeration>0-255 bytes</RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[Uniquely identifies the LWM2M Server or LWM2M Bootstrap Server, and is in the form:
-"coaps://host:port", where host is an IP address or FQDN, and port is the UDP port of the Server.]]></Description>
-			</Item>
-			<Item ID="1">
-				<Name>Bootstrap Server</Name>
-        <Operations></Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>Boolean</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[Determines if the current instance concerns a LWM2M Bootstrap Server (true) or a standard LWM2M Server (false)]]></Description>
-			</Item>
-			<Item ID="2">
-				<Name>Security Mode</Name>
-        <Operations></Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration>0-3</RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[Determines which UDP payload security mode is used
-0: Pre-Shared Key mode
-1: Raw Public Key mode
-2: Certificate mode
-3: NoSec mode]]></Description>
-			</Item>
-			<Item ID="3">
-				<Name>Public Key or Identity</Name>
-        <Operations></Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>Opaque</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[Stores the LWM2M Client’s Certificate (Certificate mode), public key (RPK mode) or PSK Identity (PSK mode). The format is defined in Section E.1.1.]]></Description>
-			</Item>
-			<Item ID="4">
-				<Name>Server Public Key or Identity</Name>
-        <Operations></Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>Opaque</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[Stores the LWM2M Server’s or LWM2M Bootstrap Server’s Certificate (Certificate mode), public key (RPK mode) or PSK Identity (PSK mode). The format is defined in Section E.1.1.]]></Description>
-			</Item>
-			<Item ID="5">
-				<Name>Secret Key</Name>
-        <Operations></Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>Opaque</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[Stores the secret key or private key of the security mode. The format of the keying material is defined by the security mode in  Section E.1.1. This Resource MUST only be changed by a bootstrap server and MUST NOT be readable by any server.]]></Description>
-			</Item>
-			<Item ID="6">
-				<Name>SMS Security Mode</Name>
-        <Operations></Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration>0-255</RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[Determines which SMS payload security mode is used (see section 7.2)
-0: Reserved for future use
-1: Secure Packet Structure mode device terminated
-2: Secure Packet Structure mode smartcard terminated
-3: NoSec mode
-255: Proprietary modes]]></Description>
-			</Item>
-			<Item ID="7">
-				<Name>SMS Binding Key Parameters</Name>
-        <Operations></Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>Opaque</Type>
-				<RangeEnumeration>6 bytes</RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[Stores the KIc, KID, SPI and TAR. The format is defined in Section D.1.2.]]></Description>
-			</Item>
-			<Item ID="8">
-				<Name>SMS Binding Secret Keys</Name>
-        <Operations></Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>Opaque</Type>
-				<RangeEnumeration>32-48 bytes</RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[Stores the values of the keys for the SMS binding. 
-This resource MUST only be changed by a bootstrap server and MUST NOT be readable by any server.]]></Description>
-			</Item>
-			<Item ID="9">
-				<Name>LWM2M Server SMS Number</Name>
-        <Operations></Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[MSISDN used by the LWM2M Client  to send messages to the LWM2M Server via the SMS binding. 
-The LWM2M Client SHALL silently ignore any SMS not originated from unknown MSISDN]]></Description>
-			</Item>
-			<Item ID="10">
-				<Name>Short Server ID</Name>
-        <Operations></Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Optional</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration>1-65535</RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[This identifier uniquely identifies each LWM2M Server configured for the LWM2M Client.
-This Resource MUST be set when the Bootstrap Server Resource has false value.
-Default Short Server ID (i.e. 0) MUST NOT be used for identifying the LWM2M Server.]]></Description>
-			</Item>
-			<Item ID="11">
-				<Name>Client Hold Off Time</Name>
-        <Operations></Operations>
-        <MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units>s</Units>
-				<Description><![CDATA[Relevant information for a Bootstrap Server only.
-The number of seconds to wait before initiating a Client Initiated Bootstrap once the LWM2M Client has determined it should initiate this bootstrap mode]]></Description>
-			</Item>
-		</Resources>
-			<Description2><![CDATA[==E.1.1	UDP Channel Security: Security Key Resource Format==
-This section defines the format of the Secret Key and Public Key and Identity Resources of the LWM2M Server and LWM2M Bootstrap Objects when using UDP Channel security. These Resources are used to configure the security mode and keying material that a Client uses with a particular Server. The Objects are configured on the Client using one of the Bootstrap mechanisms described in Section 5.1. The use of this keying material for each security mode is defined in Section 7.1.
-==E.1.1.1	Pre-Shared Key (PSK) Mode==
-The PSK is a binary shared secret key between the Client and Server of the appropriate length for the Cipher Suite used [RFC4279]. This key is composed of a sequence of binary bytes in the Secret Key Resource. The default PSK Cipher Suites defined in this specification use a 128-bit AES key. Thus this key would be represented in 16 bytes in the Secret Key Resource.
-The corresponding PSK Identity for this PSK is stored in the Public Key or Identity Resource. The PSK Identity is simply stored as a UTF-8 String as per [RFC4279]. Clients and Servers MUST support a PSK Identity of at least 128 bytes in length as required by [RFC4279].
-==E.1.1.2	Raw-Public Key (RPK) Mode==
-The raw-public key mode requires a public key and a private key of the appropriate type and length for the Cipher Suite used. These keys are carried as a sequence of binary bytes with the public key stored in the Public Key or Identity Resource, and the private key stored in the Secret Key Resource. The default RPK Cipher Suites defines in this specification use a 256-bit ECC key. Thus the Certificate Resource would contain a 32 byte public key and the Secret Key Resource a 32 byte private key.
-==E.1.1.3	Certificate Mode==
-The Certificate mode requires an X.509v3 Certificate along with a matching private key. The private key is stored in the Secret Key Resource as in RPK mode. The Certificate is simply represented as binary X.509v3 in the value of the Public Key or Identity Resource.
-==E.1.2	SMS Payload Security: Security Key Resource Format==
-This section defines the format of the Secret Key and Public Key and Identity resources of the LWM2M Server and LWM2M Bootstrap Objects when using SMS Payload security. These resources are used to configure keying material that a Client uses with a particular Server. The Objects are configured on the Client using one of the Bootstrap mechanisms described in Section 5.1. The use of this keying material is defined in Section 7.2.
-The SMS key parameters are stored in the order KIc, KID, SPI, TAR (KIc is byte 0).
-Ordering of bits within bytes SHALL follow ETSI TS 102 221, section 3.4 “Coding Conventions” (b8 MSB, b1 LSB).
-==E.1.3	Unbootstrapping==
-Unbootstrapping is the process of deleting a Security Object Instance. If a Security Object Instance is to be deleted, certain related resources and configurations need to be deleted or modified. Therefore, when the Delete operation is sent via the Bootstrap Interface, the Client MUST execute the following procedure.
-#If there is an Object Instance that can be accessed only by a Server of the Server Object Instance (i.e., the Server is Access Control Owner and the LWM2M Server can access the Object Instance only in an Access Control Object Instance), the Object Instance and the corresponding Access Control Object Instance MUST be deleted
-#If an Object Instance can be accessed by multiple Servers including the Server which Security Object Instance is to be deleted, then:
-- The ACL Resource Instance for the Server in the Access Control Object Instance for the Object Instance MUST be deleted
-- If the Server is the Access Control Owner of the Access Control Object Instance, then the Access Control Owner MUST be changed to another Server according to the rules below:
-The Client MUST choose the Server who has highest sum of each number assigned to an access right (Write: 1, Delete: 1) for the Access Control Owner. If two or more Servers have the same sum, the Client MUST choose one of them as the new Access Control Owner.
-#Observation operations from the Server MUST be deleted
-#Server Object Instance MUST be deleted
-#Client MAY send “De-register” operation to the Server
-Note: To monitor the change of the Access Control Owner, the Server MAY observe Access Control Owner Resource.]]></Description2>
-	</Object>
-</LWM2M>
diff --git a/leshan-client/src/main/resources/schemas/LWM2M_Server-v1_0.xml b/leshan-client/src/main/resources/schemas/LWM2M_Server-v1_0.xml
deleted file mode 100644
index f0b4efa4..00000000
--- a/leshan-client/src/main/resources/schemas/LWM2M_Server-v1_0.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<!--
-FILE INFORMATION
-
-OMA Permanent Document
-   File: OMA-SUP-XML_LWM2M_Server-V1_0-20131210-C
-   Type: xml
-
-Public Reachable Information
-   Path: http://www.openmobilealliance.org/tech/profiles
-   Name: LWM2M_Server-v1_0.xml
-
-NORMATIVE INFORMATION
-
-  Information about this file can be found in the latest revision of
-
-    OMA-TS-LightweightM2M-V1_0
-
-  This is available at http://www.openmobilealliance.org/
-
-  Send comments to technical-comments@mail.openmobilealliance.org
-
-CHANGE HISTORY
-
-22102013 File created, see OMA-DM-LightweightM2M-2013-0164-INP_LWM2M_Objects_XML_files
-31102013 Changed according to OMA-TS-LightweightM2M-V1_0-20131017-D
-03122013 Incorporated CR OMA-DM-LightweightM2M-2013-0172-CR_SUP_files_schema_reference
-10122013 Status changed to Candidate by TP, TP Ref # OMA-TP-2013-0368-INP_LightweightM2M_V1_0_ERP_and_ETR_for_Candidate_approval
-
-	
-LEGAL DISCLAIMER
-
-Use of this document is subject to all of the terms and conditions
-of the Use Agreement located at
-	http://www.openmobilealliance.org/UseAgreement.html
-
-You may use this document or any part of the document for internal
-or educational purposes only, provided you do not modify, edit or
-take out of context the information in this document in any manner.
-Information contained in this document may be used, at your sole
-risk, for any purposes.
-
-You may not use this document in any other manner without the prior
-written permission of the Open Mobile Alliance.  The Open Mobile
-Alliance authorizes you to copy this document, provided that you
-retain all copyright and other proprietary notices contained in the
-original materials on any copies of the materials and that you
-comply strictly with these terms.  This copyright permission does
-not constitute an endorsement of the products or services.  The
-Open Mobile Alliance assumes no responsibility for errors or
-omissions in this document.
-
-Each Open Mobile Alliance member has agreed to use reasonable
-endeavors to inform the Open Mobile Alliance in a timely manner of
-Essential IPR as it becomes aware that the Essential IPR is related
-to the prepared or published specification.  However, the members
-do not have an obligation to conduct IPR searches.  The declared
-Essential IPR is publicly available to members and non-members of
-the Open Mobile Alliance and may be found on the "OMA IPR
-Declarations" list at http://www.openmobilealliance.org/ipr.html.
-The Open Mobile Alliance has not conducted an independent IPR review
-of this document and the information contained herein, and makes no
-representations or warranties regarding third party IPR, including
-without limitation patents, copyrights or trade secret rights.  This
-document may contain inventions for which you must obtain licenses
-from third parties before making, using or selling the inventions.
-Defined terms above are set forth in the schedule to the Open Mobile
-Alliance Application Form.
-
-NO REPRESENTATIONS OR WARRANTIES (WHETHER EXPRESS OR IMPLIED) ARE
-MADE BY THE OPEN MOBILE ALLIANCE OR ANY OPEN MOBILE ALLIANCE MEMBER
-OR ITS AFFILIATES REGARDING ANY OF THE IPR'S REPRESENTED ON THE "OMA
-IPR DECLARATIONS" LIST, INCLUDING, BUT NOT LIMITED TO THE ACCURACY,
-COMPLETENESS, VALIDITY OR RELEVANCE OF THE INFORMATION OR WHETHER OR
-NOT SUCH RIGHTS ARE ESSENTIAL OR NON-ESSENTIAL.
-
-THE OPEN MOBILE ALLIANCE IS NOT LIABLE FOR AND HEREBY DISCLAIMS ANY
-DIRECT, INDIRECT, PUNITIVE, SPECIAL, INCIDENTAL, CONSEQUENTIAL, OR
-EXEMPLARY DAMAGES ARISING OUT OF OR IN CONNECTION WITH THE USE OF
-DOCUMENTS AND THE INFORMATION CONTAINED IN THE DOCUMENTS.
-
-Copyright 2013 Open Mobile Alliance Ltd.  All Rights Reserved.
-Used with the permission of the Open Mobile Alliance Ltd. under the
-terms set forth above.
--->
-
-<LWM2M xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://openmobilealliance.org/tech/profiles/LWM2M.xsd" >
-  <Object ObjectType="MODefinition">
-		<Name>LWM2M Server</Name>
-		<Description1><![CDATA[This LWM2M Objects provides the data related to a LWM2M Server. A Bootstrap Server has no such an Object Instance associated to it.]]></Description1>
-		<ObjectID>1</ObjectID>
-		<ObjectURN>TBD</ObjectURN>
-		<MultipleInstances>Multiple</MultipleInstances>
-		<Mandatory>Mandatory</Mandatory>
-		<Resources>
-			<Item ID="0">
-				<Name>Short Server ID</Name>
-        <Operations>R</Operations>
-				<MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration>1-65535</RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[Used as link to associate server Object Instance.]]></Description>
-			</Item>
-			<Item ID="1">
-				<Name>Lifetime</Name>
-        <Operations>RW</Operations>
-				<MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units>s</Units>
-				<Description><![CDATA[Specify the lifetime of the registration in seconds.]]></Description>
-			</Item>
-			<Item ID="2">
-				<Name>Default Minimum Period</Name>
-        <Operations>RW</Operations>
-				<MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Optional</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units>s</Units>
-				<Description><![CDATA[The default value the LWM2M Client should use for the Minimum Period of an Observation in the absence of this parameter being included in an Observation.
-If this Resource doesn’t exist, the default value is 1.]]></Description>
-			</Item>
-			<Item ID="3">
-				<Name>Default Maximum Period</Name>
-        <Operations>RW</Operations>
-				<MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Optional</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units>s</Units>
-				<Description><![CDATA[The default value the LWM2M Client should use for the Maximum Period of an Observation in the absence of this parameter being included in an Observation.]]></Description>
-			</Item>
-			<Item ID="4">
-				<Name>Disable</Name>
-        <Operations>E</Operations>
-				<MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Optional</Mandatory>
-				<Type></Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[If this Resource is executed, this LWM2M Server Object is disabled for a certain period defined in the Disabled Timeout Resource. After receiving “Execute” operation, LWM2M Client MUST send response of the operation and perform de-registration process, and underlying network connection between the Client and Server MUST be disconnected to disable the LWM2M Server account.
-After the above process, the LWM2M Client MUST NOT send any message to the Server and ignore all the messages from the LWM2M Server for the period.]]></Description>
-			</Item>
-			<Item ID="5">
-				<Name>Disable Timeout</Name>
-        <Operations>RW</Operations>
-				<MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Optional</Mandatory>
-				<Type>Integer</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units>s</Units>
-				<Description><![CDATA[A period to disable the Server. After this period, the LWM2M Client MUST perform registration process to the Server. If this Resource is not set, a default timeout value is 86400 (1 day).]]></Description>
-			</Item>
-			<Item ID="6">
-				<Name>Notification Storing When Disabled or Offline</Name>
-        <Operations>RW</Operations>
-				<MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>Boolean</Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[If true, the LWM2M Client stores “Notify” operations to the LWM2M Server while the LWM2M Server account is disabled or the LWM2M Client is offline. After the LWM2M Server account is enabled or the LWM2M Client is online, the LWM2M Client reports the stored “Notify” operations to the Server.
-If false, the LWM2M Client discards all the “Notify” operationsor temporally disables the Observe function while the LWM2M Server is disabled or the LWM2M Client is offline.
-The default value is true.
-The maximum number of storing Notification per the Server is up to the implementation.]]></Description>
-			</Item>
-			<Item ID="7">
-				<Name>Binding</Name>
-        <Operations>RW</Operations>
-				<MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type>String</Type>
-				<RangeEnumeration>The possible values of Resource are listed in 5.2.1.1</RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[This Resource defines the transport binding configured for the LWM2M Client.
-If the LWM2M Client supports the binding specified in this Resource, the LWM2M Client MUST use that for Current Binding and Mode.]]></Description>
-			</Item>
-			<Item ID="8">
-				<Name>Registration Update Trigger</Name>
-        <Operations>E</Operations>
-				<MultipleInstances>Single</MultipleInstances>
-				<Mandatory>Mandatory</Mandatory>
-				<Type></Type>
-				<RangeEnumeration></RangeEnumeration>
-				<Units></Units>
-				<Description><![CDATA[If this Resource is executed the LWM2M Client MUST perform an “Update” operation with this LWM2M Server using the Current Transport Binding and Mode.]]></Description>
-			</Item>
-		</Resources>
-		<Description2></Description2>
-	</Object>
-</LWM2M>
diff --git a/leshan-client/src/main/resources/xsd/LWM2M.xsd b/leshan-client/src/main/resources/xsd/LWM2M.xsd
deleted file mode 100644
index 9c2f1aee..00000000
--- a/leshan-client/src/main/resources/xsd/LWM2M.xsd
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-
-LWM2M XML Schema - LWM2M Editor Schema
-   version - 1.0
-   date    - 21 Nov 2013
-
-FILE INFORMATION
-
-  Public Reachable Information
-    Path: http://www.openmobilealliance.org/tech/profiles
-    Name: LWM2M.xsd
-
-NORMATIVE INFORMATION
-
-  Information about this file can be found in the LW M2M online editor
-
-  This is available at http://www.openmobilealliance.org/
-
-  Send comments to technical-comments@mail.openmobilealliance.org
-
-CHANGE HISTORY
-
-21112013 First verion
-
-LEGAL DISCLAIMER
-
-  Use of this document is subject to all of the terms and conditions
-  of the Use Agreement located at
-  http://www.openmobilealliance.org/UseAgreement.html,
-  provided, however, that section (d) under "Documents - Terms 
-  of Use" which states, "no modifications are made to such 
-  Documents" does not apply to your use.
-
-  The Open Mobile Alliance authorizes you to copy this document, 
-  provided that you retain all copyright and other proprietary  
-  notices contained in the original materials on any copies of the 
-  materials and  that you comply strictly with these terms. This 
-  copyright permission does not constitute an endorsement of the 
-  products or services. The Open Mobile Alliance assumes no 
-  responsibility for errors or omissions in this document.
-
-
-  Each Open Mobile Alliance member has agreed to use reasonable
-  endeavors to inform the Open Mobile Alliance in a timely manner of
-  Essential IPR as it becomes aware that the Essential IPR is related
-  to the prepared or published specification.  However, the members
-  do not have an obligation to conduct IPR searches.  The declared
-  Essential IPR is publicly available to members and non-members of
-  the Open Mobile Alliance and may be found on the "OMA IPR
-  Declarations" list at http://www.openmobilealliance.org/ipr.html.
-  The Open Mobile Alliance has not conducted an independent IPR review
-  of this document and the information contained herein, and makes no
-  representations or warranties regarding third party IPR, including
-  without limitation patents, copyrights or trade secret rights.  This
-  document may contain inventions for which you must obtain licenses
-  from third parties before making, using or selling the inventions.
-  Defined terms above are set forth in the schedule to the Open Mobile
-  Alliance Application Form.
-
-  NO REPRESENTATIONS OR WARRANTIES (WHETHER EXPRESS OR IMPLIED) ARE
-  MADE BY THE OPEN MOBILE ALLIANCE OR ANY OPEN MOBILE ALLIANCE MEMBER
-  OR ITS AFFILIATES REGARDING ANY OF THE IPR'S REPRESENTED ON THE "OMA
-  IPR DECLARATIONS" LIST, INCLUDING, BUT NOT LIMITED TO THE ACCURACY,
-  COMPLETENESS, VALIDITY OR RELEVANCE OF THE INFORMATION OR WHETHER OR
-  NOT SUCH RIGHTS ARE ESSENTIAL OR NON-ESSENTIAL.
-
-  THE OPEN MOBILE ALLIANCE IS NOT LIABLE FOR AND HEREBY DISCLAIMS ANY
-  DIRECT, INDIRECT, PUNITIVE, SPECIAL, INCIDENTAL, CONSEQUENTIAL, OR
-  EXEMPLARY DAMAGES ARISING OUT OF OR IN CONNECTION WITH THE USE OF
-  DOCUMENTS AND THE INFORMATION CONTAINED IN THE DOCUMENTS.
-
-  Copyright 2013 Open Mobile Alliance Ltd.  All Rights Reserved.
-  Used with the permission of the Open Mobile Alliance Ltd. under the
-  terms set forth above.
-
--->
-
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:element name="LWM2M">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="1" maxOccurs="unbounded" name="Object">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="Name" type="xs:string" />
-              <xs:element name="Description1" type="xs:string" />
-              <xs:element name="ObjectID" type="xs:unsignedByte" />
-              <xs:element name="ObjectURN" type="xs:string" />
-              <xs:element name="MultipleInstances" >
-                <xs:simpleType>
-                  <xs:restriction base="xs:string">
-                    <xs:enumeration value="Multiple"/>
-                    <xs:enumeration value="Single"/>
-                  </xs:restriction>
-                </xs:simpleType>
-              </xs:element>
-              <xs:element name="Mandatory" >
-                <xs:simpleType>
-                  <xs:restriction base="xs:string">
-                    <xs:enumeration value="Mandatory"/>
-                    <xs:enumeration value="Optional"/>
-                  </xs:restriction>
-                </xs:simpleType>
-              </xs:element>
-              <xs:element name="Resources">
-                <xs:complexType>
-                  <xs:sequence>
-                    <xs:element maxOccurs="unbounded" name="Item">
-                      <xs:complexType>
-                        <xs:sequence>
-                          <xs:element name="Name" type="xs:string" />
-                          <xs:element name="Operations" >
-                            <xs:simpleType>
-                              <xs:restriction base="xs:string">
-                                <xs:enumeration value="R"/>
-                                <xs:enumeration value="W"/>
-                                <xs:enumeration value="RW"/>
-                                <xs:enumeration value="E"/>
-                                <xs:enumeration value="RE"/>
-                                <xs:enumeration value="WE"/>
-                                <xs:enumeration value="RWE"/>
-                                <xs:enumeration value=""/>
-                              </xs:restriction>
-                            </xs:simpleType>
-                          </xs:element>
-                          <xs:element name="MultipleInstances" >
-                            <xs:simpleType>
-                              <xs:restriction base="xs:string">
-                                <xs:enumeration value="Multiple"/>
-                                <xs:enumeration value="Single"/>
-                              </xs:restriction>
-                            </xs:simpleType>
-                          </xs:element>
-                          <xs:element name="Mandatory" >
-                            <xs:simpleType>
-                              <xs:restriction base="xs:string">
-                                <xs:enumeration value="Mandatory"/>
-                                <xs:enumeration value="Optional"/>
-                              </xs:restriction>
-                            </xs:simpleType>
-                          </xs:element>
-                          <xs:element name="Type" >
-                            <xs:simpleType>
-                              <xs:restriction base="xs:string">
-                                <xs:enumeration value="String"/>
-                                <xs:enumeration value="Integer"/>
-                                <xs:enumeration value="Float"/>
-                                <xs:enumeration value="Boolean"/>
-                                <xs:enumeration value="Opaque"/>
-                                <xs:enumeration value="Time"/>
-                                <xs:enumeration value="Integer"/>
-                                <xs:enumeration value=""/>
-                              </xs:restriction>
-                            </xs:simpleType>
-                          </xs:element>
-                          <xs:element name="RangeEnumeration" type="xs:string" />
-                          <xs:element name="Units" type="xs:string" />
-                          <xs:element name="Description" type="xs:string" />
-                        </xs:sequence>
-                        <xs:attribute name="ID" type="xs:unsignedByte" use="required" />
-                      </xs:complexType>
-                    </xs:element>
-                  </xs:sequence>
-                </xs:complexType>
-              </xs:element>
-              <xs:element name="Description2" type="xs:string" />
-            </xs:sequence>
-            <xs:attribute name="ObjectType" type="xs:string" use="required" />
-          </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>
\ No newline at end of file