diff --git a/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx b/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx
index c2ab458966934d9008882cbbabc28a749f8e2a55..852ba28ec0ba80431487cc469279831d33167a72 100644
--- a/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx
+++ b/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx
@@ -31,7 +31,6 @@
 #include "otbWrapperRadiusParameter.h"
 #include "otbWrapperStringParameter.h"
 // List value parameter
-#include "otbWrapperOutputImageListParameter.h"
 #include "otbWrapperInputImageListParameter.h"
 #include "otbWrapperStringListParameter.h"
 
@@ -49,7 +48,7 @@ namespace otb
 namespace Wrapper
 {
 
-  CommandLineLauncher::CommandLineLauncher() : m_Expression(""), m_FilterWatcherList(), m_WriterWatcherList()
+CommandLineLauncher::CommandLineLauncher() : m_Expression(""), m_FilterWatcherList(), m_WriterWatcherList()
 {
   m_Application = NULL;
   m_Parser = CommandLineParser::New();
@@ -295,10 +294,6 @@ CommandLineLauncher::LoadParameters()
         {
           dynamic_cast<InputImageListParameter *>(param.GetPointer())->SetListFromFileName( values );
         }
-      else if( type == ParameterType_OutputImageList )
-        {
-          dynamic_cast<OutputImageListParameter *>(param.GetPointer())->SetFileNameList( values );
-        }
       else if( type == ParameterType_StringList )
         {
           dynamic_cast<StringListParameter *>(param.GetPointer())->SetValue( values );
diff --git a/Code/Wrappers/CommandLine/otbWrapperCommandLineParser.cxx b/Code/Wrappers/CommandLine/otbWrapperCommandLineParser.cxx
index 8aef8c746086d277c0551c1d7cf2fb684fde194c..a09c6dc959f71075ac888fcb20f9d1bca968d74f 100644
--- a/Code/Wrappers/CommandLine/otbWrapperCommandLineParser.cxx
+++ b/Code/Wrappers/CommandLine/otbWrapperCommandLineParser.cxx
@@ -17,28 +17,11 @@
 =========================================================================*/
 #include "otbWrapperCommandLineParser.h"
 
-// Single value parameter
-#include "otbWrapperChoiceParameter.h"
-#include "otbWrapperDirectoryParameter.h"
-#include "otbWrapperEmptyParameter.h"
-#include "otbWrapperFilenameParameter.h"
-#include "otbWrapperInputComplexImageParameter.h"
-#include "otbWrapperInputImageParameter.h"
-#include "otbWrapperInputVectorDataParameter.h"
-#include "otbWrapperNumericalParameter.h"
-#include "otbWrapperOutputImageParameter.h"
-#include "otbWrapperOutputVectorDataParameter.h"
-#include "otbWrapperRadiusParameter.h"
-#include "otbWrapperStringParameter.h"
-// List value parameter
-#include "otbWrapperOutputImageListParameter.h"
-#include "otbWrapperInputImageListParameter.h"
-#include "otbWrapperStringListParameter.h"
-//#include "otbWrapperParameterGroup.h"
-
 
 #include "otbWrapperApplicationRegistry.h"
 #include "otbWrapperApplication.h"
+
+#include <itksys/SystemTools.hxx>
 #include <itksys/RegularExpression.hxx>
 #include <string>
 #include <iostream>
diff --git a/Testing/Code/ApplicationEngine/CMakeLists.txt b/Testing/Code/ApplicationEngine/CMakeLists.txt
index 675779c6b970d3aea64170059aaecb6233fada6b..3c514c85a19c0c0b5a6edcc34691f3f1a875fd03 100644
--- a/Testing/Code/ApplicationEngine/CMakeLists.txt
+++ b/Testing/Code/ApplicationEngine/CMakeLists.txt
@@ -152,7 +152,6 @@ otbWrapperInputImageParameterTest.cxx
 otbWrapperInputVectorDataParameterTest.cxx
 otbWrapperInputImageListParameterTest.cxx
 otbWrapperOutputImageParameterTest.cxx
-otbWrapperOutputImageListParameterTest.cxx
 otbWrapperNumericalParameterTest.cxx
 otbWrapperParameterListTest.cxx
 otbWrapperParameterTest.cxx
diff --git a/Testing/Code/ApplicationEngine/otbWrapperCoreTests.cxx b/Testing/Code/ApplicationEngine/otbWrapperCoreTests.cxx
index 1e236dd25d45e222e0e10cb2f2067bfe17c02180..a21fa78eb673ffd436c058dc8bfc72017bbba33b 100644
--- a/Testing/Code/ApplicationEngine/otbWrapperCoreTests.cxx
+++ b/Testing/Code/ApplicationEngine/otbWrapperCoreTests.cxx
@@ -41,8 +41,6 @@ void RegisterTests()
   REGISTER_TEST(otbWrapperInputVectorDataParameterNew);
   REGISTER_TEST(otbWrapperOutputImageParameterNew);
   REGISTER_TEST(otbWrapperOutputImageParameterTest1);
-  REGISTER_TEST(otbWrapperOutputImageListParameterNew);
-  REGISTER_TEST(otbWrapperOutputImageListParameterTest1);
   REGISTER_TEST(otbWrapperStringParameterNew);
   REGISTER_TEST(otbWrapperStringParameterTest1);
   REGISTER_TEST(otbWrapperStringListParameterNew);
diff --git a/Testing/Code/ApplicationEngine/otbWrapperOutputImageListParameterTest.cxx b/Testing/Code/ApplicationEngine/otbWrapperOutputImageListParameterTest.cxx
deleted file mode 100644
index 12b00bc3cd8fad8fdaa1a09b1e27a5cf043e6e68..0000000000000000000000000000000000000000
--- a/Testing/Code/ApplicationEngine/otbWrapperOutputImageListParameterTest.cxx
+++ /dev/null
@@ -1,61 +0,0 @@
-/*=========================================================================
-
-  Program:   ORFEO Toolbox
-  Language:  C++
-  Date:      $Date$
-  Version:   $Revision$
-
-
-  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
-  See OTBCopyright.txt for details.
-
-
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-
-=========================================================================*/
-#if defined(_MSC_VER)
-#pragma warning ( disable : 4786 )
-#endif
-
-#include "otbWrapperOutputImageListParameter.h"
-#include "otbImageFileReader.h"
-#include "otbWrapperTypes.h"
-
-int otbWrapperOutputImageListParameterNew(int argc, char* argv[])
-{
-  typedef otb::Wrapper::OutputImageListParameter ParameterType;
-  ParameterType::Pointer parameter = ParameterType::New();
-
-  return EXIT_SUCCESS;
-}
-
-
-int otbWrapperOutputImageListParameterTest1(int argc, char* argv[])
-{
-  typedef otb::Wrapper::OutputImageListParameter ParameterType;
-  ParameterType::Pointer param = ParameterType::New();
-
-  typedef otb::ImageFileReader< otb::Wrapper::FloatVectorImageType > ReaderType;
-
-  ReaderType::Pointer reader1 = ReaderType::New();
-  ReaderType::Pointer reader2 = ReaderType::New();
-
-  reader1->SetFileName( argv[1] );
-  reader2->SetFileName( argv[2] );
-  reader1->UpdateOutputInformation();
-  reader2->UpdateOutputInformation();
-
-  param->AddImage(reader1->GetOutput());
-  param->AddImage(reader2->GetOutput());
-  param->AddFileName( argv[3] );
-  param->AddFileName( argv[4] );
-
-  param->SetKey(argv[5]);
-  param->SetDescription(argv[6]);
-
-  param->Write();
-
-  return EXIT_SUCCESS;
-}