Bits of Fidelity cleanup.

Bits of Fidelity cleanup.