Cleanup from #433