Do some cleaning.

Signed-off-by: Sebastien Fusilier <sebastien.fusilier@intel.com>