diff --git a/README.md b/README.md
index d773650..5874425 100644
--- a/README.md
+++ b/README.md
@@ -86,9 +86,7 @@ Both tables are automatically removed when the plugin is uninstalled.
 | Club | Yes | Club name |
 | Rank | Yes | Go rank (30k to 9p) |
 | Rating | No | EGD rating (auto-calculated from rank if missing) |
-| Email | No | Email address |
 | EGD Number | No | European Go Database PIN |
-| Comment | No | Additional notes |
 
 ## Hooks
 
diff --git a/go-form-plugin/export/csv.php b/go-form-plugin/export/csv.php
index 2a646d1..a7a3d15 100644
--- a/go-form-plugin/export/csv.php
+++ b/go-form-plugin/export/csv.php
@@ -15,7 +15,7 @@ header('Content-Type: text/csv; charset=utf-8');
 header('Content-Disposition: attachment; filename="go-form-' . sanitize_title($form_name) . '-export.csv"');
 
 $output = fopen('php://output', 'w');
-fputcsv($output, ['ID', 'First Name', 'Last Name', 'Country', 'Club', 'Rank', 'Rating', 'Email', 'EGD Number', 'Comment', 'Date Added']);
+fputcsv($output, ['ID', 'First Name', 'Last Name', 'Country', 'Club', 'Rank', 'Rating', 'EGD Number', 'Date Added']);
 
 foreach ($entries as $e) {
   global $ranks;
@@ -27,9 +27,7 @@ foreach ($entries as $e) {
     $e->club,
     $ranks[$e->rank] ?? '',
     $e->rating,
-    $e->email,
     $e->egd_number,
-    $e->comment,
     $e->created_at
   ]);
 }
diff --git a/go-form-plugin/go-form-plugin.php b/go-form-plugin/go-form-plugin.php
index c9d100a..3e64160 100644
--- a/go-form-plugin/go-form-plugin.php
+++ b/go-form-plugin/go-form-plugin.php
@@ -28,9 +28,7 @@ function go_form_activate()
         club varchar(100) DEFAULT NULL,
         rank tinyint(2) DEFAULT 0,
         rating smallint(5) DEFAULT 0,
-        email varchar(255) DEFAULT NULL,
         egd_number varchar(20) DEFAULT NULL,
-        comment text DEFAULT NULL,
         created_at date DEFAULT CURRENT_TIMESTAMP NOT NULL,
         PRIMARY KEY (id),
         FOREIGN KEY (form_id) REFERENCES $forms(id) ON DELETE CASCADE
@@ -113,9 +111,7 @@ function go_form_handle_submission()
     'club' => sanitize_text_field($_POST['club'] ?? ''),
     'rank' => $rank,
     'rating' => $rating,
-    'email' => sanitize_email($_POST['email'] ?? ''),
     'egd_number' => sanitize_text_field($_POST['egd_number'] ?? ''),
-    'comment' => sanitize_textarea_field($_POST['comment'] ?? '')
   ];
 
   if (empty($data['first_name']) || empty($data['last_name'])) {
diff --git a/go-form-plugin/templates/form-shortcode.php b/go-form-plugin/templates/form-shortcode.php
index 1709b52..3853165 100644
--- a/go-form-plugin/templates/form-shortcode.php
+++ b/go-form-plugin/templates/form-shortcode.php
@@ -99,15 +99,8 @@
         <label for="egd_number">EGD Number:</label><input type="text" name="egd_number" id="egd_number">
       </div>
 
-      <div>
-        <label for="email">Email:</label><input type="email" name="email" id="email">
-      </div>
     </div>
 
-
-    <label for="comment">Comment</label>
-    <textarea name="comment" id="comment" rows="3"></textarea>
-
     <p>* Required fields</p>
     <input type="submit" name="go_form_submit" value="Submit">
   </form>
diff --git a/go-form-plugin/templates/table.php b/go-form-plugin/templates/table.php
index 3efce3a..84133b3 100644
--- a/go-form-plugin/templates/table.php
+++ b/go-form-plugin/templates/table.php
@@ -10,9 +10,7 @@
       <th>Date Added</th>
       <?php if ($show_admin): ?>
         <th>Rating</th>
-        <th>Email</th>
         <th>Action</th>
-        <th>Comment</th>
       <?php endif; ?>
     </tr>
   </thead>
@@ -32,11 +30,9 @@
         <?php if ($show_admin): ?>
 
           <td> <?= esc_html($e->rating) ?> </td>
-          <td> <?= esc_html($e->email) ?> </td>
           <td>
             <?php action_button('go_form_delete_entry', 'Delete', 'Delete this entry?', $e->id); ?>
           </td>
-          <td> <?= esc_html($e->comment) ?> </td>
 
         <?php endif; ?>