removed some lines uneeded lines