diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/OmfLoader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/OmfLoader.java
index 5ffdbd39a4..3caaaab634 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/OmfLoader.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/OmfLoader.java
@@ -357,39 +357,28 @@ public class OmfLoader extends AbstractProgramWrapperLoader {
 		final Language language = program.getLanguage();
 
 		ArrayList<OmfSegmentHeader> segments = header.getSegments();
-//		int sectionNumber = 0;
 		for (OmfSegmentHeader segment : segments) {
-//			++sectionNumber;
 			if (monitor.isCancelled()) {
 				break;
 			}
 
-			//		if (segment.hasIteratedData() && segment.hasEnumeratedData())
-			//			throw new IOException("OMF segment has both iterated and enumerated data blocks");
-			MemoryBlock block = null;
-
+			Address segmentAddr = segment.getAddress(language);
 			final long segmentSize = segment.getSegmentLength();
 
-			Address segmentAddr = segment.getAddress(language);
-
 			if (segmentSize == 0) {
-				// don't create a block
+				continue;
 			}
-			else if (segment.hasNonZeroData()) {
-				block = MemoryBlockUtils.createInitializedBlock(program, false, segment.getName(),
-					segmentAddr, segment.getRawDataStream(reader, log), segmentSize,
-					"Address:0x" + Long.toHexString(segmentAddr.getOffset()) + " " + "Size:0x" +
-						Long.toHexString(segmentSize),
-					null/*source*/, segment.isReadable(), segment.isWritable(),
-					segment.isExecutable(), log, monitor);
+			
+			if (segment.hasNonZeroData()) {
+				MemoryBlockUtils.createInitializedBlock(program, false, segment.getName(),
+					segmentAddr, segment.getRawDataStream(reader, log), segmentSize, "", "",
+					segment.isReadable(), segment.isWritable(), segment.isExecutable(), log,
+					monitor);
 
 			}
 			else {
-				block = MemoryBlockUtils.createUninitializedBlock(program, false, segment.getName(),
-					segmentAddr, segmentSize,
-					"Address:0x" + Long.toHexString(segmentAddr.getOffset()) + " " + "Size:0x" +
-						Long.toHexString(segmentSize),
-					null/*source*/, segment.isReadable(), segment.isWritable(),
+				MemoryBlockUtils.createUninitializedBlock(program, false, segment.getName(),
+					segmentAddr, segmentSize, "", "", segment.isReadable(), segment.isWritable(),
 					segment.isExecutable(), log);
 			}
 		}