remove unnecessary loop wait logic