removed unused fieldset and coder review