diff --git a/wgmaster/migrate.py b/wgmaster/migrate.py
index 58aa21e..2100452 100755
--- a/wgmaster/migrate.py
+++ b/wgmaster/migrate.py
@@ -357,7 +357,6 @@ def lookup_gem_name(name: str) -> List[Tuple[int, int]]:
     elif WG == 'WKW':
         hkid = "'WLWV', 'WIEN', 'WLWG'"
         if name.endswith('*'):
-            # TODO WKW do something with * in gemeinde
             name = name[:-1].strip()
         if name.lower() == 'joching':
             return [(12185, 31351)]
@@ -586,9 +585,6 @@ def migrate_attributes(in_dir: str, out_dir: str) -> None:
         if WG == 'MATZEN':
             f.row('M', 'Matzen', None, False)
             f.row('HU', 'Huber', None, False)
-        elif WG == 'WKW':
-            # TODO WKW attribute F?
-            f.row('F', '?', None, False)
 
 
 def migrate_cultivations(in_dir: str, out_dir: str) -> None:
@@ -1402,6 +1398,9 @@ def migrate_deliveries(in_dir: str, out_dir: str) -> None:
                         attributes.add('HK')
                     if 'W' in attributes:
                         attributes.remove('W')
+                elif WG == 'WKW':
+                    if 'F' in attributes:
+                        attributes.remove('F')
 
                 if d['SNR'] != sortid:
                     line = f'{d["SNR"]}/{d["SANR"]} -> {sortid}/{",".join(list(attributes)) or None}'