Cleanup for #451