delete improvement for #612