diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index fa213c67d3c483afadd728b42deb633726008ac6..b593d4393bff82a69edb1d7a43b77512d065e29e 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -402,16 +402,16 @@ bool Foam::KinematicParcel<ParcelType>::hitPatch
         td.keepParticle
     );
 
-    // Invoke surface film model
-    if (td.cloud().surfaceFilm().transferParcel(p, pp, td.keepParticle))
+    if (isA<processorPolyPatch>(pp))
     {
-        // All interactions done
-        return true;
+        // Skip processor patches
+        return false;
     }
-    else if (pp.coupled())
+    else if (td.cloud().surfaceFilm().transferParcel(p, pp, td.keepParticle))
     {
-        // Don't apply the patchInteraction models to coupled boundaries
-        return false;
+        // Surface film model consumes the interaction, i.e. all
+        // interactions done
+        return true;
     }
     else
     {
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionDataList.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionDataList.C
index 4ee514d8c4894314c6004837d4a4cbb7f6434a4b..9033ab2b8929a784c9e2bfdce4fc2e2b2d794d5b 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionDataList.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionDataList.C
@@ -26,7 +26,6 @@ License
 #include "patchInteractionDataList.H"
 #include "stringListOps.H"
 #include "emptyPolyPatch.H"
-#include "cyclicAMIPolyPatch.H"
 
 // * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * * //