some cleanup

Change-Id: Ib68efb4161a755cc68b57745fd27a7263b67abdb
Signed-off-by: Marcelo Portilho <marceloport@gmail.com>