more deletion fixes