remove redundant code
refactor