Clean up FormHelper references