diff --git a/lib/rfnoc/blocks/rfnoc_block_addsub/Makefile b/lib/rfnoc/blocks/rfnoc_block_addsub/Makefile
index 0c825f4..2bca6dd 100644
--- a/lib/rfnoc/blocks/rfnoc_block_addsub/Makefile
+++ b/lib/rfnoc/blocks/rfnoc_block_addsub/Makefile
@@ -7,8 +7,7 @@
 #-------------------------------------------------
 # Top-of-Makefile
 #-------------------------------------------------
-# Define BASE_DIR to point to the "top" dir. Note:
-# UHD_FPGA_DIR must be passed into this Makefile.
+# Define BASE_DIR to point to the "top" dir.
 BASE_DIR = ../../../../top
 # Include viv_sim_preample after defining BASE_DIR
 include $(BASE_DIR)/../tools/make/viv_sim_preamble.mak
diff --git a/lib/rfnoc/blocks/rfnoc_block_ddc/Makefile b/lib/rfnoc/blocks/rfnoc_block_ddc/Makefile
index b63685e..cf2d5b0 100644
--- a/lib/rfnoc/blocks/rfnoc_block_ddc/Makefile
+++ b/lib/rfnoc/blocks/rfnoc_block_ddc/Makefile
@@ -7,8 +7,7 @@
 #-------------------------------------------------
 # Top-of-Makefile
 #-------------------------------------------------
-# Define BASE_DIR to point to the "top" dir. Note:
-# UHD_FPGA_DIR must be passed into this Makefile.
+# Define BASE_DIR to point to the "top" dir.
 BASE_DIR = ../../../../top
 # Include viv_sim_preample after defining BASE_DIR
 include $(BASE_DIR)/../tools/make/viv_sim_preamble.mak
diff --git a/lib/rfnoc/blocks/rfnoc_block_duc/Makefile b/lib/rfnoc/blocks/rfnoc_block_duc/Makefile
index c632e52..7b1d18a 100644
--- a/lib/rfnoc/blocks/rfnoc_block_duc/Makefile
+++ b/lib/rfnoc/blocks/rfnoc_block_duc/Makefile
@@ -7,8 +7,7 @@
 #-------------------------------------------------
 # Top-of-Makefile
 #-------------------------------------------------
-# Define BASE_DIR to point to the "top" dir. Note:
-# UHD_FPGA_DIR must be passed into this Makefile.
+# Define BASE_DIR to point to the "top" dir.
 BASE_DIR = ../../../../top
 # Include viv_sim_preample after defining BASE_DIR
 include $(BASE_DIR)/../tools/make/viv_sim_preamble.mak
diff --git a/lib/rfnoc/blocks/rfnoc_block_logpwr/Makefile b/lib/rfnoc/blocks/rfnoc_block_logpwr/Makefile
index cd8e2e4..02d84e4 100644
--- a/lib/rfnoc/blocks/rfnoc_block_logpwr/Makefile
+++ b/lib/rfnoc/blocks/rfnoc_block_logpwr/Makefile
@@ -7,8 +7,7 @@
 #-------------------------------------------------
 # Top-of-Makefile
 #-------------------------------------------------
-# Define BASE_DIR to point to the "top" dir. Note:
-# UHD_FPGA_DIR must be passed into this Makefile.
+# Define BASE_DIR to point to the "top" dir.
 BASE_DIR = ../../../../top
 # Include viv_sim_preample after defining BASE_DIR
 include $(BASE_DIR)/../tools/make/viv_sim_preamble.mak
diff --git a/lib/rfnoc/blocks/rfnoc_block_siggen/Makefile b/lib/rfnoc/blocks/rfnoc_block_siggen/Makefile
index 8fffd1c..92720c8 100644
--- a/lib/rfnoc/blocks/rfnoc_block_siggen/Makefile
+++ b/lib/rfnoc/blocks/rfnoc_block_siggen/Makefile
@@ -7,8 +7,7 @@
 #-------------------------------------------------
 # Top-of-Makefile
 #-------------------------------------------------
-# Define BASE_DIR to point to the "top" dir. Note:
-# UHD_FPGA_DIR must be passed into this Makefile.
+# Define BASE_DIR to point to the "top" dir.
 BASE_DIR = ../../../../top
 # Include viv_sim_preample after defining BASE_DIR
 include $(BASE_DIR)/../tools/make/viv_sim_preamble.mak
diff --git a/lib/rfnoc/blocks/rfnoc_block_vector_iir/Makefile b/lib/rfnoc/blocks/rfnoc_block_vector_iir/Makefile
index 656b4d5..0d60a7b 100644
--- a/lib/rfnoc/blocks/rfnoc_block_vector_iir/Makefile
+++ b/lib/rfnoc/blocks/rfnoc_block_vector_iir/Makefile
@@ -7,8 +7,7 @@
 #-------------------------------------------------
 # Top-of-Makefile
 #-------------------------------------------------
-# Define BASE_DIR to point to the "top" dir. Note:
-# UHD_FPGA_DIR must be passed into this Makefile.
+# Define BASE_DIR to point to the "top" dir.
 BASE_DIR = ../../../../top
 # Include viv_sim_preample after defining BASE_DIR
 include $(BASE_DIR)/../tools/make/viv_sim_preamble.mak
diff --git a/lib/rfnoc/blocks/rfnoc_block_window/Makefile b/lib/rfnoc/blocks/rfnoc_block_window/Makefile
index f050347..83c7c29 100644
--- a/lib/rfnoc/blocks/rfnoc_block_window/Makefile
+++ b/lib/rfnoc/blocks/rfnoc_block_window/Makefile
@@ -7,8 +7,7 @@
 #-------------------------------------------------
 # Top-of-Makefile
 #-------------------------------------------------
-# Define BASE_DIR to point to the "top" dir. Note:
-# UHD_FPGA_DIR must be passed into this Makefile.
+# Define BASE_DIR to point to the "top" dir.
 BASE_DIR = ../../../../top
 # Include viv_sim_preample after defining BASE_DIR
 include $(BASE_DIR)/../tools/make/viv_sim_preamble.mak
diff --git a/top/x400/rf/sim/Makefile b/top/x400/rf/sim/Makefile
index 08b62f4..6d3996d 100644
--- a/top/x400/rf/sim/Makefile
+++ b/top/x400/rf/sim/Makefile
@@ -7,8 +7,7 @@
 #-------------------------------------------------
 # Top-of-Makefile
 #-------------------------------------------------
-# Define BASE_DIR to point to the "top" dir. Note:
-# UHD_FPGA_DIR must be passed into this Makefile.
+# Define BASE_DIR to point to the "top" dir.
 BASE_DIR = ../../..
 # Include viv_sim_preample after defining BASE_DIR
 include $(BASE_DIR)/../tools/make/viv_sim_preamble.mak