Merge "Remove redundancy on Use Case"