Just doing some cleanup before doing any more work.