One more bit of cleanup