cleanup for #412