Dropped un-needed code