More cleaning up.
And yet more cleanup.