More refactoring of add?remove field code; add-field logic added to form_render
Remove dead code
'add_field' logic added to entity edit form GET handler, and test case