Just some cleanup.  Something big's coming though...