Need some clean after the last commits

Change-Id: Ib2135ef43052dcbc5c6b1358594df72e5f3aa7ea