cleared unnecessay code