Remove unused variable, remove unnecessary variable initialization
Merge pull request #2913 from bcrowe/3.0-form-helper-vars

3.0 - Remove unused variable, remove unnecessary variable initialization