remove redundant code
remove redundant code