Only rename a function, and remove another unused..