removed some lines