refactor code: remove noused code