removed extra useless code