Removing some not-needed code.