More cleanup.  Still issues.