Removed un-needed code