Do a bit of cleanup.