diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2bcb539ea..763220c34 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -345,7 +345,7 @@ endif(NOT Boost_FOUND)
 ################################################################################
 # GNU Radio - http://gnuradio.org/redmine/projects/gnuradio/wiki
 ################################################################################
-set(GR_REQUIRED_COMPONENTS RUNTIME ANALOG BLOCKS FFT FILTER PMT UHD)
+set(GR_REQUIRED_COMPONENTS RUNTIME ANALOG BLOCKS FFT FILTER PMT)
 find_package(Gnuradio)
 if(PC_GNURADIO_RUNTIME_VERSION)
    if(PC_GNURADIO_RUNTIME_VERSION VERSION_LESS 3.7.3)
@@ -822,18 +822,15 @@ endif(NOT GNUTLS_OPENSSL_LIBRARY)
 
 
 ################################################################################
-# Universal Hardware Driver (UHD)
+# USRP Hardware Driver (UHD) - OPTIONAL
 ################################################################################
 find_package(UHD)
 if(NOT UHD_FOUND)
     set(ENABLE_UHD OFF)
-    message(STATUS "The Universal Hardware Driver (UHD) based signal source will not be built,")
-    message(STATUS "so all USRP-based front-ends will not be usable.")
-    message(STATUS "Please check http://code.ettus.com/redmine/ettus/projects/uhd/wiki")
+    message(STATUS " The USRP Hardware Driver (UHD) signal source will not be built,")
+    message(STATUS " so all USRP-based front-ends will not be usable.")
+    message(STATUS " Please check http://files.ettus.com/manual/")
 else(NOT UHD_FOUND)
-    if(NOT GNURADIO_UHD_FOUND)
-        message(FATAL_ERROR "*** gnuradio-uhd 3.7 or later is required to build gnss-sdr")
-    endif(NOT GNURADIO_UHD_FOUND)
     set(ENABLE_UHD ON)
 endif(NOT UHD_FOUND)
 
diff --git a/src/algorithms/signal_source/adapters/osmosdr_signal_source.h b/src/algorithms/signal_source/adapters/osmosdr_signal_source.h
index 0fffe7b18..0d1bbbe2e 100644
--- a/src/algorithms/signal_source/adapters/osmosdr_signal_source.h
+++ b/src/algorithms/signal_source/adapters/osmosdr_signal_source.h
@@ -81,7 +81,7 @@ public:
 private:
     std::string role_;
 
-    // UHD SETTINGS
+    // Front-end settings
     bool AGC_enabled_;
     double sample_rate_;
 
diff --git a/src/tests/gnss_block/gnss_block_factory_test.cc b/src/tests/gnss_block/gnss_block_factory_test.cc
index 0e425870a..812647e8d 100644
--- a/src/tests/gnss_block/gnss_block_factory_test.cc
+++ b/src/tests/gnss_block/gnss_block_factory_test.cc
@@ -62,23 +62,6 @@ TEST(GNSS_Block_Factory_Test, InstantiateFileSignalSource)
     EXPECT_STREQ("File_Signal_Source", signal_source->implementation().c_str());
 }
 
-/*
-TEST(GNSS_Block_Factory_Test, InstantiateUHDSignalSource)
-{
-    std::shared_ptr<InMemoryConfiguration> configuration = std::make_shared<InMemoryConfiguration>();
-    configuration->set_property("SignalSource.implementation", "UHD_Signal_Source");
-    configuration->set_property("SignalSource.item_type", "gr_complex");
-    configuration->set_property("SignalSource.device_address", "192.168.40.2");
-    gr::msg_queue::sptr queue = gr::msg_queue::make(0);
-    // Example of a factory created with auto
-    auto factory = new GNSSBlockFactory();
-    // Example of a block created with auto
-    auto signal_source = factory->GetSignalSource(configuration, queue);
-
-    EXPECT_STREQ("SignalSource", signal_source->role().c_str());
-    EXPECT_STREQ("UHD_Signal_Source", signal_source->implementation().c_str());
-}
-*/
 
 TEST(GNSS_Block_Factory_Test, InstantiateWrongSignalSource)
 {