Cleanup for #110