remove deprecated methods
Merge pull request #541 from wwojcik/formflow_2

templates for FormFlow 2