adding wait for clean ups

Change-Id: Ic9b80c6bcb324eb5bd0e1e15ea7c8c81b89fb146