remove some promises for speedup