Clean up groupoids a bit