resolve admin delete bugs