diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..8f5f9e2b281397f1f670774a9a12234b02831298
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,39 @@
+# Prerequisites
+*.d
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+
+# Other
+*.gcno
+*.gcda
+ext-*
+.DS_Store
+*~
diff --git a/LOM2M-compose-local-build-FULL.yml b/LOM2M-compose-local-build-FULL.yml
index fd9372c4879546e3e5888aa4ef61ea7e70de6696..78f3739f277c2e583130dfecc74dcbce9d58947d 100644
--- a/LOM2M-compose-local-build-FULL.yml
+++ b/LOM2M-compose-local-build-FULL.yml
@@ -53,10 +53,6 @@ services:
       # set time in ms
       - LOM2M_BACKUP_PERIOD=60000
       - LOM2M_BACKUP_ENABLED=0
-      - LOM2M_MQTTS_BINDING=0
-      - LOM2M_MQTTS_RETRY_PERIOD=15000
-      - LOM2M_MQTTS_TIMEOUT=120000
-      - LOM2M_MQTTS_ENDPOINT=a1y70l404vfam6-ats.iot.us-west-2.amazonaws.com
       # this parameter may be disabled to disable all originators to register
       - LOM2M_ENABLE_REGISTRATION_ALL=1 
 
diff --git a/docker/.DS_Store b/docker/.DS_Store
deleted file mode 100644
index 85157812f6aa7ca8db5f4487e31693817809ba14..0000000000000000000000000000000000000000
Binary files a/docker/.DS_Store and /dev/null differ
diff --git a/src/.DS_Store b/src/.DS_Store
deleted file mode 100644
index 0f6ab9f09a15acf246985535334e16f052512f7d..0000000000000000000000000000000000000000
Binary files a/src/.DS_Store and /dev/null differ
diff --git a/src/node-red/.DS_Store b/src/node-red/.DS_Store
deleted file mode 100644
index ab2542142e304f09582bbd9a435df28cb4d31378..0000000000000000000000000000000000000000
Binary files a/src/node-red/.DS_Store and /dev/null differ
diff --git a/src/node-red/package.json b/src/node-red/package.json
index f0d7b27eeaf4c703859fe17947331d02e3ec8cf3..eed2110f47925f17d0acd909e3187329800cfe1c 100644
--- a/src/node-red/package.json
+++ b/src/node-red/package.json
@@ -12,56 +12,7 @@
     "LOM2M"
   ],
   "author": "Guillaume Garzone",
