Added conditional statement to check for fieldset, when deleting fields;