remove some redundant code
remove some redundant code