Remove some leftover junk code.