bug fix
delete unnecessary code