Cleanup for #2243