Took off some "waits", cleaned the code

Change-Id: I27fba3e153a059a183a68559b640e267c3b06d34
Signed-off-by: Renato Fialho <renato@renatofialho.com>