Pooja/Ajay | #2683 | Removed unused properties on form_model