Added some more cleanup.