Refactor: tidy up forms (remove hidden id field, as not needed)