removed redundant un-needed code