Some simple clean ups.
We removed some dead code.