And a bit more cleanup.