Some more cleaning in DirectiveEditForm, most of the logic waeved