Some cleanup.
Some cleanup.