removed a few useless lines