QA: Remove unused code
QA: Simplify code