完工
remove some redundant code