Cleanup from #114