diff --git a/Software/VNA_embedded/Application/Drivers/FPGA/FPGA.cpp b/Software/VNA_embedded/Application/Drivers/FPGA/FPGA.cpp
index b27d581..7f81664 100644
--- a/Software/VNA_embedded/Application/Drivers/FPGA/FPGA.cpp
+++ b/Software/VNA_embedded/Application/Drivers/FPGA/FPGA.cpp
@@ -284,10 +284,6 @@ bool FPGA::InitiateSampleRead(ReadCallback cb) {
 	return true;
 }
 
-bool FPGA::IsSweepActive() {
-	return isHigh(AUX3);
-}
-
 static int64_t assembleSampleResultValue(uint8_t *raw) {
 //	LOG_DEBUG("Raw: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x", raw[4], raw[5], raw[2], raw[3], raw[1], raw[0]);
 	return sign_extend_64(
diff --git a/Software/VNA_embedded/Application/Drivers/FPGA/FPGA.hpp b/Software/VNA_embedded/Application/Drivers/FPGA/FPGA.hpp
index 3aa43bb..db9809c 100644
--- a/Software/VNA_embedded/Application/Drivers/FPGA/FPGA.hpp
+++ b/Software/VNA_embedded/Application/Drivers/FPGA/FPGA.hpp
@@ -135,7 +135,6 @@ ADCLimits GetADCLimits();
 void ResetADCLimits();
 bool ResumeHaltedSweep();
 uint16_t GetStatus();
-bool IsSweepActive();
 
 void OverwriteHardware(uint8_t attenuation, LowpassFilter filter, bool lowband, bool port1_enabled, bool port2_enabled);
 void DisableHardwareOverwrite();
diff --git a/Software/VNA_embedded/Application/Hardware.cpp b/Software/VNA_embedded/Application/Hardware.cpp
index 68cb4d4..dc675a5 100644
--- a/Software/VNA_embedded/Application/Hardware.cpp
+++ b/Software/VNA_embedded/Application/Hardware.cpp
@@ -303,7 +303,7 @@ bool HW::TimedOut() {
 	auto bufISR = lastISR;
 	uint64_t now = Delay::get_us();
 	uint64_t timeSinceLast = now - bufISR;
-	if(activeMode != Mode::Idle && activeMode != Mode::Generator && !VNA::IsWaitingInStandby() && timeSinceLast > timeout) {
+	if(activeMode != Mode::Idle && activeMode != Mode::Generator && !VNA::GetStandbyMode() && timeSinceLast > timeout) {
 		LOG_WARN("Timed out, last ISR was at %lu%06lu, now %lu%06lu"
 				, (uint32_t) (bufISR / 1000000), (uint32_t)(bufISR%1000000)
 				, (uint32_t) (now / 1000000), (uint32_t)(now%1000000));
diff --git a/Software/VNA_embedded/Application/VNA.cpp b/Software/VNA_embedded/Application/VNA.cpp
index 6342691..2f2c588 100644
--- a/Software/VNA_embedded/Application/VNA.cpp
+++ b/Software/VNA_embedded/Application/VNA.cpp
@@ -278,10 +278,6 @@ bool VNA::GetStandbyMode() {
 	return settings.standby;
 }
 
-bool VNA::IsWaitingInStandby() {
-	return settings.standby && !FPGA::IsSweepActive();
-}
-
 static void PassOnData() {
 	Protocol::PacketInfo info;
 	info.type = Protocol::PacketType::VNADatapoint;
diff --git a/Software/VNA_embedded/Application/VNA.hpp b/Software/VNA_embedded/Application/VNA.hpp
index da42314..1c4b352 100644
--- a/Software/VNA_embedded/Application/VNA.hpp
+++ b/Software/VNA_embedded/Application/VNA.hpp
@@ -9,7 +9,6 @@ namespace VNA {
 bool Setup(Protocol::SweepSettings s);
 void InitiateSweep();
 bool GetStandbyMode();
-bool IsWaitingInStandby();
 bool MeasurementDone(const FPGA::SamplingResult &result);
 void Work();
 void SweepHalted();