remove unnecessary code
refactor