remove log and unnecessary fetch