Cleanup for #2199