Doing cleanup.  No new functionality