Cleanup, the function name changed