Cleanup for #1458