remove unnecessary async calls