Removed unnecessary fields from forms
Merge branch 'develop'