The code has been cleaned up in core project.