diff --git a/history/taskana-simplehistory-rest-spring-example/pom.xml b/history/taskana-simplehistory-rest-spring-example/pom.xml
index e5c72a948..72243aba4 100644
--- a/history/taskana-simplehistory-rest-spring-example/pom.xml
+++ b/history/taskana-simplehistory-rest-spring-example/pom.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xmlns="http://maven.apache.org/POM/4.0.0"
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>taskana-simplehistory-rest-spring-example</artifactId>
+
 	<name>${project.groupId}:${project.artifactId}</name>
 	<description>Demo project for taskana-simplehistory-rest-spring</description>
 
@@ -13,18 +14,12 @@
 		<version>1.1.5-SNAPSHOT</version>
 	</parent>
 
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
-	</properties>
-
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-dependencies</artifactId>
-				<version>${spring.boot.version}</version>
+				<version>${version.spring.boot}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -52,9 +47,10 @@
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
+			<version>${version.h2}</version>
 		</dependency>
-		<!-- Tests -->
 
+		<!-- Tests -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
@@ -72,12 +68,9 @@
 
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
+				<version>${version.maven.resources}</version>
 				<executions>
 					<execution>
 						<id>copy-documentation-to-static-folder</id>
diff --git a/qa/checkstyle/checkstyle.xml b/qa/checkstyle/checkstyle.xml
index b8a824ba8..d5041db43 100644
--- a/qa/checkstyle/checkstyle.xml
+++ b/qa/checkstyle/checkstyle.xml
@@ -121,7 +121,6 @@
 		<!-- Miscellaneous other checks.                   -->
 		<!-- See http://checkstyle.sf.net/config_misc.html -->
 		<module name="ArrayTypeStyle"/>
-		<module name="TodoComment"/>
 		<module name="UpperEll"/>
 
 	</module>
diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/AbstractPagingController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/AbstractPagingController.java
index 9e8a582cd..93e309468 100644
--- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/AbstractPagingController.java
+++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/AbstractPagingController.java
@@ -77,7 +77,7 @@ public abstract class AbstractPagingController {
     }
 
     // This method is deprecated please remove it after updating taskana-simple-history reference to it.
-    @Deprecated
+    //TODO: @Deprecated
     protected PageMetadata initPageMetadata(String pagesizeParam, String pageParam, long totalElements)
         throws InvalidArgumentException {
         long pageSize;
diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AbstractRessourcesAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AbstractRessourcesAssembler.java
index 52c8869ca..ee86012b6 100644
--- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AbstractRessourcesAssembler.java
+++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AbstractRessourcesAssembler.java
@@ -14,7 +14,7 @@ import org.springframework.web.util.UriComponentsBuilder;
  * Abstract resources assembler for taskana REST controller with pageable resources. This method is deprecated, it can
  * be removed after fixing taskana-simple-history references
  */
-@Deprecated
+//TODO: @Deprecated
 public abstract class AbstractRessourcesAssembler {
 
     UriComponentsBuilder original = getBuilderForOriginalUri();