diff --git a/src/USER-RANN/rann_activation_linear.h b/src/USER-RANN/rann_activation_linear.h
index f610907943..5596ddaef7 100644
--- a/src/USER-RANN/rann_activation_linear.h
+++ b/src/USER-RANN/rann_activation_linear.h
@@ -28,12 +28,6 @@ do not necessarily reflect the views of the United States Army.​”
 
 DISTRIBUTION A. Approved for public release; distribution unlimited. OPSEC#4918
  */
-#ifdef ACTIVATION_CLASS
-
-ActivationStyle(linear,Activation_linear)
-
-#else
-
 #ifndef LMP_RANN_ACTIVATION_LINEAR_H
 #define LMP_RANN_ACTIVATION_LINEAR_H
 
@@ -73,5 +67,4 @@ namespace LAMMPS_NS {
   }
 }
 
-#endif
 #endif /* ACTIVATION_LINEAR_H_ */
diff --git a/src/USER-RANN/rann_activation_sig_i.h b/src/USER-RANN/rann_activation_sig_i.h
index 283ff3ee02..9983862b31 100644
--- a/src/USER-RANN/rann_activation_sig_i.h
+++ b/src/USER-RANN/rann_activation_sig_i.h
@@ -28,12 +28,6 @@ do not necessarily reflect the views of the United States Army.​”
 DISTRIBUTION A. Approved for public release; distribution unlimited. OPSEC#4918
  */
 
-#ifdef ACTIVATION_CLASS
-
-ActivationStyle(sigI,Activation_sigI)
-
-#else
-
 #ifndef LMP_RANN_ACTIVATION_SIGI_H
 #define LMP_RANN_ACTIVATION_SIGI_H
 
@@ -73,5 +67,4 @@ namespace LAMMPS_NS {
   }
 }
 
-#endif
 #endif /* ACTIVATION_SIGI_H_ */
diff --git a/src/USER-RANN/rann_fingerprint_bond.h b/src/USER-RANN/rann_fingerprint_bond.h
index 183887404f..041c29a742 100644
--- a/src/USER-RANN/rann_fingerprint_bond.h
+++ b/src/USER-RANN/rann_fingerprint_bond.h
@@ -28,12 +28,6 @@ do not necessarily reflect the views of the United States Army.​”
 DISTRIBUTION A. Approved for public release; distribution unlimited. OPSEC#4918
  */
 
-#ifdef FINGERPRINT_CLASS
-
-FingerprintStyle(bond,Fingerprint_bond)
-
-#else
-
 #ifndef LMP_RANN_FINGERPRINT_BOND_H
 #define LMP_RANN_FINGERPRINT_BOND_H
 
@@ -75,6 +69,4 @@ namespace LAMMPS_NS {
   }
 }
 
-
-#endif
 #endif /* FINGERPRINT_BOND_H_ */
diff --git a/src/USER-RANN/rann_fingerprint_bondscreened.h b/src/USER-RANN/rann_fingerprint_bondscreened.h
index 44bb28c265..7e9216933f 100644
--- a/src/USER-RANN/rann_fingerprint_bondscreened.h
+++ b/src/USER-RANN/rann_fingerprint_bondscreened.h
@@ -28,11 +28,6 @@ do not necessarily reflect the views of the United States Army.​”
 
 DISTRIBUTION A. Approved for public release; distribution unlimited. OPSEC#4918
  */
-#ifdef FINGERPRINT_CLASS
-
-FingerprintStyle(bondscreened,Fingerprint_bondscreened)
-
-#else
 
 #ifndef LMP_RANN_FINGERPRINT_BONDSCREENED_H
 #define LMP_RANN_FINGERPRINT_BONDSCREENED_H
@@ -75,6 +70,4 @@ namespace LAMMPS_NS {
 
 }
 
-
-#endif
 #endif /* FINGERPRINT_BOND_H_ */
diff --git a/src/USER-RANN/rann_fingerprint_bondscreenedspin.h b/src/USER-RANN/rann_fingerprint_bondscreenedspin.h
index e2f5f941f3..6bf12e5041 100644
--- a/src/USER-RANN/rann_fingerprint_bondscreenedspin.h
+++ b/src/USER-RANN/rann_fingerprint_bondscreenedspin.h
@@ -28,11 +28,6 @@ do not necessarily reflect the views of the United States Army.​”
 
 DISTRIBUTION A. Approved for public release; distribution unlimited. OPSEC#4918
  */
-#ifdef FINGERPRINT_CLASS
-
-FingerprintStyle(bondscreenedspin,Fingerprint_bondscreenedspin)
-
-#else
 
 #ifndef LMP_RANN_FINGERPRINT_BONDSCREENEDSPIN_H
 #define LMP_RANN_FINGERPRINT_BONDSCREENEDSPIN_H
@@ -75,6 +70,4 @@ namespace LAMMPS_NS {
   }
 }
 
-
-#endif
 #endif /* FINGERPRINT_BOND_H_ */
diff --git a/src/USER-RANN/rann_fingerprint_bondspin.h b/src/USER-RANN/rann_fingerprint_bondspin.h
index 9514779a5c..845c88d062 100644
--- a/src/USER-RANN/rann_fingerprint_bondspin.h
+++ b/src/USER-RANN/rann_fingerprint_bondspin.h
@@ -28,11 +28,6 @@ do not necessarily reflect the views of the United States Army.​”
 
 DISTRIBUTION A. Approved for public release; distribution unlimited. OPSEC#4918
  */
