diff --git a/core/build.gradle b/core/build.gradle
index 1f7fd85ea..55088f83b 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -404,6 +404,7 @@ task jaxbToJava {
         }
       }
     }
+    execInBash('find . -name *.java -exec sed -i /\\<p\\>\\$/d {} +', outputDir)
   }
 }