diff --git a/VersionASM b/VersionASM
index a1919de3d41e8b3c37bdf9c0abaed0bfd2787a83..6abf0cded200877c2de7c580290bd350e6043277 100644
--- a/VersionASM
+++ b/VersionASM
@@ -14,10 +14,10 @@
 Module_MajorVersion     SETS    "5.54"
 Module_Version          SETA    554
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "07 Jun 2009"
-Module_ApplicationDate  SETS    "07-Jun-09"
+Module_Date             SETS    "14 Jun 2009"
+Module_ApplicationDate  SETS    "14-Jun-09"
 Module_ComponentName    SETS    "RISC_OSLib"
 Module_ComponentPath    SETS    "castle/RiscOS/Sources/Lib/RISC_OSLib"
 Module_FullVersion      SETS    "5.54"
-Module_HelpVersion      SETS    "5.54 (07 Jun 2009)"
+Module_HelpVersion      SETS    "5.54 (14 Jun 2009)"
                         END
diff --git a/VersionNum b/VersionNum
index dd41731e6fd2fec7038d852348bcb7d8586e0aeb..8a6f89762431cf787fa5445eddb6e503bf28000b 100644
--- a/VersionNum
+++ b/VersionNum
@@ -6,18 +6,18 @@
  */
 #define Module_MajorVersion_CMHG        5.54
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                07 Jun 2009
+#define Module_Date_CMHG                14 Jun 2009
 
 #define Module_MajorVersion             "5.54"
 #define Module_Version                  554
 #define Module_MinorVersion             ""
-#define Module_Date                     "07 Jun 2009"
+#define Module_Date                     "14 Jun 2009"
 
-#define Module_ApplicationDate          "07-Jun-09"
+#define Module_ApplicationDate          "14-Jun-09"
 
 #define Module_ComponentName            "RISC_OSLib"
 #define Module_ComponentPath            "castle/RiscOS/Sources/Lib/RISC_OSLib"
 
 #define Module_FullVersion              "5.54"
-#define Module_HelpVersion              "5.54 (07 Jun 2009)"
+#define Module_HelpVersion              "5.54 (14 Jun 2009)"
 #define Module_LibraryVersionInfo       "5:54"
diff --git a/s/makehswis b/s/makehswis
index 068a7915444ba2846abe1c76a0611d20c14fba7c..921f63320a0694cc24f5e765de8bbe5407ecf2b6 100644
--- a/s/makehswis
+++ b/s/makehswis
@@ -42,8 +42,6 @@
 ; AAsm source file to make h.swis file from Hdr:SWIs and other headers
 
         GET     Hdr:ListOpts
-        GET     Hdr:Machine.<Machine>
-        $GetIO
 
         GBLS    SWIClass
 
@@ -115,7 +113,6 @@ string2 SETS    "&":CC:(:STR:value)
         GET     Hdr:NewErrors
         GET     Hdr:SWIs
         GET     Hdr:CPU.Generic26
-        GET     Hdr:IO.GenericIO
         GET     Hdr:ModHand
 
         GET     swioptions.s