Remove some undead code