Remove some of the unused stuff.