-  "license": "
-  ------------------------------------------------------------
-
-  SOFTWARE EVALUATION LICENSE
-
-  LAAS research laboratory, Toulouse, France.
-  IRIT computer science research laboratory, Toulouse, France.
-  ------------------------------------------------------------
-
-  Contact: Thierry Monteil, thierry.monteil@irit.fr
-
-  Definitions
-  SOFTWARE:  The LightOM2M software, version 1.0, in source code form, written by David Gauchard, Guillaume Garzone and Thierry Monteil
-  at the LAAS research laboratory.
-
-  LICENSOR: LE CENTRE NATIONAL DE LA RECHERCHE SCIENTIFIQUE, a public scientific and technical research establishment, having SIREN No. 180 089 013, APE code 7219 Z, having its registered office at 3, rue Michel-Ange, 75796 Paris cedex 16, France, acting in its own name and on its own behalf, and on behalf of Le laboratoire d'analyse et d'architecture des systèmes (LAAS), UPR n°8001.
-
-  1. INTENT/PURPOSE
-  This agreement determines the conditions in which the LICENSOR, who has the rights to the SOFTWARE, grants to the LICENSEE a license for research and evaluation purposes only, excluding any commercial use.
-
-  2. LICENSEE
-  Any person or organization who receives the SOFTWARE with a copy of this license.
-
-  3. RIGHTS GRANTED
-  The rights to use and copy the SOFTWARE, subject to the restrictions described in this agreement.
-  The rights to modify and compile the SOFTWARE when it's provided in source code form, subject to the restrictions described in this agreement.
-  For the SOFTWARE provided in binary form only, LICENSEE undertakes to not decompile, disassemble, decrypt, extract the components or perform reverse engineering except to the extent expressly provided by law.
-
-  5. SCOPE OF THE LICENSE
-  - NON-COMMERCIAL license for research and evaluation purposes ONLY.
-  - NO right to commercialize the SOFTWARE, or any derivative work, without separate agreement with the LICENSOR.
-
-  6. MODIFICATION OF THE SOFTWARE
-  License permits LICENSEE to modify the SOFTWARE provided in source code form for research and evaluation purposes only.
-
-  7. REDISTRIBUTION
-  - License permits LICENSEE to redistribute verbatim copies of the SOFTWARE, accompanied with a copy of this license.
-  - License DOES NOT permit LICENSEE to redistribute modified versions of the SOFTWARE provided in source code form.
-  - License DOES NOT permit LICENSEE to commercialize the SOFTWARE or any derivative work of the SOFTWARE.
-
-  8. FEE/ROYALTY
-  - LICENSEE pays no royalty for this license.
-  - LICENSEE and any third parties must enter a new agreement for any use beyond scope of license. Please contact the IRIT technology transfer office (email numerique@toulouse-tech-transfer.com) for further information.
-
-  9. NO WARRANTY
-  The SOFTWARE is provided "as is" without warranty of any kind, either expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose. The entire risk as to the quality and performance of the program is with the LICENSEE.
-
-  10. NO LIABILITY
-  In no event unless required by applicable law or agreed to in writing will any copyright owner be liable to LICENSEE for damages, including any general, special, incidental or consequential damages arising out of the use or inability to use the program (including but not limited to loss of data or data being rendered inaccurate or losses sustained by LICENSEE or third parties or a failure of the program to operate with other programs), even if such holder has been advised of the possibility of such damages.
-  ",
+  "license": "\n  ------------------------------------------------------------ \n  SOFTWARE EVALUATION LICENSE\n\n  LAAS research laboratory, Toulouse, France.\n  IRIT computer science research laboratory, Toulouse, France.\n  ------------------------------------------------------------\n\n  Contact: Thierry Monteil, thierry.monteil@irit.fr\n\n  Definitions\n  SOFTWARE:  The LightOM2M software, version 1.0, in source code form, written by David Gauchard, Guillaume Garzone and Thierry Monteil\n  at the LAAS research laboratory.\n\n  LICENSOR: LE CENTRE NATIONAL DE LA RECHERCHE SCIENTIFIQUE, a public scientific and technical research establishment, having SIREN No. 180 089 013, APE code 7219 Z, having its registered office at 3, rue Michel-Ange,\n  75796 Paris cedex 16, France, acting in its own name and on its own behalf, and on behalf of Le laboratoire d'analyse et d'architecture des systèmes (LAAS), UPR n°8001.\n\n  1. INTENT/PURPOSE\n  This agreement determines the conditions in which the LICENSOR, who has the rights to the SOFTWARE, grants to the LICENSEE a license for research and evaluation purposes only, excluding any commercial use.\n\n  2. LICENSEE\n  Any person or organization who receives the SOFTWARE with a copy of this license.\n\n  3. RIGHTS GRANTED\n  The rights to use and copy the SOFTWARE, subject to the restrictions described in this agreement.\n  The rights to modify and compile the SOFTWARE when it's provided in source code form, subject to the restrictions described in this agreement.\n  For the SOFTWARE provided in binary form only, LICENSEE undertakes to not decompile, disassemble, decrypt, extract the components or perform reverse engineering except to the extent expressly provided by law.\n\n  5. SCOPE OF THE LICENSE\n  - NON-COMMERCIAL license for research and evaluation purposes ONLY.\n  - NO right to commercialize the SOFTWARE, or any derivative work, without separate agreement with the LICENSOR.\n\n  6. MODIFICATION OF THE SOFTWARE\n  License permits LICENSEE to modify the SOFTWARE provided in source code form for research and evaluation purposes only.\n\n  7. REDISTRIBUTION\n  - License permits LICENSEE to redistribute verbatim copies of the SOFTWARE, accompanied with a copy of this license.\n  - License DOES NOT permit LICENSEE to redistribute modified versions of the SOFTWARE provided in source code form.\n  - License DOES NOT permit LICENSEE to commercialize the SOFTWARE or any derivative work of the SOFTWARE.\n\n  8. FEE/ROYALTY\n  - LICENSEE pays no royalty for this license.\n  - LICENSEE and any third parties must enter a new agreement for any use beyond scope of license. Please contact the IRIT technology transfer office (email numerique@toulouse-tech-transfer.com) for further information.\n\n  9. NO WARRANTY\n  The SOFTWARE is provided \"as is\" without warranty of any kind, either expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose. The entire risk as to the quality and performance of the program is with the LICENSEE.\n\n  10. NO LIABILITY\n  In no event unless required by applicable law or agreed to in writing will any copyright owner be liable to LICENSEE for damages, including any general, special, incidental or consequential damages arising out of the use or inability to use the program (including but not limited to loss of data or data being rendered inaccurate or losses sustained by LICENSEE or third parties or a failure of the program to operate with other programs), even if such holder has been advised of the possibility of such damages.\n  \n",
   "node-red": {
     "nodes": {
       "ORIGINATOR_CONFIG": "originator-config.js",
diff --git a/src/server/.DS_Store b/src/server/.DS_Store
deleted file mode 100644
index a0c2b36cd0caf5e630f5c09df73817e4eb1831e4..0000000000000000000000000000000000000000
Binary files a/src/server/.DS_Store and /dev/null differ