removed unneccary reqd fields
Merge branch 'dev'