Cleanup..

Change-Id: I868700ca5e721b5a9165aec5de349b8918005368
Signed-off-by: Antonino Manueli <antonino.manueli@outlook.com>