Cleanup for #1123