diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d5e1636501a0961f6b4b6b8b5ac79ac216e0b7f..41f559ed8a05ff02383eb871f2c3a9ad3ab32091 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -236,23 +236,23 @@ LINK_DIRECTORIES( ${GDAL_LIBRARY_DIRS} )
 # EXPAT Library
 #-------------------------------
 
-#FIND_PACKAGE(EXPAT)
-#IF(EXPAT_FOUND)
-  #INCLUDE_DIRECTORIES(${EXPAT_INCLUDE_DIR})
-	#MESSAGE(${EXPAT_INCLUDE_DIR})
-  #LINK_DIRECTORIES( ${EXPAT_LIBRARY} )
-  #TRY_COMPILE(OTB_TYPE_COMPILE_EXPAT
-  #    ${OTB_BINARY_DIR}/CMakeTmp
-  #    ${OTB_SOURCE_DIR}/CMake/otbTestCompileExpat.cxx )
-  #IF(OTB_TYPE_COMPILE_EXPAT)
-  #    SET(OTB_USE_EXTERNAL_EXPAT ON CACHE INTERNAL  "Use an outside build of EXPAT.")
-  #ELSE(OTB_TYPE_COMPILE_EXPAT)
-  #    SET(OTB_USE_EXTERNAL_EXPAT OFF CACHE INTERNAL  "Use an OTB internal build of EXPAT.")
-  #ENDIF( OTB_TYPE_COMPILE_EXPAT)
-
-#ELSE(EXPAT_FOUND)
-      SET(OTB_USE_EXTERNAL_EXPAT OFF CACHE INTERNAL  "Use an OTB internal build of EXPAT.")
-#ENDIF(EXPAT_FOUND)
+#       FIND_PACKAGE(EXPAT)
+#       IF(EXPAT_FOUND)
+#         INCLUDE_DIRECTORIES(${EXPAT_INCLUDE_DIR})
+#       	MESSAGE(${EXPAT_INCLUDE_DIR})
+#         LINK_DIRECTORIES( ${EXPAT_LIBRARY} )
+#         TRY_COMPILE(OTB_TYPE_COMPILE_EXPAT
+#             ${OTB_BINARY_DIR}/CMakeTmp
+#             ${OTB_SOURCE_DIR}/CMake/otbTestCompileExpat.cxx )
+#         IF(OTB_TYPE_COMPILE_EXPAT)
+#             SET(OTB_USE_EXTERNAL_EXPAT ON CACHE INTERNAL  "Use an outside build of EXPAT.")
+#         ELSE(OTB_TYPE_COMPILE_EXPAT)
+#             SET(OTB_USE_EXTERNAL_EXPAT OFF CACHE INTERNAL  "Use an OTB internal build of EXPAT.")
+#         ENDIF( OTB_TYPE_COMPILE_EXPAT)
+
+#       ELSE(EXPAT_FOUND)
+#             SET(OTB_USE_EXTERNAL_EXPAT OFF CACHE INTERNAL  "Use an OTB internal build of EXPAT.")
+#       ENDIF(EXPAT_FOUND)
 
 
 #-------------------------------
diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt
index f6e0692f87227ccdffb7e98ed0e67b9eb5a578b2..e5743b8555540ca2800ab57238887e5347087905 100755
--- a/Utilities/CMakeLists.txt
+++ b/Utilities/CMakeLists.txt
@@ -12,9 +12,9 @@ IF(NOT OTB_USE_EXTERNAL_EXPAT)
 	#SUBDIRS( otbexpat )
 ENDIF(NOT OTB_USE_EXTERNAL_EXPAT)
 
-#ROMAIN
+#Supress libraries not used by the 2.2.0 version 
 #SUBDIRS(BGL otbsvm dxflib InsightJournal otbossim otb6S otbgeotiff tinyXMLlib otbgalib otbkml)
-SUBDIRS(BGL otbsvm dxflib InsightJournal otbossim otb6S otbgeotiff tinyXMLlib otbgalib)
+SUBDIRS(BGL otbsvm dxflib InsightJournal otbossim otb6S otbgeotiff tinyXMLlib)
 
 IF(BUILD_TESTING)
         SUBDIRS( Dart )
diff --git a/otbIncludeDirectories.cmake b/otbIncludeDirectories.cmake
index 458d3d2612b3d8abb828c315febd9dab8afea1bb..aa7fd1b192333e7196a611561319fe9a9ced11fe 100644
--- a/otbIncludeDirectories.cmake
+++ b/otbIncludeDirectories.cmake
@@ -37,11 +37,11 @@ SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
   ${OTB_SOURCE_DIR}/Utilities/otbgeotiff/libxtiff
   ${OTB_SOURCE_DIR}/Utilities/tinyXMLlib
   ${OTB_SOURCE_DIR}/Utilities/otbopenjpeg/libopenjpeg
-  ${OTB_SOURCE_DIR}/Utilities/otbgalib
-  ${OTB_SOURCE_DIR}/Utilities/otbkml
-  ${OTB_SOURCE_DIR}/Utilities/otbkml/src
-  ${OTB_SOURCE_DIR}/Utilities/otbkml/third_party/zlib-1.2.3
-  ${OTB_SOURCE_DIR}/Utilities/otbkml/third_party/zlib-1.2.3/contrib
+#  ${OTB_SOURCE_DIR}/Utilities/otbgalib
+#  ${OTB_SOURCE_DIR}/Utilities/otbkml
+#  ${OTB_SOURCE_DIR}/Utilities/otbkml/src
+#  ${OTB_SOURCE_DIR}/Utilities/otbkml/third_party/zlib-1.2.3
+#  ${OTB_SOURCE_DIR}/Utilities/otbkml/third_party/zlib-1.2.3/contrib
 )
 
 #-----------------------------------------------------------------------------
@@ -187,10 +187,10 @@ SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
   ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbgeotiff/libxtiff
   ${OTB_INSTALL_INCLUDE_DIR}/Utilities/tinyXMLlib
   ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbopenjpeg/libopenjpeg
-  ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbgalib
-  ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml
-  ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/third_party/zlib-1.2.3
-  ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/third_party/zlib-1.2.3/contrib
+#  ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbgalib
+#  ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml
+#  ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/third_party/zlib-1.2.3
+#  ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/third_party/zlib-1.2.3/contrib
 )
 
 #For GDAL header file
@@ -198,13 +198,13 @@ SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
   		${GDAL_INCLUDE_DIRS} )
 
 #For EXPAT header file
-IF(OTB_USE_EXTERNAL_EXPAT)
-        SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
-  	        ${EXPAT_INCLUDE_DIR} )
-ELSE(OTB_USE_EXTERNAL_EXPAT)
-        SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
-                ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbexpat )
-ENDIF(OTB_USE_EXTERNAL_EXPAT)
+#IF(OTB_USE_EXTERNAL_EXPAT)
+#        SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
+#  	        ${EXPAT_INCLUDE_DIR} )
+#ELSE(OTB_USE_EXTERNAL_EXPAT)
+#        SET(OTB_INCLUDE_DIRS_INSTALL_TREE ${OTB_INCLUDE_DIRS_INSTALL_TREE}
+#                ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbexpat )
+#ENDIF(OTB_USE_EXTERNAL_EXPAT)
 
 #For CURL header file
 IF(OTB_USE_CURL)