diff --git a/dhp-common/pom.xml b/dhp-common/pom.xml
index 6198bd81e..fdfc05a33 100644
--- a/dhp-common/pom.xml
+++ b/dhp-common/pom.xml
@@ -168,6 +168,14 @@
 			<groupId>com.opencsv</groupId>
 			<artifactId>opencsv</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.18.24</version>
+			<optional>true</optional>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 </project>
diff --git a/pom.xml b/pom.xml
index 892382b9d..3d9a1e21a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -706,6 +706,7 @@
 						</dependency>
 					</dependencies>
 				</plugin>
+				<!--
 				<plugin>
 					<groupId>org.antipathy</groupId>
 					<artifactId>mvn-scalafmt_${scala.binary.version}</artifactId>
@@ -718,6 +719,7 @@
 						</dependency>
 					</dependencies>
 				</plugin>
+				-->
 			</plugins>
 		</pluginManagement>
 		<plugins>
@@ -743,26 +745,27 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>net.revelc.code</groupId>
-				<artifactId>impsort-maven-plugin</artifactId>
-				<version>1.4.1</version>
-				<configuration>
-					<groups>java.,javax.,org.,com.</groups>
-					<staticGroups>java,*</staticGroups>
-					<excludes>
-						<exclude>**/thrift/*.java</exclude>
-					</excludes>
-				</configuration>
-				<executions>
-					<execution>
-						<id>sort-imports</id>
-						<goals>
-							<goal>sort</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
+<!--			<plugin>-->
+<!--				<groupId>net.revelc.code</groupId>-->
+<!--				<artifactId>impsort-maven-plugin</artifactId>-->
+<!--				<version>1.4.1</version>-->
+<!--				<configuration>-->
+<!--					<groups>java.,javax.,org.,com.</groups>-->
+<!--					<staticGroups>java,*</staticGroups>-->
+<!--					<excludes>-->
+<!--						<exclude>**/thrift/*.java</exclude>-->
+<!--					</excludes>-->
+<!--				</configuration>-->
+<!--				<executions>-->
+<!--					<execution>-->
+<!--						<id>sort-imports</id>-->
+<!--						<goals>-->
+<!--							<goal>sort</goal>-->
+<!--						</goals>-->
+<!--					</execution>-->
+<!--				</executions>-->
+<!--			</plugin>-->
+			<!--
 			<plugin>
 				<groupId>org.antipathy</groupId>
 				<artifactId>mvn-scalafmt_${scala.binary.version}</artifactId>
@@ -778,7 +781,7 @@
 					</testSourceDirectories>
 					<validateOnly>false</validateOnly>
 					<onlyChangedFiles>false</onlyChangedFiles>
-					<branch>: git rev-parse --abbrev-ref HEAD</branch>
+					<branch>: git rev-parse -abbrev-ref HEAD</branch> (if reenable, add another - before -abbrev-ref
 					<useSpecifiedRepositories>false</useSpecifiedRepositories>
 				</configuration>
 				<executions>
@@ -790,6 +793,7 @@
 					</execution>
 				</executions>
 			</plugin>
+			-->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-release-plugin</artifactId>