more clean up from #175