Cleanup from #2