Cleanup for #1630