Clean Up.

The usual.  Getting it all sorted.