Lots more cleanup.