- QA: Remove duplicate code