Align with the parent AbstractToolCallSupport and remove the redundant code.

Comment From: tzolov

merged at 14b5397ca0a3d8b041812ccca69518a03ccab323