additional changes on force delete