Handle delete correctly