Some code needs to be tweaked slightly, and some code must be removed.

有些代码需要稍作调整，有些代码则必须移除。