Cleanup, still lot of work to do

Signed-off-by: Julien Pagès <julien.projet@gmail.com>