cleanup from #105