removing unnecessary async logic