Remove unused call and add headers