Move un-needed code.