Removed redundent code block