diff --git a/hal/src/main/native/sim/Interrupts.cpp b/hal/src/main/native/sim/Interrupts.cpp
index 566a0d3db3..fd1e9d32a1 100644
--- a/hal/src/main/native/sim/Interrupts.cpp
+++ b/hal/src/main/native/sim/Interrupts.cpp
@@ -215,14 +215,8 @@ static int64_t WaitForInterruptDigital(HAL_InterruptHandle handle,
 
   wpi::mutex waitMutex;
 
-#if defined(_MSC_VER) && _MSC_VER < 1900
-  auto timeoutTime = std::chrono::steady_clock::now() +
-                     std::chrono::duration<int64_t, std::nano>(
-                         static_cast<int64_t>(timeout * 1e9));
-#else
   auto timeoutTime =
       std::chrono::steady_clock::now() + std::chrono::duration<double>(timeout);
-#endif
 
   {
     std::unique_lock<wpi::mutex> lock(waitMutex);
@@ -285,14 +279,8 @@ static int64_t WaitForInterruptAnalog(HAL_InterruptHandle handle,
 
   wpi::mutex waitMutex;
 
-#if defined(_MSC_VER) && _MSC_VER < 1900
-  auto timeoutTime = std::chrono::steady_clock::now() +
-                     std::chrono::duration<int64_t, std::nano>(
-                         static_cast<int64_t>(timeout * 1e9));
-#else
   auto timeoutTime =
       std::chrono::steady_clock::now() + std::chrono::duration<double>(timeout);
-#endif
 
   {
     std::unique_lock<wpi::mutex> lock(waitMutex);
diff --git a/ntcore/src/main/native/cpp/CallbackManager.h b/ntcore/src/main/native/cpp/CallbackManager.h
index e5e54405d4..9f08016250 100644
--- a/ntcore/src/main/native/cpp/CallbackManager.h
+++ b/ntcore/src/main/native/cpp/CallbackManager.h
@@ -207,14 +207,8 @@ class CallbackManager {
     if (!thr) return true;
 
     auto& lock = thr.GetLock();
-#if defined(_MSC_VER) && _MSC_VER < 1900
-    auto timeout_time = std::chrono::steady_clock::now() +
-                        std::chrono::duration<int64_t, std::nano>(
-                            static_cast<int64_t>(timeout * 1e9));
-#else
     auto timeout_time = std::chrono::steady_clock::now() +
                         std::chrono::duration<double>(timeout);
-#endif
     while (!thr->m_queue.empty()) {
       if (!thr->m_active) return true;
       if (timeout == 0) return false;
@@ -247,14 +241,8 @@ class CallbackManager {
     }
 
     std::unique_lock<wpi::mutex> lock(poller->poll_mutex);
-#if defined(_MSC_VER) && _MSC_VER < 1900
-    auto timeout_time = std::chrono::steady_clock::now() +
-                        std::chrono::duration<int64_t, std::nano>(
-                            static_cast<int64_t>(timeout * 1e9));
-#else
     auto timeout_time = std::chrono::steady_clock::now() +
                         std::chrono::duration<double>(timeout);
-#endif
     *timed_out = false;
     while (poller->poll_queue.empty()) {
       if (poller->terminating) return infos;
diff --git a/ntcore/src/main/native/cpp/Storage.cpp b/ntcore/src/main/native/cpp/Storage.cpp
index 840f25a78c..f04d1616ca 100644
--- a/ntcore/src/main/native/cpp/Storage.cpp
+++ b/ntcore/src/main/native/cpp/Storage.cpp
@@ -1085,14 +1085,8 @@ bool Storage::GetRpcResult(unsigned int local_id, unsigned int call_uid,
   // only allow one blocking call per rpc call uid
   if (!m_rpc_blocking_calls.insert(call_pair).second) return false;
 
-#if defined(_MSC_VER) && _MSC_VER < 1900
-  auto timeout_time = std::chrono::steady_clock::now() +
-                      std::chrono::duration<int64_t, std::nano>(
-                          static_cast<int64_t>(timeout * 1e9));
-#else
   auto timeout_time =
       std::chrono::steady_clock::now() + std::chrono::duration<double>(timeout);
-#endif
   *timed_out = false;
   for (;;) {
     auto i = m_rpc_results.find(call_pair);
diff --git a/ntcore/src/test/native/cpp/StorageTest.cpp b/ntcore/src/test/native/cpp/StorageTest.cpp
index b6c3a88e40..5a6982b38e 100644
--- a/ntcore/src/test/native/cpp/StorageTest.cpp
+++ b/ntcore/src/test/native/cpp/StorageTest.cpp
@@ -577,11 +577,7 @@ TEST_P(StorageTestPersistent, SavePersistent) {
   std::tie(line, rem) = rem.split('\n');
   ASSERT_EQ("array boolean \"booleanarr/two\"=true,false", line);
   std::tie(line, rem) = rem.split('\n');
-#if defined(_MSC_VER) && _MSC_VER < 1900
-  ASSERT_EQ("double \"double/big\"=1.3e+008", line);
-#else
   ASSERT_EQ("double \"double/big\"=1.3e+08", line);
-#endif
   std::tie(line, rem) = rem.split('\n');
   ASSERT_EQ("double \"double/neg\"=-1.5", line);
   std::tie(line, rem) = rem.split('\n');