diff --git a/Development/efi/file_protocol.h b/Development/efi/file_protocol.h
index 6dbde51..9d6dff8 100644
--- a/Development/efi/file_protocol.h
+++ b/Development/efi/file_protocol.h
@@ -49,7 +49,7 @@ struct efi_file_protocol {
         uint64_t);
     efi_status_t (*close)(struct efi_file_protocol *);
 
-    void (*unused1)();
+    efi_status_t (*delete)(struct efi_file_protocol *);
 
     efi_status_t (*read)(struct efi_file_protocol *, efi_uint_t *, void *);
 
diff --git a/Development/efi/simple_file_system_protocol.h b/Development/efi/simple_file_system_protocol.h
index 31b2f85..b756065 100644
--- a/Development/efi/simple_file_system_protocol.h
+++ b/Development/efi/simple_file_system_protocol.h
@@ -8,7 +8,7 @@
 #include "types.h"
 
 #define EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID \
-    { 0x0964e5b22, 0x6459, 0x11d2, \
+    { 0x964e5b22, 0x6459, 0x11d2, \
       { 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b } }
 
 struct efi_simple_file_system_protocol {
diff --git a/amd64/Development/M0.M1 b/amd64/Development/M0.M1
index 98d6173..f184238 100644
--- a/amd64/Development/M0.M1
+++ b/amd64/Development/M0.M1
@@ -1141,14 +1141,12 @@ DEFINE xor_r13,r13 4D31ED
     %0x5B1B31A1
     @0x9562
     @0x11D2
-:LOADED_IMAGE_PROTOCOL_8
     !0x8E !0x3F !0 !0xA0 !0xC9 !0x69 !0x72 !0x3B
 
 :SIMPLE_FS_PROTOCOL
-    %0x0964E5B22
+    %0x964E5B22
     @0x6459
     @0x11D2
-:SIMPLE_FS_PROTOCOL_8
     !0x8E !0x39 !0 !0xA0 !0xC9 !0x69 !0x72 !0x3B
 
 :malloc_pool
diff --git a/amd64/Development/M0.S b/amd64/Development/M0.S
index 9116375..222f9c4 100644
--- a/amd64/Development/M0.S
+++ b/amd64/Development/M0.S
@@ -1009,7 +1009,7 @@ LOADED_IMAGE_PROTOCOL:
 .byte  0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b
 
 SIMPLE_FS_PROTOCOL:
-.long  0x0964e5b22
+.long  0x964e5b22
 .short 0x6459
 .short 0x11d2
 .byte  0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b
diff --git a/amd64/Development/catm.M1 b/amd64/Development/catm.M1
index 6977e2f..f7f80ff 100644
--- a/amd64/Development/catm.M1
+++ b/amd64/Development/catm.M1
@@ -292,7 +292,7 @@ DEFINE xor_r9,r9 4D31C9
     !0x8e !0x3f !0 !0xa0 !0xc9 !0x69 !0x72 !0x3b
 
 :SIMPLE_FS_PROTOCOL
-    %0x0964e5b22
+    %0x964e5b22
     @0x6459
     @0x11d2
     !0x8e !0x39 !0 !0xa0 !0xc9 !0x69 !0x72 !0x3b
diff --git a/amd64/Development/catm.S b/amd64/Development/catm.S
index 5728bb4..37b303d 100644
--- a/amd64/Development/catm.S
+++ b/amd64/Development/catm.S
@@ -234,7 +234,7 @@ LOADED_IMAGE_PROTOCOL:
 .byte  0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b
 
 SIMPLE_FS_PROTOCOL:
-.long  0x0964e5b22
+.long  0x964e5b22
 .short 0x6459
 .short 0x11d2
 .byte  0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b
diff --git a/amd64/Development/cc_amd64.S b/amd64/Development/cc_amd64.S
index 6934a54..afaa154 100644
--- a/amd64/Development/cc_amd64.S
+++ b/amd64/Development/cc_amd64.S
@@ -4871,7 +4871,7 @@ LOADED_IMAGE_PROTOCOL:
 .byte  0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b
 
 SIMPLE_FS_PROTOCOL:
-.long  0x0964e5b22
+.long  0x964e5b22
 .short 0x6459
 .short 0x11d2
 .byte  0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b
diff --git a/amd64/Development/hex0.M1 b/amd64/Development/hex0.M1
index 9171c21..dde238c 100644
--- a/amd64/Development/hex0.M1
+++ b/amd64/Development/hex0.M1
@@ -354,7 +354,7 @@ DEFINE xor_r9,r9 4D31C9
     !0x8e !0x3f !0 !0xa0 !0xc9 !0x69 !0x72 !0x3b
 
 :SIMPLE_FS_PROTOCOL
-    %0x0964e5b22
+    %0x964e5b22
     @0x6459
     @0x11d2
     !0x8e !0x39 !0 !0xa0 !0xc9 !0x69 !0x72 !0x3b
diff --git a/amd64/Development/hex0.S b/amd64/Development/hex0.S
index 23189ac..cd7e2fa 100644
--- a/amd64/Development/hex0.S
+++ b/amd64/Development/hex0.S
@@ -289,7 +289,7 @@ LOADED_IMAGE_PROTOCOL:
 .byte  0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b
 
 SIMPLE_FS_PROTOCOL:
-.long  0x0964e5b22
+.long  0x964e5b22
 .short 0x6459
 .short 0x11d2
 .byte  0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b
diff --git a/amd64/Development/hex0.hex2 b/amd64/Development/hex0.hex2
index ce7029c..c92e68d 100644
--- a/amd64/Development/hex0.hex2
+++ b/amd64/Development/hex0.hex2
@@ -283,7 +283,7 @@
     8E 3F 00 A0 C9 69 72 3B ; !0x8e !0x3f !0 !0xa0 !0xc9 !0x69 !0x72 !0x3b
 
 :SIMPLE_FS_PROTOCOL
-    22 5B 4E 96             ; %0x0964e5b22
+    22 5B 4E 96             ; %0x964e5b22
     59 64                   ; @0x6459
     D2 11                   ; @0x11d2
     8E 39 00 A0 C9 69 72 3B ; !0x8e !0x39 !0 !0xa0 !0xc9 !0x69 !0x72 !0x3b
diff --git a/amd64/Development/hex1.M1 b/amd64/Development/hex1.M1
index 121808f..2acf450 100644
--- a/amd64/Development/hex1.M1
+++ b/amd64/Development/hex1.M1
@@ -483,7 +483,7 @@ DEFINE xor_r9,r9 4D31C9
     !0x8e !0x3f !0 !0xa0 !0xc9 !0x69 !0x72 !0x3b
 
 :SIMPLE_FS_PROTOCOL
-    %0x0964e5b22
+    %0x964e5b22
     @0x6459
     @0x11d2
     !0x8e !0x39 !0 !0xa0 !0xc9 !0x69 !0x72 !0x3b
diff --git a/amd64/Development/hex1.S b/amd64/Development/hex1.S
index 1804371..cdf5497 100644
--- a/amd64/Development/hex1.S
+++ b/amd64/Development/hex1.S
@@ -407,7 +407,7 @@ LOADED_IMAGE_PROTOCOL:
 .byte  0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b
 
 SIMPLE_FS_PROTOCOL:
-.long  0x0964e5b22
+.long  0x964e5b22
 .short 0x6459
 .short 0x11d2
 .byte  0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b
diff --git a/amd64/Development/hex1.hex2 b/amd64/Development/hex1.hex2
index 8a913c4..a765289 100644
--- a/amd64/Development/hex1.hex2
+++ b/amd64/Development/hex1.hex2
@@ -401,7 +401,7 @@
     8E 3F 00 A0 C9 69 72 3B ; !0x8e !0x3f !0 !0xa0 !0xc9 !0x69 !0x72 !0x3b
 
 :SIMPLE_FS_PROTOCOL
-    22 5B 4E 96             ; %0x0964e5b22
+    22 5B 4E 96             ; %0x964e5b22
     59 64                   ; @0x6459
     D2 11                   ; @0x11d2
     8E 39 00 A0 C9 69 72 3B ; !0x8e !0x39 !0 !0xa0 !0xc9 !0x69 !0x72 !0x3b
diff --git a/amd64/Development/hex2.M1 b/amd64/Development/hex2.M1
index df9bca4..d6f5565 100644
--- a/amd64/Development/hex2.M1
+++ b/amd64/Development/hex2.M1
@@ -777,14 +777,12 @@ DEFINE xor_r9,r9 4D31C9
     %0x5b1b31a1
     @0x9562
     @0x11d2
-:LOADED_IMAGE_PROTOCOL_8
     !0x8e !0x3f !0 !0xa0 !0xc9 !0x69 !0x72 !0x3b
 
 :SIMPLE_FS_PROTOCOL
-    %0x0964e5b22
+    %0x964e5b22
     @0x6459
     @0x11d2
-:SIMPLE_FS_PROTOCOL_8
     !0x8e !0x39 !0 !0xa0 !0xc9 !0x69 !0x72 !0x3b
 
 :fin
diff --git a/amd64/Development/hex2.S b/amd64/Development/hex2.S
index 8618571..c3cf65c 100644
--- a/amd64/Development/hex2.S
+++ b/amd64/Development/hex2.S
@@ -673,7 +673,7 @@ LOADED_IMAGE_PROTOCOL:
 .byte  0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b
 
 SIMPLE_FS_PROTOCOL:
-.long  0x0964e5b22
+.long  0x964e5b22
 .short 0x6459
 .short 0x11d2
 .byte  0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b
diff --git a/amd64/Development/kaem-optional.M1 b/amd64/Development/kaem-optional.M1
index c8534d0..180fc18 100644
--- a/amd64/Development/kaem-optional.M1
+++ b/amd64/Development/kaem-optional.M1
@@ -526,7 +526,7 @@ DEFINE xor_r15,r15 4D31FF
     !0x8e !0x3f !0 !0xa0 !0xc9 !0x69 !0x72 !0x3b
 
 :SIMPLE_FS_PROTOCOL
-    %0x0964e5b22
+    %0x964e5b22
     @0x6459
     @0x11d2
     !0x8e !0x39 !0 !0xa0 !0xc9 !0x69 !0x72 !0x3b
diff --git a/amd64/Development/kaem-optional.S b/amd64/Development/kaem-optional.S
index 8565816..dee5656 100644
--- a/amd64/Development/kaem-optional.S
+++ b/amd64/Development/kaem-optional.S
@@ -427,7 +427,7 @@ LOADED_IMAGE_PROTOCOL:
 .byte  0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b
 
 SIMPLE_FS_PROTOCOL:
-.long  0x0964e5b22
+.long  0x964e5b22
 .short 0x6459
 .short 0x11d2
 .byte  0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b
diff --git a/amd64/Development/kaem-optional.hex2 b/amd64/Development/kaem-optional.hex2
index dacb700..3bee683 100644
--- a/amd64/Development/kaem-optional.hex2
+++ b/amd64/Development/kaem-optional.hex2
@@ -421,7 +421,7 @@
     8E 3F 00 A0 C9 69 72 3B ; !0x8e !0x3f !0 !0xa0 !0xc9 !0x69 !0x72 !0x3b
 
 :SIMPLE_FS_PROTOCOL
-    22 5B 4E 96             ; %0x0964e5b22
+    22 5B 4E 96             ; %0x964e5b22
     59 64                   ; @0x6459
     D2 11                   ; @0x11d2
     8E 39 00 A0 C9 69 72 3B ; !0x8e !0x39 !0 !0xa0 !0xc9 !0x69 !0x72 !0x3b
diff --git a/amd64/M0.hex2 b/amd64/M0.hex2
index 6616099..3973324 100644
--- a/amd64/M0.hex2
+++ b/amd64/M0.hex2
@@ -1005,7 +1005,7 @@
     8E 3F 00 A0 C9 69 72 3B ; !0x8E !0x3F !0 !0xA0 !0xC9 !0x69 !0x72 !0x3B
 
 :SIMPLE_FS_PROTOCOL
-    22 5B 4E 96             ; %0x0964E5B22
+    22 5B 4E 96             ; %0x964E5B22
     59 64                   ; @0x6459
     D2 11                   ; @0x11D2
     8E 39 00 A0 C9 69 72 3B ; !0x8E !0x39 !0 !0xA0 !0xC9 !0x69 !0x72 !0x3B
diff --git a/amd64/catm.hex2 b/amd64/catm.hex2
index 852bd8a..0fa7235 100644
--- a/amd64/catm.hex2
+++ b/amd64/catm.hex2
@@ -363,7 +363,7 @@
     8E 3F 00 A0 C9 69 72 3B ; !0x8e !0x3f !0 !0xa0 !0xc9 !0x69 !0x72 !0x3b
 
 :SIMPLE_FS_PROTOCOL
-    22 5B 4E 96             ; %0x0964e5b22
+    22 5B 4E 96             ; %0x964e5b22
     59 64                   ; @0x6459
     D2 11                   ; @0x11d2
     8E 39 00 A0 C9 69 72 3B ; !0x8e !0x39 !0 !0xa0 !0xc9 !0x69 !0x72 !0x3b
diff --git a/amd64/cc_amd64.M1 b/amd64/cc_amd64.M1
index bd95edb..e4fcdd2 100644
--- a/amd64/cc_amd64.M1
+++ b/amd64/cc_amd64.M1
@@ -5665,14 +5665,12 @@ ARGUMENTS address: "
     %0x5B1B31A1
     @0x9562
     @0x11D2
-:LOADED_IMAGE_PROTOCOL_8
     !0x8E !0x3F !0 !0xA0 !0xC9 !0x69 !0x72 !0x3B
 
 :SIMPLE_FS_PROTOCOL
-    %0x0964E5B22
+    %0x964E5B22
     @0x6459
     @0x11D2
-:SIMPLE_FS_PROTOCOL_8
     !0x8E !0x39 !0 !0xA0 !0xC9 !0x69 !0x72 !0x3B
 
 :malloc_pool
diff --git a/amd64/hex0.hex0 b/amd64/hex0.hex0
index 5861ba7..a7c736b 100644
--- a/amd64/hex0.hex0
+++ b/amd64/hex0.hex0
@@ -412,7 +412,7 @@ D0 01 00 00                             ; SizeOfRawData
     8E 3F 00 A0 C9 69 72 3B ; !0x8e !0x3f !0 !0xa0 !0xc9 !0x69 !0x72 !0x3b
 
 # :SIMPLE_FS_PROTOCOL [_start+0x1C0]
-    22 5B 4E 96             ; %0x0964e5b22
+    22 5B 4E 96             ; %0x964e5b22
     59 64                   ; @0x6459
     D2 11                   ; @0x11d2
     8E 39 00 A0 C9 69 72 3B ; !0x8e !0x39 !0 !0xa0 !0xc9 !0x69 !0x72 !0x3b
diff --git a/amd64/hex1.hex0 b/amd64/hex1.hex0
index 456baf7..b94dc03 100644
--- a/amd64/hex1.hex0
+++ b/amd64/hex1.hex0
@@ -531,7 +531,7 @@ CF 03 00 00                             ; SizeOfRawData
     8E 3F 00 A0 C9 69 72 3B ; !0x8e !0x3f !0 !0xa0 !0xc9 !0x69 !0x72 !0x3b
 
 # :SIMPLE_FS_PROTOCOL [_start+0x3BF]
-    22 5B 4E 96     ; %0x0964e5b22
+    22 5B 4E 96     ; %0x964e5b22
     59 64           ; @0x6459
     D2 11           ; @0x11d2
     8E 39 00 A0 C9 69 72 3B ; !0x8e !0x39 !0 !0xa0 !0xc9 !0x69 !0x72 !0x3b
diff --git a/amd64/hex2.hex1 b/amd64/hex2.hex1
index f1a748f..f844dce 100644
--- a/amd64/hex2.hex1
+++ b/amd64/hex2.hex1
@@ -799,7 +799,7 @@ DD 06 00 00                             ; SizeOfRawData
     8E 3F 00 A0 C9 69 72 3B ; !0x8e !0x3f !0 !0xa0 !0xc9 !0x69 !0x72 !0x3b
 
 :Z #:SIMPLE_FS_PROTOCOL
-    22 5B 4E 96             ; %0x0964e5b22
+    22 5B 4E 96             ; %0x964e5b22
     59 64                   ; @0x6459
     D2 11                   ; @0x11d2
     8E 39 00 A0 C9 69 72 3B ; !0x8e !0x39 !0 !0xa0 !0xc9 !0x69 !0x72 !0x3b
diff --git a/amd64/kaem-optional.hex0 b/amd64/kaem-optional.hex0
index 21acad5..55bae55 100644
--- a/amd64/kaem-optional.hex0
+++ b/amd64/kaem-optional.hex0
@@ -553,7 +553,7 @@ EE 03 00 00                             ; SizeOfRawData
     8E 3F 00 A0 C9 69 72 3B ; !0x8e !0x3f !0 !0xa0 !0xc9 !0x69 !0x72 !0x3b
 
 # :SIMPLE_FS_PROTOCOL [_start+0x38B]
-    22 5B 4E 96             ; %0x0964e5b22
+    22 5B 4E 96             ; %0x964e5b22
     59 64                   ; @0x6459
     D2 11                   ; @0x11d2
     8E 39 00 A0 C9 69 72 3B ; !0x8e !0x39 !0 !0xa0 !0xc9 !0x69 !0x72 !0x3b