remove two unnecessary fetch calls