a bit of cleanup.