Remove some junk code