Last bit of cleanup.