diff --git a/Source/SenseGlove/Private/SenseGlove/GameFramework/SGPawn.cpp b/Source/SenseGlove/Private/SenseGlove/GameFramework/SGPawn.cpp
index b6043ed9..04d0a872 100644
--- a/Source/SenseGlove/Private/SenseGlove/GameFramework/SGPawn.cpp
+++ b/Source/SenseGlove/Private/SenseGlove/GameFramework/SGPawn.cpp
@@ -72,11 +72,7 @@ struct ASGPawn::FImpl
 
 ASGPawn::ASGPawn(const FObjectInitializer& ObjectInitializer)
     : Super(ObjectInitializer),
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-      Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     PrimaryActorTick.bCanEverTick = true;
 
diff --git a/Source/SenseGlove/Private/SenseGlove/GameFramework/SGVirtualHand.cpp b/Source/SenseGlove/Private/SenseGlove/GameFramework/SGVirtualHand.cpp
index a5ad006f..c8bba5f6 100644
--- a/Source/SenseGlove/Private/SenseGlove/GameFramework/SGVirtualHand.cpp
+++ b/Source/SenseGlove/Private/SenseGlove/GameFramework/SGVirtualHand.cpp
@@ -163,11 +163,7 @@ const FName& ASGVirtualHand::GetRightHandFingerBoneName(const int32 Finger, cons
 
 ASGVirtualHand::ASGVirtualHand(const FObjectInitializer& ObjectInitializer)
     : Super(ObjectInitializer),
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
       Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-      Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
 {
     PrimaryActorTick.bCanEverTick = true;
 
diff --git a/Source/SenseGloveConnectImpl/SenseGloveConnectImpl.Build.cs b/Source/SenseGloveConnectImpl/SenseGloveConnectImpl.Build.cs
index e7889e42..d8be1d2c 100644
--- a/Source/SenseGloveConnectImpl/SenseGloveConnectImpl.Build.cs
+++ b/Source/SenseGloveConnectImpl/SenseGloveConnectImpl.Build.cs
@@ -88,7 +88,6 @@ public class SenseGloveConnectImpl : ModuleRules
             List<string> Architectures = ToolChain.GetAllArchitectures();
 
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "android"));
-
 #if UE_5_1_OR_LATER
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "r25b"));
 #elif UE_4_27_OR_LATER
@@ -142,18 +141,8 @@ public class SenseGloveConnectImpl : ModuleRules
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v20"));
 #elif UE_4_27_OR_LATER
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v19"));
-#elif UE_4_26_OR_LATER
-            LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v17"));
-#elif UE_4_25_OR_LATER
-            LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v16"));
-#elif UE_4_24_OR_LATER
-            LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v15"));
-#elif UE_4_23_OR_LATER
-            LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v15"));
-#elif UE_4_22_OR_LATER
-            LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v13"));
 #else
-            Debug.Assert(false, "Unsupported compiler!");
+            Debug.Assert(false, "Unsupported engine version or compiler!");
 #endif
         }
         else if (Target.Platform == UnrealTargetPlatform.Win64)
@@ -165,19 +154,17 @@ public class SenseGloveConnectImpl : ModuleRules
                 case WindowsCompiler.VisualStudio2022:
                     LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc143"));
                     break;
-#endif
-#if UE_4_22_OR_LATER
                 case WindowsCompiler.VisualStudio2019:
                     LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc142"));
                     break;
 #endif
-#if ! UE_5_0_OR_LATER && UE_4_17_OR_LATER
+#if ! UE_5_0_OR_LATER && UE_4_27_OR_LATER
                 case WindowsCompiler.VisualStudio2017:
                     LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc141"));
                     break;
 #endif
                 default:
-                    Debug.Assert(false, "Unsupported compiler!");
+                    Debug.Assert(false, "Unsupported engine version or compiler!");
                     break;
             }
 
@@ -220,7 +207,6 @@ public class SenseGloveConnectImpl : ModuleRules
             List<string> Architectures = ToolChain.GetAllArchitectures();
 
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "android"));
-
 #if UE_5_1_OR_LATER
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "r25b"));
 #elif UE_4_27_OR_LATER
@@ -274,18 +260,8 @@ public class SenseGloveConnectImpl : ModuleRules
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v20"));
 #elif UE_4_27_OR_LATER
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v19"));
-#elif UE_4_26_OR_LATER
-            LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v17"));
-#elif UE_4_25_OR_LATER
-            LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v16"));
-#elif UE_4_24_OR_LATER
-            LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v15"));
-#elif UE_4_23_OR_LATER
-            LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v15"));
-#elif UE_4_22_OR_LATER
-            LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v13"));
 #else
-            Debug.Assert(false, "Unsupported compiler!");
+            Debug.Assert(false, "Unsupported engine version or compiler!");
 #endif
         }
         else if (Target.Platform == UnrealTargetPlatform.Win64)
@@ -297,19 +273,17 @@ public class SenseGloveConnectImpl : ModuleRules
                 case WindowsCompiler.VisualStudio2022:
                     LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc143"));
                     break;
-#endif
-#if UE_4_22_OR_LATER
                 case WindowsCompiler.VisualStudio2019:
                     LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc142"));
                     break;
 #endif
-#if ! UE_5_0_OR_LATER && UE_4_17_OR_LATER
+#if ! UE_5_0_OR_LATER && UE_4_27_OR_LATER
                 case WindowsCompiler.VisualStudio2017:
                     LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc141"));
                     break;
 #endif
                 default:
-                    Debug.Assert(false, "Unsupported compiler!");
+                    Debug.Assert(false, "Unsupported engine version or compiler!");
                     break;
             }
 
diff --git a/Source/SenseGloveCore/Private/SGCore/SGBasicHandModel.cpp b/Source/SenseGloveCore/Private/SGCore/SGBasicHandModel.cpp
index 48bb078d..4de19643 100644
--- a/Source/SenseGloveCore/Private/SGCore/SGBasicHandModel.cpp
+++ b/Source/SenseGloveCore/Private/SGCore/SGBasicHandModel.cpp
@@ -226,12 +226,7 @@ TArray<FVector> USGBasicHandModel::GetBaseJointAngles()
 }
 
 USGBasicHandModel::USGBasicHandModel()
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGBasicHandModelImpl OutBasicHandModelImplContainer;
     SGCoreImpl_FSGBasicHandModelImpl_ctor(&OutBasicHandModelImplContainer);
@@ -241,12 +236,7 @@ USGBasicHandModel::USGBasicHandModel()
 
 USGBasicHandModel::USGBasicHandModel(const bool bRightHanded, const TArray<TArray<float>>& Lengths,
                                      const TArray<FVector>& StartPositions)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGBasicHandModelImpl OutBasicHandModelImplContainer;
     FSGIC_TArray_TArray_float LengthsContainer{Lengths};
