Cleanup for #1863