cleanup from #10