removed some useless lines