CHG: Remove unnecessary variables