Delete made much faster and not errors anymore