Code cleanup.
Merge pull request #2889 from ADmad/3.0-formhelper

Code cleanup.