Removed redundent code