remove the function call support and retry counters