Cleanup for #427