diff --git a/BaseTools/ImageTool/Image.c b/BaseTools/ImageTool/Image.c
index 527eefd9f1..68c913f988 100644
--- a/BaseTools/ImageTool/Image.c
+++ b/BaseTools/ImageTool/Image.c
@@ -26,7 +26,6 @@ CheckToolImageSegment (
     return false;
   }
 
-  // FIXME: Expand prior segment
   if (Segment->ImageAddress != *PreviousEndAddress) {
     DEBUG_RAISE ();
     return false;
diff --git a/BaseTools/ImageTool/PeScan.c b/BaseTools/ImageTool/PeScan.c
index 536450bf67..b0dfc53d51 100644
--- a/BaseTools/ImageTool/PeScan.c
+++ b/BaseTools/ImageTool/PeScan.c
@@ -128,7 +128,6 @@ ScanPeGetRelocInfo (
       RelocType   = IMAGE_RELOC_TYPE (RelocBlock->Relocations[RelocIndex]);
       RelocOffset = IMAGE_RELOC_OFFSET (RelocBlock->Relocations[RelocIndex]);
 
-      // FIXME: Make separate functions for UE
       switch (RelocType) {
         case EFI_IMAGE_REL_BASED_ABSOLUTE:
           continue;