Cleanup of one case of one function