and one more bit of cleanup