(refactor) remove unnecessary code