Discard last todo for #237