diff --git a/doc/src/Section_errors.txt b/doc/src/Section_errors.txt
index 1cc72b2a9f..2821f1ff5d 100644
--- a/doc/src/Section_errors.txt
+++ b/doc/src/Section_errors.txt
@@ -1565,15 +1565,6 @@ This operation is not allowed. :dd
 
 This operation is not allowed. :dd
 
-{Cannot use -cuda on and -kokkos on together} :dt
-
-This is not allowed since both packages can use GPUs. :dd
-
-{Cannot use -cuda on without USER-CUDA installed} :dt
-
-The USER-CUDA package must be installed via "make yes-user-cuda"
-before LAMMPS is built. :dd
-
 {Cannot use -kokkos on without KOKKOS installed} :dt
 
 Self-explanatory. :dd
@@ -1597,11 +1588,6 @@ solver/pair style. :dd
 
 This is a current restriction of this command. :dd
 
-{Cannot use GPU package with USER-CUDA package enabled} :dt
-
-You cannot use both the GPU and USER-CUDA packages
-together.  Use one or the other. :dd
-
 {Cannot use Kokkos pair style with rRESPA inner/middle} :dt
 
 Self-explanatory. :dd
@@ -8252,12 +8238,6 @@ Self-explanatory. :dd
 The package command cannot be used afer a read_data, read_restart, or
 create_box command. :dd
 
-{Package cuda command without USER-CUDA package enabled} :dt
-
-The USER-CUDA package must be installed via "make yes-user-cuda"
-before LAMMPS is built, and the "-c on" must be used to enable the
-package. :dd
-
 {Package gpu command without GPU package installed} :dt
 
 The GPU package must be installed via "make yes-gpu" before LAMMPS is
@@ -10230,22 +10210,6 @@ it in different ways. :dd
 
 Self-explanatory. :dd
 
-{USER-CUDA mode requires CUDA variant of min style} :dt
-
-CUDA mode is enabled, so the min style must include a cuda suffix. :dd
-
-{USER-CUDA mode requires CUDA variant of run style} :dt
-
-CUDA mode is enabled, so the run style must include a cuda suffix. :dd
-
-{USER-CUDA package does not yet support comm_style tiled} :dt
-
-Self-explanatory. :dd
-
-{USER-CUDA package requires a cuda enabled atom_style} :dt
-
-Self-explanatory. :dd
-
 {Unable to initialize accelerator for use} :dt
 
 There was a problem initializing an accelerator for the gpu package :dd
@@ -10494,10 +10458,6 @@ Must use remap v option with fix deform with this pair style. :dd
 
 If fix deform is used, the remap v option is required. :dd
 
-{Using suffix cuda without USER-CUDA package enabled} :dt
-
-Self-explanatory. :dd
-
 {Using suffix gpu without GPU package installed} :dt
 
 Self-explanatory. :dd
diff --git a/doc/src/Section_intro.txt b/doc/src/Section_intro.txt
index e1ca0ce62f..67293b2ee3 100644
--- a/doc/src/Section_intro.txt
+++ b/doc/src/Section_intro.txt
@@ -526,14 +526,14 @@ and efforts.
 Axel Kohlmeyer (Temple U), akohlmey at gmail.com, SVN and Git repositories, indefatigable mail list responder, USER-CGSDK, USER-OMP, USER-COLVARS, USER-MOLFILE, USER-QMMM, USER-TALLY, and COMPRESS packages
 Roy Pollock (LLNL), Ewald and PPPM solvers
 Mike Brown (ORNL), brownw at ornl.gov, GPU and USER-INTEL package
-Greg Wagner (Sandia), gjwagne at sandia.gov, MEAM package for MEAM potential
+Greg Wagner (Sandia), gjwagne at sandia.gov, MEAM package for MEAM potential (superseded by USER-MEAMC)
 Mike Parks (Sandia), mlparks at sandia.gov, PERI package for Peridynamics
 Rudra Mukherjee (JPL), Rudranarayan.M.Mukherjee at jpl.nasa.gov, POEMS package for articulated rigid body motion
 Reese Jones (Sandia) and collaborators, rjones at sandia.gov, USER-ATC package for atom/continuum coupling
 Ilya Valuev (JIHT), valuev at physik.hu-berlin.de, USER-AWPMD package for wave-packet MD
-Christian Trott (U Tech Ilmenau), christian.trott at tu-ilmenau.de, USER-CUDA and KOKKOS packages
+Christian Trott (U Tech Ilmenau), christian.trott at tu-ilmenau.de, USER-CUDA (obsoleted by KOKKOS) and KOKKOS packages
 Andres Jaramillo-Botero (Caltech), ajaramil at wag.caltech.edu, USER-EFF package for electron force field
-Christoph Kloss (JKU), Christoph.Kloss at jku.at, USER-LIGGGHTS package for granular models and granular/fluid coupling
+Christoph Kloss (JKU), Christoph.Kloss at jku.at, LIGGGHTS fork for granular models and granular/fluid coupling
 Metin Aktulga (LBL), hmaktulga at lbl.gov, USER-REAXC package for C version of ReaxFF
 Georg Gunzenmuller (EMI), georg.ganzenmueller at emi.fhg.de, USER-SMD and USER-SPH packages
 Colin Denniston (U Western Ontario), cdennist at uwo.ca, USER-LB package :ul
diff --git a/src/GPU/fix_gpu.h b/src/GPU/fix_gpu.h
index 7a3807828a..c190a91061 100644
--- a/src/GPU/fix_gpu.h
+++ b/src/GPU/fix_gpu.h
@@ -86,9 +86,4 @@ E: Cannot use neigh_modify exclude with GPU neighbor builds
 This is a current limitation of the GPU implementation
 in LAMMPS.
 
-U: Cannot use GPU package with USER-CUDA package enabled
-
-You cannot use both the GPU and USER-CUDA packages
-together.  Use one or the other.
-
 */