Remove repeted issue from use case C