-#ifdef FINGERPRINT_CLASS
-
-FingerprintStyle(bondspin,Fingerprint_bondspin)
-
-#else
 
 #ifndef LMP_RANN_FINGERPRINT_BONDSPIN_H
 #define LMP_RANN_FINGERPRINT_BONDSPIN_H
@@ -74,6 +69,4 @@ namespace LAMMPS_NS {
   }
 }
 
-
-#endif
 #endif /* FINGERPRINT_BOND_H_ */
diff --git a/src/USER-RANN/rann_fingerprint_radial.h b/src/USER-RANN/rann_fingerprint_radial.h
index e6e4e85294..20ec18e8ec 100644
--- a/src/USER-RANN/rann_fingerprint_radial.h
+++ b/src/USER-RANN/rann_fingerprint_radial.h
@@ -28,11 +28,6 @@ do not necessarily reflect the views of the United States Army.​”
 
 DISTRIBUTION A. Approved for public release; distribution unlimited. OPSEC#4918
  */
-#ifdef FINGERPRINT_CLASS
-
-FingerprintStyle(radial,Fingerprint_radial)
-
-#else
 
 #ifndef LMP_RANN_FINGERPRINT_RADIAL_H
 #define LMP_RANN_FINGERPRINT_RADIAL_H
@@ -66,5 +61,4 @@ namespace LAMMPS_NS {
   }
 }
 
-#endif
 #endif /* FINGERPRINT_RADIAL_H_ */
diff --git a/src/USER-RANN/rann_fingerprint_radialscreened.h b/src/USER-RANN/rann_fingerprint_radialscreened.h
index d385f9b29c..ef7d612902 100644
--- a/src/USER-RANN/rann_fingerprint_radialscreened.h
+++ b/src/USER-RANN/rann_fingerprint_radialscreened.h
@@ -1,4 +1,3 @@
-
 /* -*- c++ -*- ----------------------------------------------------------
    LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
    https://www.lammps.org/ Sandia National Laboratories
@@ -28,15 +27,10 @@ do not necessarily reflect the views of the United States Army.​”
 
 DISTRIBUTION A. Approved for public release; distribution unlimited. OPSEC#4918
  */
-#ifdef FINGERPRINT_CLASS
 
-FingerprintStyle(radialscreened,Fingerprint_radialscreened)
-
-#else
 #ifndef LMP_RANN_FINGERPRINT_RADIALSCREENED_H
 #define LMP_RANN_FINGERPRINT_RADIALSCREENED_H
 
-
 #include "rann_fingerprint.h"
 
 namespace LAMMPS_NS {
@@ -65,8 +59,4 @@ namespace LAMMPS_NS {
 
 }
 
-#endif
-
-
-
 #endif /* FINGERPRINT_RADIALSCREENED_H_ */
diff --git a/src/USER-RANN/rann_fingerprint_radialscreenedspin.h b/src/USER-RANN/rann_fingerprint_radialscreenedspin.h
index 3e58d3aef5..646a0b93f1 100644
--- a/src/USER-RANN/rann_fingerprint_radialscreenedspin.h
+++ b/src/USER-RANN/rann_fingerprint_radialscreenedspin.h
@@ -1,4 +1,3 @@
-
 /* -*- c++ -*- ----------------------------------------------------------
    LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
    https://www.lammps.org/ Sandia National Laboratories
@@ -28,15 +27,10 @@ do not necessarily reflect the views of the United States Army.​”
 
 DISTRIBUTION A. Approved for public release; distribution unlimited. OPSEC#4918
  */
-#ifdef FINGERPRINT_CLASS
 
-FingerprintStyle(radialscreenedspin,Fingerprint_radialscreenedspin)
-
-#else
 #ifndef LMP_RANN_FINGERPRINT_RADIALSCREENEDSPIN_H
 #define LMP_RANN_FINGERPRINT_RADIALSCREENEDSPIN_H
 
-
 #include "rann_fingerprint.h"
 
 namespace LAMMPS_NS {
@@ -65,8 +59,4 @@ namespace LAMMPS_NS {
 
 }
 
-#endif
-
-
-
 #endif /* FINGERPRINT_RADIALSCREENED_H_ */
diff --git a/src/USER-RANN/rann_fingerprint_radialspin.h b/src/USER-RANN/rann_fingerprint_radialspin.h
index 72c3b5b286..90c3ce1f22 100644
--- a/src/USER-RANN/rann_fingerprint_radialspin.h
+++ b/src/USER-RANN/rann_fingerprint_radialspin.h
@@ -28,12 +28,6 @@ do not necessarily reflect the views of the United States Army.​”
 DISTRIBUTION A. Approved for public release; distribution unlimited. OPSEC#4918
  */
 
-#ifdef FINGERPRINT_CLASS
-
-FingerprintStyle(radialspin,Fingerprint_radialspin)
-
-#else
-
 #ifndef LMP_RANN_FINGERPRINT_RADIALSPIN_H
 #define LMP_RANN_FINGERPRINT_RADIALSPIN_H
 
@@ -65,5 +59,4 @@ namespace LAMMPS_NS {
 
 }
 
-#endif
 #endif /* FINGERPRINT_RADIAL_H_ */