More clean up

Change-Id: Ib8461bee0a80ce7469948af72d24603b82f8a71f
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>