more cleanups.  Let's mark this as a good go-to spot.

*CHECKPOINT*