Remove extra parameters that we can grab from the form state.
Merge pull request #41 from jordandukart/7.x

Remove extra parameters that we can grab from the form state.