Remove dependency on sleep

Change-Id: I4f5a160562b3f6cdf0b353644e87fff283fa55aa