Cleanup will continue for some time.  Lots of bells and whistles need to be removed.

Also, some reorganization needs to be done.