Cleanup for #2001