removed un-needed code