more cleanup.  I'm happy now