Remove redundancy on Use Case