Remove some deprecated bits.