Remove Unused Calls