removed redundent lines