OnDeleted methods updated