Some changes to remove logs and synchronize background