chore(forms): cleanup unused code

Closes #761