Can we leave the function as it is/remove it. Then remove the calls to it?