One last round of cleanup.