remove simple form dependency
Merge branch 'develop'