Remove some junk is not needed any more.