diff --git a/external/nmodl b/external/nmodl
index 6c89dc639c..bb4dfd2fbc 160000
--- a/external/nmodl
+++ b/external/nmodl
@@ -1 +1 @@
-Subproject commit 6c89dc639c1ee59e8cfdd69719780e0185f1ec08
+Subproject commit bb4dfd2fbc5209bb1893d3c681157db743ca1dfc
diff --git a/src/coreneuron/CMakeLists.txt b/src/coreneuron/CMakeLists.txt
index a18bb38d7d..2552c80abd 100644
--- a/src/coreneuron/CMakeLists.txt
+++ b/src/coreneuron/CMakeLists.txt
@@ -406,22 +406,6 @@ set(CORENEURON_BUILTIN_MODFILES
 # coreneuron GPU library
 # =============================================================================
 if(CORENRN_ENABLE_GPU)
-  # ~~~
-  # artificial cells and some other cpp files (using Random123) should be compiled
-  # without OpenACC to avoid use of GPU Random123 streams
-  # OL210813: this shouldn't be needed anymore, but it may have a small performance benefit
-  # ~~~
-  set(OPENACC_EXCLUDED_FILES
-      ${CMAKE_CURRENT_BINARY_DIR}/netstim.cpp
-      ${CMAKE_CURRENT_BINARY_DIR}/netstim_inhpoisson.cpp
-      ${CMAKE_CURRENT_BINARY_DIR}/pattern.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/io/nrn_setup.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/io/setup_fornetcon.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/io/corenrn_data_return.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/io/global_vars.cpp)
-
-  set_source_files_properties(${OPENACC_EXCLUDED_FILES} PROPERTIES COMPILE_FLAGS
-                                                                   "-DDISABLE_OPENACC")
   # Only compile the explicit CUDA implementation of the Hines solver in GPU builds. Because of
   # https://forums.developer.nvidia.com/t/cannot-dynamically-load-a-shared-library-containing-both-openacc-and-cuda-code/210972
   # this cannot be included in the same shared library as the rest of the OpenACC code.
diff --git a/src/coreneuron/utils/randoms/nrnran123.h b/src/coreneuron/utils/randoms/nrnran123.h
index d4108612d0..57b30b2d93 100644
--- a/src/coreneuron/utils/randoms/nrnran123.h
+++ b/src/coreneuron/utils/randoms/nrnran123.h
@@ -41,10 +41,7 @@ of the full distribution available from
 
 #include <cmath>
 
-// Some files are compiled with DISABLE_OPENACC, and some builds have no GPU
-// support at all. In these two cases, request that the random123 state is
-// allocated using new/delete instead of CUDA unified memory.
-#if defined(CORENEURON_ENABLE_GPU) && !defined(DISABLE_OPENACC)
+#if defined(CORENEURON_ENABLE_GPU)
 #define CORENRN_RAN123_USE_UNIFIED_MEMORY true
 #else
 #define CORENRN_RAN123_USE_UNIFIED_MEMORY false