removed some more useless lines