Clean up code from #32