Removed all waiting code possibly causing issues.