I just deleted all of the "wait 30 seconds" to make it tidy

Change-Id: If1ba1f5f756138a5fcda153c9bd48aa31ca4402c
Signed-off-by: Son Nguyen <son.nguyen@catalyst.net.nz>