Remove some unused bits.