@@ -259,12 +249,7 @@ USGBasicHandModel::USGBasicHandModel(const bool bRightHanded, const TArray<TArra
 
 USGBasicHandModel::USGBasicHandModel(bool bRightHanded, const TArray<FSGFloatArray>& Lengths,
                                      const TArray<FVector>& StartPositions)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGBasicHandModelImpl OutBasicHandModelImplContainer;
     FSGIC_TArray_TArray_float LengthsContainer{
@@ -279,12 +264,7 @@ USGBasicHandModel::USGBasicHandModel(bool bRightHanded, const TArray<FSGFloatArr
 
 USGBasicHandModel::USGBasicHandModel(const bool bRightHanded, const TArray<TArray<float>>& Lengths,
                                      const TArray<FVector>& StartPositions, const TArray<FQuat>& StartRotations)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGBasicHandModelImpl OutBasicHandModelImplContainer;
     FSGIC_TArray_TArray_float LengthsContainer{Lengths};
@@ -299,12 +279,7 @@ USGBasicHandModel::USGBasicHandModel(const bool bRightHanded, const TArray<TArra
 
 USGBasicHandModel::USGBasicHandModel(const bool bRightHanded, const TArray<TArray<float>>& Lengths,
                                      const TArray<FVector>& StartPositions, const TArray<FRotator>& StartRotations)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGBasicHandModelImpl OutBasicHandModelImplContainer;
     FSGIC_TArray_TArray_float LengthsContainer{Lengths};
@@ -319,12 +294,7 @@ USGBasicHandModel::USGBasicHandModel(const bool bRightHanded, const TArray<TArra
 
 USGBasicHandModel::USGBasicHandModel(const bool bRightHanded, const TArray<FSGFloatArray>& Lengths,
                                      const TArray<FVector>& StartPositions, const TArray<FQuat>& StartRotations)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGBasicHandModelImpl OutBasicHandModelImplContainer;
     FSGIC_TArray_TArray_float LengthsContainer{
@@ -341,12 +311,7 @@ USGBasicHandModel::USGBasicHandModel(const bool bRightHanded, const TArray<FSGFl
 
 USGBasicHandModel::USGBasicHandModel(const bool bRightHanded, const TArray<FSGFloatArray>& Lengths,
                                      const TArray<FVector>& StartPositions, const TArray<FRotator>& StartRotations)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGBasicHandModelImpl OutBasicHandModelImplContainer;
     FSGIC_TArray_TArray_float LengthsContainer{
@@ -362,12 +327,7 @@ USGBasicHandModel::USGBasicHandModel(const bool bRightHanded, const TArray<FSGFl
 }
 
 USGBasicHandModel::USGBasicHandModel(const FSGBasicHandModelImpl& BasicHandModelImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     SetBasicHandModelImpl(BasicHandModelImpl);
 }
diff --git a/Source/SenseGloveCore/Private/SGCore/SGCalibrationDataPoint.cpp b/Source/SenseGloveCore/Private/SGCore/SGCalibrationDataPoint.cpp
index 4bece09c..7bf9816b 100644
--- a/Source/SenseGloveCore/Private/SGCore/SGCalibrationDataPoint.cpp
+++ b/Source/SenseGloveCore/Private/SGCore/SGCalibrationDataPoint.cpp
@@ -99,12 +99,7 @@ USGCalibrationDataPoint* USGCalibrationDataPoint::NewCalibrationDataPoint(
 }
 
 USGCalibrationDataPoint::USGCalibrationDataPoint()
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGCalibrationDataPointImpl OutCalibrationDataPointImplContainer;
     SGCoreImpl_FSGCalibrationDataPointImpl_ctor(&OutCalibrationDataPointImplContainer);
@@ -113,12 +108,7 @@ USGCalibrationDataPoint::USGCalibrationDataPoint()
 }
 
 USGCalibrationDataPoint::USGCalibrationDataPoint(const int32 CurrentStage, const TArray<FVector>& CalibrationValues)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGCalibrationDataPointImpl OutCalibrationDataPointImplContainer;
     FSGIC_TArray_FVector CalibrationValuesContainer{CalibrationValues};
@@ -129,12 +119,7 @@ USGCalibrationDataPoint::USGCalibrationDataPoint(const int32 CurrentStage, const
 }
 
 USGCalibrationDataPoint::USGCalibrationDataPoint(const FSGCalibrationDataPointImpl& CalibrationDataPointImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     SetCalibrationDataPointImpl(CalibrationDataPointImpl);
 }
diff --git a/Source/SenseGloveCore/Private/SGCore/SGDevice.cpp b/Source/SenseGloveCore/Private/SGCore/SGDevice.cpp
index dc5b0824..fb45a28c 100644
--- a/Source/SenseGloveCore/Private/SGCore/SGDevice.cpp
+++ b/Source/SenseGloveCore/Private/SGCore/SGDevice.cpp
@@ -102,12 +102,7 @@ FString USGDevice::ToString(const ESGDeviceType DeviceType)
 }
 
 USGDevice::USGDevice()
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_TSharedPtr_FSGDeviceImpl OutSharedPtrContainer;
     SGCoreImpl_FSGDeviceImpl_ctor_MakeShared(&OutSharedPtrContainer);
@@ -116,12 +111,7 @@ USGDevice::USGDevice()
 }
 
 USGDevice::USGDevice(const FSGDeviceImpl& SGDeviceImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_TSharedPtr_FSGDeviceImpl OutSharedPtrContainer;
     FSGIC_FSGDeviceImpl RhsContainer{SGDeviceImpl};
@@ -131,12 +121,7 @@ USGDevice::USGDevice(const FSGDeviceImpl& SGDeviceImpl)
 }
 
 USGDevice::USGDevice(const FSGBetaDeviceImpl& BetaDeviceImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_TSharedPtr_FSGBetaDeviceImpl OutSharedPtrContainer;
     FSGIC_FSGBetaDeviceImpl RhsContainer{BetaDeviceImpl};
@@ -146,12 +131,7 @@ USGDevice::USGDevice(const FSGBetaDeviceImpl& BetaDeviceImpl)
 }
 
 USGDevice::USGDevice(const FSGHapticGloveImpl& HapticGloveImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_TSharedPtr_FSGHapticGloveImpl OutSharedPtrContainer;
     FSGIC_FSGHapticGloveImpl RhsContainer{HapticGloveImpl};
@@ -161,12 +141,7 @@ USGDevice::USGDevice(const FSGHapticGloveImpl& HapticGloveImpl)
 }
 
 USGDevice::USGDevice(const FSGNovaGloveImpl& NovaGloveImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_TSharedPtr_FSGNovaGloveImpl OutSharedPtrContainer;
     FSGIC_FSGNovaGloveImpl RhsContainer{NovaGloveImpl};
@@ -176,12 +151,7 @@ USGDevice::USGDevice(const FSGNovaGloveImpl& NovaGloveImpl)
 }
 
 USGDevice::USGDevice(const FSGSenseGloveImpl& SenseGloveImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_TSharedPtr_FSGSenseGloveImpl OutSharedPtrContainer;
     FSGIC_FSGSenseGloveImpl RhsContainer{SenseGloveImpl};
@@ -191,56 +161,31 @@ USGDevice::USGDevice(const FSGSenseGloveImpl& SenseGloveImpl)
 }
 
 USGDevice::USGDevice(TSharedRef<FSGDeviceImpl> SGDeviceImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     Pimpl->SGDeviceImpl = MoveTemp(SGDeviceImpl);
 }
 
 USGDevice::USGDevice(TSharedRef<FSGBetaDeviceImpl> BetaDeviceImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     Pimpl->SGDeviceImpl = MoveTemp(BetaDeviceImpl);
 }
 
 USGDevice::USGDevice(TSharedRef<FSGHapticGloveImpl> HapticGloveImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     Pimpl->SGDeviceImpl = MoveTemp(HapticGloveImpl);
 }
 
 USGDevice::USGDevice(TSharedRef<FSGNovaGloveImpl> NovaGloveImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     Pimpl->SGDeviceImpl = MoveTemp(NovaGloveImpl);
 }
 
 USGDevice::USGDevice(TSharedRef<FSGSenseGloveImpl> SenseGloveImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     Pimpl->SGDeviceImpl = MoveTemp(SenseGloveImpl);
 }
diff --git a/Source/SenseGloveCore/Private/SGCore/SGDeviceModel.cpp b/Source/SenseGloveCore/Private/SGCore/SGDeviceModel.cpp
index 82355e5b..139de83d 100644
--- a/Source/SenseGloveCore/Private/SGCore/SGDeviceModel.cpp
+++ b/Source/SenseGloveCore/Private/SGCore/SGDeviceModel.cpp
@@ -113,12 +113,7 @@ void USGDeviceModel::ParseFirmware(const FString& RawFirmware, int32& OutMainVer
 }
 
 USGDeviceModel::USGDeviceModel()
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGDeviceModelImpl OutDeviceModelImplContainer;
     SGCoreImpl_FSGDeviceModelImpl_ctor(&OutDeviceModelImplContainer);
@@ -128,12 +123,7 @@ USGDeviceModel::USGDeviceModel()
 
 USGDeviceModel::USGDeviceModel(const FString& Id, const FString& HardwareVersion,
                                const int32 FirmwareVersion, const int32 SubFirmwareVersion)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGDeviceModelImpl OutDeviceModelImplContainer;
     FSGIC_FString IdContainer{Id};
@@ -145,12 +135,7 @@ USGDeviceModel::USGDeviceModel(const FString& Id, const FString& HardwareVersion
 }
 
 USGDeviceModel::USGDeviceModel(const FSGDeviceModelImpl& DeviceModelImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     SetDeviceModelImpl(DeviceModelImpl);
 }
diff --git a/Source/SenseGloveCore/Private/SGCore/SGFingerCommand.cpp b/Source/SenseGloveCore/Private/SGCore/SGFingerCommand.cpp
index 16dbae50..61fea5c5 100644
--- a/Source/SenseGloveCore/Private/SGCore/SGFingerCommand.cpp
+++ b/Source/SenseGloveCore/Private/SGCore/SGFingerCommand.cpp
@@ -79,12 +79,7 @@ struct USGFingerCommand::FImpl
 };
 
 USGFingerCommand::USGFingerCommand()
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_TSharedPtr_FSGFingerCommandImpl OutSharedPtrContainer;
     SGCoreImpl_FSGFingerCommandImpl_ctor_MakeShared(&OutSharedPtrContainer);
@@ -93,12 +88,7 @@ USGFingerCommand::USGFingerCommand()
 }
 
 USGFingerCommand::USGFingerCommand(const TArray<int32>& InLevels)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_TSharedPtr_FSGFingerCommandImpl OutSharedPtrContainer;
     FSGIC_TArray_int32 LevelsContainer{InLevels};
@@ -108,12 +98,7 @@ USGFingerCommand::USGFingerCommand(const TArray<int32>& InLevels)
 }
 
 USGFingerCommand::USGFingerCommand(const FSGFingerCommandImpl& FingerCommandImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_TSharedPtr_FSGFingerCommandImpl OutSharedPtrContainer;
     FSGIC_FSGFingerCommandImpl RhsContainer{FingerCommandImpl};
@@ -124,12 +109,7 @@ USGFingerCommand::USGFingerCommand(const FSGFingerCommandImpl& FingerCommandImpl
 }
 
 USGFingerCommand::USGFingerCommand(const FSGBuzzCommandImpl& BuzzCommandImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_TSharedPtr_FSGBuzzCommandImpl OutSharedPtrContainer;
     FSGIC_FSGBuzzCommandImpl RhsContainer{BuzzCommandImpl};
@@ -140,12 +120,7 @@ USGFingerCommand::USGFingerCommand(const FSGBuzzCommandImpl& BuzzCommandImpl)
 }
 
 USGFingerCommand::USGFingerCommand(const FSGForceFeedbackCommandImpl& ForceFeedbackCommandImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_TSharedPtr_FSGForceFeedbackCommandImpl OutSharedPtrContainer;
     FSGIC_FSGForceFeedbackCommandImpl RhsContainer{ForceFeedbackCommandImpl};
@@ -156,12 +131,7 @@ USGFingerCommand::USGFingerCommand(const FSGForceFeedbackCommandImpl& ForceFeedb
 }
 
 USGFingerCommand::USGFingerCommand(const FSGTimedBuzzCommandImpl& TimedBuzzCommandImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_TSharedPtr_FSGTimedBuzzCommandImpl OutSharedPtrContainer;
     FSGIC_FSGTimedBuzzCommandImpl RhsContainer{TimedBuzzCommandImpl};
@@ -172,45 +142,25 @@ USGFingerCommand::USGFingerCommand(const FSGTimedBuzzCommandImpl& TimedBuzzComma
 }
 
 USGFingerCommand::USGFingerCommand(TSharedRef<FSGFingerCommandImpl> FingerCommandImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     Pimpl->FingerCommandImpl = MoveTemp(FingerCommandImpl);
 }
 
 USGFingerCommand::USGFingerCommand(TSharedRef<FSGBuzzCommandImpl> BuzzCommandImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     Pimpl->FingerCommandImpl = MoveTemp(BuzzCommandImpl);
 }
 
 USGFingerCommand::USGFingerCommand(TSharedRef<FSGForceFeedbackCommandImpl> ForceFeedbackCommandImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     Pimpl->FingerCommandImpl = MoveTemp(ForceFeedbackCommandImpl);
 }
 
 USGFingerCommand::USGFingerCommand(TSharedRef<FSGTimedBuzzCommandImpl> TimedBuzzCommandImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     Pimpl->FingerCommandImpl = MoveTemp(TimedBuzzCommandImpl);
 }
diff --git a/Source/SenseGloveCore/Private/SGCore/SGHandInterpolator.cpp b/Source/SenseGloveCore/Private/SGCore/SGHandInterpolator.cpp
index a63f95ff..0c217ddf 100644
--- a/Source/SenseGloveCore/Private/SGCore/SGHandInterpolator.cpp
+++ b/Source/SenseGloveCore/Private/SGCore/SGHandInterpolator.cpp
@@ -249,12 +249,7 @@ TArray<TArray<FVector>> USGHandInterpolator::InterpolateHandAngles(const USGHand
 }
 
 USGHandInterpolator::USGHandInterpolator()
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGHandInterpolatorImpl OutHandInterpolatorImplContainer;
     SGCoreImpl_FSGHandInterpolatorImpl_ctor(&OutHandInterpolatorImplContainer);
@@ -263,12 +258,7 @@ USGHandInterpolator::USGHandInterpolator()
 }
 
 USGHandInterpolator::USGHandInterpolator(const TArray<TArray<USGInterpolationSet*>>& JointInterpolations)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGHandInterpolatorImpl OutHandInterpolatorImplContainer;
     FSGIC_TArray_TArray_FSGInterpolationSetImpl JointInterpolationsContainer{
@@ -281,12 +271,7 @@ USGHandInterpolator::USGHandInterpolator(const TArray<TArray<USGInterpolationSet
 }
 
 USGHandInterpolator::USGHandInterpolator(const TArray<FSGInterpolationSetArray>& JointInterpolations)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGHandInterpolatorImpl OutHandInterpolatorImplContainer;
     FSGIC_TArray_TArray_FSGInterpolationSetImpl JointInterpolationsContainer{
@@ -303,12 +288,7 @@ USGHandInterpolator::USGHandInterpolator(const TArray<FSGInterpolationSetArray>&
 
 USGHandInterpolator::USGHandInterpolator(const TArray<TArray<USGInterpolationSet*>>& JointInterpolations,
                                          const FQuat& CmcStartRotation)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGHandInterpolatorImpl OutHandInterpolatorImplContainer;
     FSGIC_TArray_TArray_FSGInterpolationSetImpl JointInterpolationsContainer{
@@ -323,12 +303,7 @@ USGHandInterpolator::USGHandInterpolator(const TArray<TArray<USGInterpolationSet
 
 USGHandInterpolator::USGHandInterpolator(const TArray<TArray<USGInterpolationSet*>>& JointInterpolations,
                                          const FRotator& CmcStartRotation)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGHandInterpolatorImpl OutHandInterpolatorImplContainer;
     FSGIC_TArray_TArray_FSGInterpolationSetImpl JointInterpolationsContainer{
@@ -343,12 +318,7 @@ USGHandInterpolator::USGHandInterpolator(const TArray<TArray<USGInterpolationSet
 
 USGHandInterpolator::USGHandInterpolator(const TArray<FSGInterpolationSetArray>& JointInterpolations,
                                          const FQuat& CmcStartRotation)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGHandInterpolatorImpl OutHandInterpolatorImplContainer;
     FSGIC_TArray_TArray_FSGInterpolationSetImpl JointInterpolationsContainer{
@@ -366,12 +336,7 @@ USGHandInterpolator::USGHandInterpolator(const TArray<FSGInterpolationSetArray>&
 
 USGHandInterpolator::USGHandInterpolator(const TArray<FSGInterpolationSetArray>& JointInterpolations,
                                          const FRotator& CmcStartRotation)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGHandInterpolatorImpl OutHandInterpolatorImplContainer;
     FSGIC_TArray_TArray_FSGInterpolationSetImpl JointInterpolationsContainer{
@@ -388,12 +353,7 @@ USGHandInterpolator::USGHandInterpolator(const TArray<FSGInterpolationSetArray>&
 }
 
 USGHandInterpolator::USGHandInterpolator(const FSGHandInterpolatorImpl& HandInterpolatorImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     SetHandInterpolatorImpl(HandInterpolatorImpl);
 }
diff --git a/Source/SenseGloveCore/Private/SGCore/SGHandPose.cpp b/Source/SenseGloveCore/Private/SGCore/SGHandPose.cpp
index c692ae3b..e63ac462 100644
--- a/Source/SenseGloveCore/Private/SGCore/SGHandPose.cpp
+++ b/Source/SenseGloveCore/Private/SGCore/SGHandPose.cpp
@@ -278,12 +278,7 @@ USGHandPose* USGHandPose::Fist(UObject* Outer, const bool bRightHanded)
 }
 
 USGHandPose::USGHandPose()
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGHandPoseImpl OutHandPoseImplContainer;
     SGCoreImpl_FSGHandPoseImpl_ctor(&OutHandPoseImplContainer);
@@ -294,12 +289,7 @@ USGHandPose::USGHandPose()
 USGHandPose::USGHandPose(const bool bRightHanded,
                          const TArray<TArray<FVector>>& JointPositions, const TArray<TArray<FQuat>>& JointRotations,
                          const TArray<TArray<FVector>>& HandAngles)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGHandPoseImpl OutHandPoseImplContainer;
     FSGIC_TArray_TArray_FVector JointPositionsContainer{JointPositions};
@@ -315,12 +305,7 @@ USGHandPose::USGHandPose(const bool bRightHanded,
 USGHandPose::USGHandPose(const bool bRightHanded,
                          const TArray<TArray<FVector>>& JointPositions, const TArray<TArray<FRotator>>& JointRotations,
                          const TArray<TArray<FVector>>& HandAngles)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGHandPoseImpl OutHandPoseImplContainer;
     FSGIC_TArray_TArray_FVector JointPositionsContainer{JointPositions};
@@ -336,12 +321,7 @@ USGHandPose::USGHandPose(const bool bRightHanded,
 USGHandPose::USGHandPose(const bool bRightHanded, const
                          TArray<FSGVectorArray>& JointPositions, const TArray<FSGQuatArray>& JointRotations,
                          const TArray<FSGVectorArray>& HandAngles)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGHandPoseImpl OutHandPoseImplContainer;
     FSGIC_TArray_TArray_FVector JointPositionsContainer{
@@ -363,12 +343,7 @@ USGHandPose::USGHandPose(const bool bRightHanded, const
 USGHandPose::USGHandPose(const bool bRightHanded,
                          const TArray<FSGVectorArray>& JointPositions, const TArray<FSGRotatorArray>& JointRotations,
                          const TArray<FSGVectorArray>& HandAngles)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGHandPoseImpl OutHandPoseImplContainer;
     FSGIC_TArray_TArray_FVector JointPositionsContainer{
@@ -388,12 +363,7 @@ USGHandPose::USGHandPose(const bool bRightHanded,
 }
 
 USGHandPose::USGHandPose(const FSGHandPoseImpl& HandPoseImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     SetHandPoseImpl(HandPoseImpl);
 }
diff --git a/Source/SenseGloveCore/Private/SGCore/SGHandProfile.cpp b/Source/SenseGloveCore/Private/SGCore/SGHandProfile.cpp
index 7e1669d0..b3f8f202 100644
--- a/Source/SenseGloveCore/Private/SGCore/SGHandProfile.cpp
+++ b/Source/SenseGloveCore/Private/SGCore/SGHandProfile.cpp
@@ -179,12 +179,7 @@ void USGHandProfile::ResetCalibration(const bool bOnDisk)
 }
 
 USGHandProfile::USGHandProfile()
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGHandProfileImpl OutHandProfileImplContainer;
     SGCoreImpl_FSGHandProfileImpl_ctor(&OutHandProfileImplContainer);
@@ -195,12 +190,7 @@ USGHandProfile::USGHandProfile()
 USGHandProfile::USGHandProfile(const bool bRightHanded,
                                const USGSenseGloveHandProfile* SenseGloveHandProfile,
                                const USGNovaGloveHandProfile* NovaGloveHandProfile)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGHandProfileImpl OutHandProfileImplContainer;
     FSGIC_FSGSenseGloveHandProfileImpl SenseGloveHandProfileContainer
@@ -214,12 +204,7 @@ USGHandProfile::USGHandProfile(const bool bRightHanded,
 }
 
 USGHandProfile::USGHandProfile(const FSGHandProfileImpl& HandProfileImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     SetHandProfileImpl(HandProfileImpl);
 }
diff --git a/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCalibrationCheck.cpp b/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCalibrationCheck.cpp
index f5001120..bc82d3d9 100644
--- a/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCalibrationCheck.cpp
+++ b/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCalibrationCheck.cpp
@@ -169,12 +169,7 @@ bool USGHapticGloveCalibrationCheck::MatchesLast(const TArray<FVector>& CurrentR
 }
 
 USGHapticGloveCalibrationCheck::USGHapticGloveCalibrationCheck()
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGHapticGloveCalibrationCheckImpl OutHapticGloveCalibrationCheckImplContainer;
     SGCoreImpl_FSGHapticGloveCalibrationCheckImpl_ctor(&OutHapticGloveCalibrationCheckImplContainer);
@@ -184,12 +179,7 @@ USGHapticGloveCalibrationCheck::USGHapticGloveCalibrationCheck()
 }
 
 USGHapticGloveCalibrationCheck::USGHapticGloveCalibrationCheck(const USGSensorRange* LastCalibrationRange)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGHapticGloveCalibrationCheckImpl OutHapticGloveCalibrationCheckImplContainer;
     FSGIC_FSGSensorRangeImpl LastCalibrationRangeContainer{LastCalibrationRange->ToSensorRangeImpl()};
@@ -202,12 +192,7 @@ USGHapticGloveCalibrationCheck::USGHapticGloveCalibrationCheck(const USGSensorRa
 
 USGHapticGloveCalibrationCheck::USGHapticGloveCalibrationCheck(
     const FSGHapticGloveCalibrationCheckImpl& HapticGloveCalibrationCheckImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     SetHapticGloveCalibrationCheckImpl(HapticGloveCalibrationCheckImpl);
 }
diff --git a/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCalibrationSequence.cpp b/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCalibrationSequence.cpp
index 400fbf1d..4ee06a7f 100644
--- a/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCalibrationSequence.cpp
+++ b/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCalibrationSequence.cpp
@@ -146,12 +146,7 @@ bool USGHapticGloveCalibrationSequence::CompileProfile(UObject* Outer,
 }
 
 USGHapticGloveCalibrationSequence::USGHapticGloveCalibrationSequence()
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_TSharedPtr_FSGHapticGloveCalibrationSequenceImpl OutSharedPtrContainer;
     SGCoreImpl_FSGHapticGloveCalibrationSequenceImpl_ctor_MakeShared(&OutSharedPtrContainer);
@@ -160,12 +155,7 @@ USGHapticGloveCalibrationSequence::USGHapticGloveCalibrationSequence()
 }
 
 USGHapticGloveCalibrationSequence::USGHapticGloveCalibrationSequence(const USGHapticGlove* LinkedGlove)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_TSharedPtr_FSGHapticGloveCalibrationSequenceImpl OutSharedPtrContainer;
     FSGIC_TSharedPtr_FSGHapticGloveImpl LinkedGloveContainer{LinkedGlove->ToHapticGloveImpl()};
@@ -177,12 +167,7 @@ USGHapticGloveCalibrationSequence::USGHapticGloveCalibrationSequence(const USGHa
 
 USGHapticGloveCalibrationSequence::USGHapticGloveCalibrationSequence(
     const FSGHapticGloveCalibrationSequenceImpl& HapticGloveCalibrationSequenceImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_TSharedPtr_FSGHapticGloveCalibrationSequenceImpl OutSharedPtrContainer;
     FSGIC_FSGHapticGloveCalibrationSequenceImpl RhsContainer{HapticGloveCalibrationSequenceImpl};
@@ -194,12 +179,7 @@ USGHapticGloveCalibrationSequence::USGHapticGloveCalibrationSequence(
 
 USGHapticGloveCalibrationSequence::USGHapticGloveCalibrationSequence(
     const FSGHapticGloveQuickCalibrationImpl& HapticGloveQuickCalibrationImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_TSharedPtr_FSGHapticGloveQuickCalibrationImpl OutSharedPtrContainer;
     FSGIC_FSGHapticGloveQuickCalibrationImpl RhsContainer{HapticGloveQuickCalibrationImpl};
@@ -211,24 +191,14 @@ USGHapticGloveCalibrationSequence::USGHapticGloveCalibrationSequence(
 
 USGHapticGloveCalibrationSequence::USGHapticGloveCalibrationSequence(
     TSharedRef<FSGHapticGloveCalibrationSequenceImpl> HapticGloveCalibrationSequenceImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     Pimpl->HapticGloveCalibrationSequenceImpl = MoveTemp(HapticGloveCalibrationSequenceImpl);
 }
 
 USGHapticGloveCalibrationSequence::USGHapticGloveCalibrationSequence(
     TSharedRef<FSGHapticGloveQuickCalibrationImpl> HapticGloveQuickCalibrationImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     Pimpl->HapticGloveCalibrationSequenceImpl = MoveTemp(HapticGloveQuickCalibrationImpl);
 }
diff --git a/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCommandBuffer.cpp b/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCommandBuffer.cpp
index 96a9f772..191e5753 100644
--- a/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCommandBuffer.cpp
+++ b/Source/SenseGloveCore/Private/SGCore/SGHapticGloveCommandBuffer.cpp
@@ -115,12 +115,7 @@ int32 USGHapticGloveCommandBuffer::GetMaxThumpCommands()
 }
 
 USGHapticGloveCommandBuffer::USGHapticGloveCommandBuffer()
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGHapticGloveCommandBufferImpl OutHapticGloveCommandBufferImplContainer;
     SGCoreImpl_FSGHapticGloveCommandBufferImpl_ctor(&OutHapticGloveCommandBufferImplContainer);
@@ -131,12 +126,7 @@ USGHapticGloveCommandBuffer::USGHapticGloveCommandBuffer()
 
 USGHapticGloveCommandBuffer::USGHapticGloveCommandBuffer(
     const FSGHapticGloveCommandBufferImpl& HapticGloveCommandBufferImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     SetHapticGloveCommandBufferImpl(HapticGloveCommandBufferImpl);
 }
diff --git a/Source/SenseGloveCore/Private/SGCore/SGInterpolationSet.cpp b/Source/SenseGloveCore/Private/SGCore/SGInterpolationSet.cpp
index 86207630..925c2cd9 100644
--- a/Source/SenseGloveCore/Private/SGCore/SGInterpolationSet.cpp
+++ b/Source/SenseGloveCore/Private/SGCore/SGInterpolationSet.cpp
@@ -118,12 +118,7 @@ USGInterpolationSet* USGInterpolationSet::Deserialize(UObject* Outer, const FStr
 }
 
 USGInterpolationSet::USGInterpolationSet()
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGInterpolationSetImpl OutInterpolationSetImplContainer;
     SGCoreImpl_FSGInterpolationSetImpl_ctor(&OutInterpolationSetImplContainer);
@@ -132,12 +127,7 @@ USGInterpolationSet::USGInterpolationSet()
 }
 
 USGInterpolationSet::USGInterpolationSet(const float From1, const float From2, const float To1, const float To2)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGInterpolationSetImpl OutInterpolationSetImplContainer;
     SGCoreImpl_FSGInterpolationSetImpl_ctor_From1_From2_To1_To2(&OutInterpolationSetImplContainer,
@@ -148,12 +138,7 @@ USGInterpolationSet::USGInterpolationSet(const float From1, const float From2, c
 
 USGInterpolationSet::USGInterpolationSet(const float From1, const float From2, const float To1, const float To2,
                                          const float Min, const float Max)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGInterpolationSetImpl OutInterpolationSetImplContainer;
     SGCoreImpl_FSGInterpolationSetImpl_ctor_From1_From2_To1_To2_Min_Max(&OutInterpolationSetImplContainer,
@@ -163,12 +148,7 @@ USGInterpolationSet::USGInterpolationSet(const float From1, const float From2, c
 }
 
 USGInterpolationSet::USGInterpolationSet(const FSGInterpolationSetImpl& InterpolationSetImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     SetInterpolationSetImpl(InterpolationSetImpl);
 }
diff --git a/Source/SenseGloveCore/Private/SGCore/SGNovaGloveHandProfile.cpp b/Source/SenseGloveCore/Private/SGCore/SGNovaGloveHandProfile.cpp
index c27d2cab..5fc5d720 100644
--- a/Source/SenseGloveCore/Private/SGCore/SGNovaGloveHandProfile.cpp
+++ b/Source/SenseGloveCore/Private/SGCore/SGNovaGloveHandProfile.cpp
@@ -113,18 +113,13 @@ USGNovaGloveHandProfile* USGNovaGloveHandProfile::Deserialize(UObject* Outer, co
     FSGIC_FSGNovaGloveHandProfileImpl OutNovaGloveHandProfileImplContainer;
     FSGIC_FString SerializedStringContainer{SerializedString};
     SGCoreImpl_FSGNovaGloveHandProfileImpl_Deserialize(&OutNovaGloveHandProfileImplContainer,
-                                                        &SerializedStringContainer);
+                                                       &SerializedStringContainer);
 
     return NewNovaGloveHandProfile(Outer, MoveTemp(OutNovaGloveHandProfileImplContainer.NovaGloveHandProfileImpl));
 }
 
 USGNovaGloveHandProfile::USGNovaGloveHandProfile()
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGNovaGloveHandProfileImpl OutNovaGloveHandProfileImplContainer;
     SGCoreImpl_FSGNovaGloveHandProfileImpl_ctor(&OutNovaGloveHandProfileImplContainer);
@@ -133,12 +128,7 @@ USGNovaGloveHandProfile::USGNovaGloveHandProfile()
 }
 
 USGNovaGloveHandProfile::USGNovaGloveHandProfile(const bool bRightHanded, const USGHandInterpolator* Interpolator)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGNovaGloveHandProfileImpl OutNovaGloveHandProfileImplContainer;
     FSGIC_FSGHandInterpolatorImpl InterpolatorContainer{Interpolator->ToHandInterpolatorImpl()};
@@ -149,12 +139,7 @@ USGNovaGloveHandProfile::USGNovaGloveHandProfile(const bool bRightHanded, const
 }
 
 USGNovaGloveHandProfile::USGNovaGloveHandProfile(const FSGNovaGloveHandProfileImpl& NovaGloveHandProfileImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     SetNovaGloveHandProfileImpl(NovaGloveHandProfileImpl);
 }
diff --git a/Source/SenseGloveCore/Private/SGCore/SGNovaGloveInfo.cpp b/Source/SenseGloveCore/Private/SGCore/SGNovaGloveInfo.cpp
index bb94e456..006d9e3c 100644
--- a/Source/SenseGloveCore/Private/SGCore/SGNovaGloveInfo.cpp
+++ b/Source/SenseGloveCore/Private/SGCore/SGNovaGloveInfo.cpp
@@ -127,12 +127,7 @@ USGNovaGloveInfo* USGNovaGloveInfo::Deserialize(UObject* Outer, const FString& S
 }
 
 USGNovaGloveInfo::USGNovaGloveInfo()
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGNovaGloveInfoImpl OutNovaGloveInfoImplContainer;
     SGCoreImpl_FSGNovaGloveInfoImpl_ctor(&OutNovaGloveInfoImplContainer);
@@ -144,12 +139,7 @@ USGNovaGloveInfo::USGNovaGloveInfo(
     const FString& DeviceId,
     const FString& HardwareVersion, const int32 FirmwareVersion, const int32 SubFirmwareVersion,
     const bool bRightHanded, const FQuat& ImuCorrection, const int32 NumberOfSensors)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGNovaGloveInfoImpl OutNovaGloveInfoImplContainer;
     FSGIC_FString DeviceIdContainer{DeviceId};
@@ -164,12 +154,7 @@ USGNovaGloveInfo::USGNovaGloveInfo(
 }
 
 USGNovaGloveInfo::USGNovaGloveInfo(const FSGNovaGloveInfoImpl& NovaGloveInfoImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     SetNovaGloveInfoImpl(NovaGloveInfoImpl);
 }
diff --git a/Source/SenseGloveCore/Private/SGCore/SGNovaGloveSensorData.cpp b/Source/SenseGloveCore/Private/SGCore/SGNovaGloveSensorData.cpp
index 160446d9..5741837d 100644
--- a/Source/SenseGloveCore/Private/SGCore/SGNovaGloveSensorData.cpp
+++ b/Source/SenseGloveCore/Private/SGCore/SGNovaGloveSensorData.cpp
@@ -149,12 +149,7 @@ USGNovaGloveSensorData* USGNovaGloveSensorData::Deserialize(UObject* Outer, cons
 }
 
 USGNovaGloveSensorData::USGNovaGloveSensorData()
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGNovaGloveSensorDataImpl OutNovaGloveSensorDataImplContainer;
     SGCoreImpl_FSGNovaGloveSensorDataImpl_ctor(&OutNovaGloveSensorDataImplContainer);
@@ -165,12 +160,7 @@ USGNovaGloveSensorData::USGNovaGloveSensorData()
 USGNovaGloveSensorData::USGNovaGloveSensorData(const TArray<FVector>& Values, const int32 ParsedValues,
                                                const FQuat& ImuRotation, const bool bImuParsed,
                                                const float BatteryLevel, const bool bCharging)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGNovaGloveSensorDataImpl OutNovaGloveSensorDataImplContainer;
     FSGIC_TArray_FVector ValuesContainer{Values};
@@ -185,12 +175,7 @@ USGNovaGloveSensorData::USGNovaGloveSensorData(const TArray<FVector>& Values, co
 USGNovaGloveSensorData::USGNovaGloveSensorData(const TArray<FVector>& Values, const int32 ParsedValues,
                                                const FRotator& ImuRotation, const bool bImuParsed,
                                                const float BatteryLevel, const bool bCharging)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGNovaGloveSensorDataImpl OutNovaGloveSensorDataImplContainer;
     FSGIC_TArray_FVector ValuesContainer{Values};
@@ -203,12 +188,7 @@ USGNovaGloveSensorData::USGNovaGloveSensorData(const TArray<FVector>& Values, co
 }
 
 USGNovaGloveSensorData::USGNovaGloveSensorData(const FSGNovaGloveSensorDataImpl& NovaGloveSensorDataImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     SetNovaGloveSensorDataImpl(NovaGloveSensorDataImpl);
 }
diff --git a/Source/SenseGloveCore/Private/SGCore/SGSenseGloveHandProfile.cpp b/Source/SenseGloveCore/Private/SGCore/SGSenseGloveHandProfile.cpp
index 8c0eec74..e4c90d3a 100644
--- a/Source/SenseGloveCore/Private/SGCore/SGSenseGloveHandProfile.cpp
+++ b/Source/SenseGloveCore/Private/SGCore/SGSenseGloveHandProfile.cpp
@@ -135,12 +135,7 @@ FVector USGSenseGloveHandProfile::GetDefaultThimbleOffset()
 }
 
 USGSenseGloveHandProfile::USGSenseGloveHandProfile()
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGSenseGloveHandProfileImpl OutSenseGloveHandProfileImplContainer;
     SGCoreImpl_FSGSenseGloveHandProfileImpl_ctor(&OutSenseGloveHandProfileImplContainer);
@@ -151,12 +146,7 @@ USGSenseGloveHandProfile::USGSenseGloveHandProfile()
 USGSenseGloveHandProfile::USGSenseGloveHandProfile(const bool bRightHanded, const USGHandInterpolator* Interpolator,
                                                    const ESGThumbSolver ThumbSolver, const ESGFingerSolver FingerSolver,
                                                    const TArray<FVector>& FingerThimbleOffset)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGSenseGloveHandProfileImpl OutSenseGloveHandProfileImplContainer;
     FSGIC_FSGHandInterpolatorImpl InterpolatorContainer{Interpolator->ToHandInterpolatorImpl()};
@@ -171,12 +161,7 @@ USGSenseGloveHandProfile::USGSenseGloveHandProfile(const bool bRightHanded, cons
 }
 
 USGSenseGloveHandProfile::USGSenseGloveHandProfile(const FSGSenseGloveHandProfileImpl& SenseGloveHandProfileImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     SetSenseGloveHandProfileImpl(SenseGloveHandProfileImpl);
 }
diff --git a/Source/SenseGloveCore/Private/SGCore/SGSenseGloveInfo.cpp b/Source/SenseGloveCore/Private/SGCore/SGSenseGloveInfo.cpp
index 1607bbca..cad41f59 100644
--- a/Source/SenseGloveCore/Private/SGCore/SGSenseGloveInfo.cpp
+++ b/Source/SenseGloveCore/Private/SGCore/SGSenseGloveInfo.cpp
@@ -232,12 +232,7 @@ USGSenseGloveInfo* USGSenseGloveInfo::Deserialize(UObject* Outer, const FString&
 }
 
 USGSenseGloveInfo::USGSenseGloveInfo()
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGSenseGloveInfoImpl OutSenseGloveInfoImplContainer;
     SGCoreImpl_FSGSenseGloveInfoImpl_ctor(&OutSenseGloveInfoImplContainer);
@@ -251,12 +246,7 @@ USGSenseGloveInfo::USGSenseGloveInfo(
     const bool bRightHanded, const int32 NumberOfSensors, const FQuat& ImuCorrection,
     const TArray<FVector>& StartPositions, const TArray<FQuat>& StartRotations,
     const TArray<TArray<FVector>>& GloveLengths, const TArray<bool>& Functions)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGSenseGloveInfoImpl OutSenseGloveInfoImplContainer;
     FSGIC_FString DeviceIdContainer{DeviceId};
@@ -282,12 +272,7 @@ USGSenseGloveInfo::USGSenseGloveInfo(
     const bool bRightHanded, const int32 NumberOfSensors, const FRotator& ImuCorrection,
     const TArray<FVector>& StartPositions, const TArray<FRotator>& StartRotations,
     const TArray<TArray<FVector>>& GloveLengths, const TArray<bool>& Functions)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGSenseGloveInfoImpl OutSenseGloveInfoImplContainer;
     FSGIC_FString DeviceIdContainer{DeviceId};
@@ -362,12 +347,7 @@ USGSenseGloveInfo::USGSenseGloveInfo(
 }
 
 USGSenseGloveInfo::USGSenseGloveInfo(const FSGSenseGloveInfoImpl& SenseGloveInfoImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     SetSenseGloveInfoImpl(SenseGloveInfoImpl);
 }
diff --git a/Source/SenseGloveCore/Private/SGCore/SGSenseGlovePose.cpp b/Source/SenseGloveCore/Private/SGCore/SGSenseGlovePose.cpp
index ffe9a56a..d9cf1b55 100644
--- a/Source/SenseGloveCore/Private/SGCore/SGSenseGlovePose.cpp
+++ b/Source/SenseGloveCore/Private/SGCore/SGSenseGlovePose.cpp
@@ -190,12 +190,7 @@ USGSenseGlovePose* USGSenseGlovePose::Deserialize(UObject* Outer, const FString&
 }
 
 USGSenseGlovePose::USGSenseGlovePose()
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGSenseGlovePoseImpl OutSenseGlovePoseImplContainer;
     SGCoreImpl_FSGSenseGlovePoseImpl_ctor(&OutSenseGlovePoseImplContainer);
@@ -207,12 +202,7 @@ USGSenseGlovePose::USGSenseGlovePose(const bool bRightHanded,
                                      const TArray<TArray<FVector>>& JointPositions,
                                      const TArray<TArray<FQuat>>& JointRotations,
                                      const TArray<TArray<FVector>>& GloveAngles)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGSenseGlovePoseImpl OutSenseGlovePoseImplContainer;
     FSGIC_TArray_TArray_FVector JointPositionsContainer{JointPositions};
@@ -229,12 +219,7 @@ USGSenseGlovePose::USGSenseGlovePose(const bool bRightHanded,
                                      const TArray<TArray<FVector>>& JointPositions,
                                      const TArray<TArray<FRotator>>& JointRotations,
                                      const TArray<TArray<FVector>>& GloveAngles)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGSenseGlovePoseImpl OutSenseGlovePoseImplContainer;
     FSGIC_TArray_TArray_FVector JointPositionsContainer{JointPositions};
@@ -292,12 +277,7 @@ USGSenseGlovePose::USGSenseGlovePose(const bool bRightHanded,
 }
 
 USGSenseGlovePose::USGSenseGlovePose(const FSGSenseGlovePoseImpl& SenseGlovePoseImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     SetSenseGlovePoseImpl(SenseGlovePoseImpl);
 }
diff --git a/Source/SenseGloveCore/Private/SGCore/SGSenseGloveSensorData.cpp b/Source/SenseGloveCore/Private/SGCore/SGSenseGloveSensorData.cpp
index 9e09c16b..02623f6b 100644
--- a/Source/SenseGloveCore/Private/SGCore/SGSenseGloveSensorData.cpp
+++ b/Source/SenseGloveCore/Private/SGCore/SGSenseGloveSensorData.cpp
@@ -180,12 +180,7 @@ USGSenseGloveSensorData* USGSenseGloveSensorData::Deserialize(UObject* Outer, co
 }
 
 USGSenseGloveSensorData::USGSenseGloveSensorData()
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGSenseGloveSensorDataImpl OutSenseGloveSensorDataImplContainer;
     SGCoreImpl_FSGSenseGloveSensorDataImpl_ctor(&OutSenseGloveSensorDataImplContainer);
@@ -195,12 +190,7 @@ USGSenseGloveSensorData::USGSenseGloveSensorData()
 
 USGSenseGloveSensorData::USGSenseGloveSensorData(const TArray<TArray<float>>& SensorAngles, const FQuat& ImuRotation,
                                                  const int32 ParsedValues, const bool bImuParsed)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGSenseGloveSensorDataImpl OutSenseGloveSensorDataImplContainer;
     FSGIC_TArray_TArray_float SensorAnglesContainer{SensorAngles};
@@ -213,12 +203,7 @@ USGSenseGloveSensorData::USGSenseGloveSensorData(const TArray<TArray<float>>& Se
 
 USGSenseGloveSensorData::USGSenseGloveSensorData(const TArray<TArray<float>>& SensorAngles, const FRotator& ImuRotation,
                                                  const int32 ParsedValues, const bool bImuParsed)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGSenseGloveSensorDataImpl OutSenseGloveSensorDataImplContainer;
     FSGIC_TArray_TArray_float SensorAnglesContainer{SensorAngles};
@@ -258,12 +243,7 @@ USGSenseGloveSensorData::USGSenseGloveSensorData(const TArray<FSGFloatArray>& Se
 }
 
 USGSenseGloveSensorData::USGSenseGloveSensorData(const FSGSenseGloveSensorDataImpl& SenseGloveSensorDataImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     SetSenseGloveSensorDataImpl(SenseGloveSensorDataImpl);
 }
diff --git a/Source/SenseGloveCore/Private/SGCore/SGSensorRange.cpp b/Source/SenseGloveCore/Private/SGCore/SGSensorRange.cpp
index 5817cf14..afc8f20e 100644
--- a/Source/SenseGloveCore/Private/SGCore/SGSensorRange.cpp
+++ b/Source/SenseGloveCore/Private/SGCore/SGSensorRange.cpp
@@ -133,12 +133,7 @@ void USGSensorRange::CheckMin(const FVector& CurrentValues, FVector& OutMinValue
 }
 
 USGSensorRange::USGSensorRange()
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGSensorRangeImpl OutSensorRangeImplContainer;
     SGCoreImpl_FSGSensorRangeImpl_ctor(&OutSensorRangeImplContainer);
@@ -147,12 +142,7 @@ USGSensorRange::USGSensorRange()
 }
 
 USGSensorRange::USGSensorRange(const TArray<FVector>& MinValues, const TArray<FVector>& MaxValues)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGSensorRangeImpl OutSensorRangeImplContainer;
     FSGIC_TArray_FVector MinValuesContainer{MinValues};
@@ -164,12 +154,7 @@ USGSensorRange::USGSensorRange(const TArray<FVector>& MinValues, const TArray<FV
 }
 
 USGSensorRange::USGSensorRange(const FSGSensorRangeImpl& SensorRangeImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     SetSensorRangeImpl(SensorRangeImpl);
 }
diff --git a/Source/SenseGloveCore/Private/SGCore/SGThumperCommand.cpp b/Source/SenseGloveCore/Private/SGCore/SGThumperCommand.cpp
index 224ddfc7..e6b75d87 100644
--- a/Source/SenseGloveCore/Private/SGCore/SGThumperCommand.cpp
+++ b/Source/SenseGloveCore/Private/SGCore/SGThumperCommand.cpp
@@ -99,12 +99,7 @@ USGThumperCommand* USGThumperCommand::Off(UObject* Outer)
 }
 
 USGThumperCommand::USGThumperCommand()
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGThumperCommandImpl OutThumperCommandImplContainer;
     SGCoreImpl_FSGThumperCommandImpl_ctor(&OutThumperCommandImplContainer);
@@ -113,12 +108,7 @@ USGThumperCommand::USGThumperCommand()
 }
 
 USGThumperCommand::USGThumperCommand(const int32 Magnitude)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGThumperCommandImpl OutThumperCommandImplContainer;
     SGCoreImpl_FSGThumperCommandImpl_ctor_Magnitude(&OutThumperCommandImplContainer, Magnitude);
@@ -127,12 +117,7 @@ USGThumperCommand::USGThumperCommand(const int32 Magnitude)
 }
 
 USGThumperCommand::USGThumperCommand(const FSGThumperCommandImpl& ThumperCommandImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     SetThumperCommandImpl(ThumperCommandImpl);
 }
diff --git a/Source/SenseGloveCore/Private/SGCore/SGTimedThumpCommand.cpp b/Source/SenseGloveCore/Private/SGCore/SGTimedThumpCommand.cpp
index e04bfcc8..2f242ea3 100644
--- a/Source/SenseGloveCore/Private/SGCore/SGTimedThumpCommand.cpp
+++ b/Source/SenseGloveCore/Private/SGCore/SGTimedThumpCommand.cpp
@@ -110,12 +110,7 @@ USGTimedThumpCommand* USGTimedThumpCommand::NewTimedThumpCommand(
 }
 
 USGTimedThumpCommand::USGTimedThumpCommand()
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGTimedThumpCommandImpl OutTimedThumpCommandImplContainer;
     SGCoreImpl_FSGTimedThumpCommandImpl_ctor(&OutTimedThumpCommandImplContainer);
@@ -125,12 +120,7 @@ USGTimedThumpCommand::USGTimedThumpCommand()
 
 USGTimedThumpCommand::USGTimedThumpCommand(const int32 Magnitude,
                                            const float DurationSeconds, const float StartTimeSeconds)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGTimedThumpCommandImpl OutTimedThumpCommandImplContainer;
     SGCoreImpl_FSGTimedThumpCommandImpl_ctor_Magnitude_DurationSeconds_StartTimeSeconds(
@@ -141,12 +131,7 @@ USGTimedThumpCommand::USGTimedThumpCommand(const int32 Magnitude,
 
 USGTimedThumpCommand::USGTimedThumpCommand(const USGThumperCommand* BaseCommand,
                                            const float DurationSeconds, const float StartTimeSeconds)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     FSGIC_FSGTimedThumpCommandImpl OutTimedThumpCommandImplContainer;
     FSGIC_FSGThumperCommandImpl BaseCommandContainer{BaseCommand->ToThumperCommandImpl()};
@@ -157,12 +142,7 @@ USGTimedThumpCommand::USGTimedThumpCommand(const USGThumperCommand* BaseCommand,
 }
 
 USGTimedThumpCommand::USGTimedThumpCommand(const FSGTimedThumpCommandImpl& TimedThumpCommandImpl)
-    :
-#if ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 )
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
-#else
-    Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}))
-#endif  /* ENGINE_MAJOR_VERSION == 5 || ( ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 24 ) */
+    : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
     SetTimedThumpCommandImpl(TimedThumpCommandImpl);
 }
diff --git a/Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs b/Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs
index 16ca97ae..9b4157cf 100644
--- a/Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs
+++ b/Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs
@@ -87,7 +87,6 @@ public class SenseGloveCoreImpl : ModuleRules
             List<string> Architectures = ToolChain.GetAllArchitectures();
 
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "android"));
-
 #if UE_5_1_OR_LATER
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "r25b"));
 #elif UE_4_27_OR_LATER
@@ -141,18 +140,8 @@ public class SenseGloveCoreImpl : ModuleRules
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v20"));
 #elif UE_4_27_OR_LATER
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v19"));
-#elif UE_4_26_OR_LATER
-            LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v17"));
-#elif UE_4_25_OR_LATER
-            LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v16"));
-#elif UE_4_24_OR_LATER
-            LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v15"));
-#elif UE_4_23_OR_LATER
-            LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v15"));
-#elif UE_4_22_OR_LATER
-            LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v13"));
 #else
-            Debug.Assert(false, "Unsupported compiler!");
+            Debug.Assert(false, "Unsupported engine version or compiler!");
 #endif
         }
         else if (Target.Platform == UnrealTargetPlatform.Win64)
@@ -164,19 +153,17 @@ public class SenseGloveCoreImpl : ModuleRules
                 case WindowsCompiler.VisualStudio2022:
                     LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc143"));
                     break;
-#endif
-#if UE_4_22_OR_LATER
                 case WindowsCompiler.VisualStudio2019:
                     LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc142"));
                     break;
 #endif
-#if ! UE_5_0_OR_LATER && UE_4_17_OR_LATER
+#if ! UE_5_0_OR_LATER && UE_4_27_OR_LATER
                 case WindowsCompiler.VisualStudio2017:
                     LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc141"));
                     break;
 #endif
                 default:
-                    Debug.Assert(false, "Unsupported compiler!");
+                    Debug.Assert(false, "Unsupported engine version or compiler!");
                     break;
             }
             LibraryName = string.Format("{0}.lib", LibraryName);