diff --git a/legacy-caching-rest-client/pom.xml b/legacy-caching-rest-client/pom.xml
index b46a28a5..2341544c 100644
--- a/legacy-caching-rest-client/pom.xml
+++ b/legacy-caching-rest-client/pom.xml
@@ -91,11 +91,6 @@
 
     <dependencies>
         <!-- Internal -->
-        <dependency>
-            <groupId>fi.vm.sade.java-utils</groupId>
-            <artifactId>opintopolku-healthcheck-api</artifactId>
-            <version>0.3.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>fi.vm.sade.java-utils</groupId>
             <artifactId>java-legacy-cas</artifactId>
diff --git a/legacy-caching-rest-client/src/main/java/fi/vm/sade/javautils/legacy_caching_rest_client/CachingRestClient.java b/legacy-caching-rest-client/src/main/java/fi/vm/sade/javautils/legacy_caching_rest_client/CachingRestClient.java
index 421f01e7..348b224b 100644
--- a/legacy-caching-rest-client/src/main/java/fi/vm/sade/javautils/legacy_caching_rest_client/CachingRestClient.java
+++ b/legacy-caching-rest-client/src/main/java/fi/vm/sade/javautils/legacy_caching_rest_client/CachingRestClient.java
@@ -15,7 +15,6 @@
 
 import fi.vm.sade.javautils.cas.CasClient;
 import fi.vm.sade.javautils.legacy_cxf_cas.PERA;
-import fi.vm.sade.javautils.healthcheck.HealthChecker;
 import fi.vm.sade.javautils.legacy_cxf_cas.ui.portlet.security.ProxyAuthenticator;
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.io.IOUtils;
diff --git a/legacy-caching-rest-client/src/main/java/fi/vm/sade/javautils/legacy_caching_rest_client/HealthChecker.java b/legacy-caching-rest-client/src/main/java/fi/vm/sade/javautils/legacy_caching_rest_client/HealthChecker.java
new file mode 100644
index 00000000..c4a04fac
--- /dev/null
+++ b/legacy-caching-rest-client/src/main/java/fi/vm/sade/javautils/legacy_caching_rest_client/HealthChecker.java
@@ -0,0 +1,37 @@
+package fi.vm.sade.javautils.legacy_caching_rest_client;
+
+/**
+ * Healthcheckiin kuuluva tarkastaja, jonka roolina on tarkastaa yksi kohde healthcheckin yhteydessä.
+ * SpringAwareHealthCheckServlet kutsuu spring application contextista löytyviä tämän HealthChecker -interfacen toteuttavia beaneja.
+ * checkHealth -metodin palauttama objekti serialisoidaan JSON:ksi, ja liitetään healthcheckin checks -osioon kentäksi [beanName].
+ * Mikäli tarkastuksessa on virhe, checkHealth -metodin tulee heittää sitä poikkeus (jonka message kuvaa virhetilannetta).
+ * Tällöin poikkeuksen message liitetään healthcheck tulokseen, ja koko healthcheckin tila on ERREOR.
+ *
+ * Esim:
+ *
+ *  @Component("solrIndexed")
+ *  public class SolrIndexedCheck implements HealthChecker {
+ *      Object checkHealth() throws Throwable {
+ *          // tarkastetaan tässä onko solr indeksoitu
+ *          return new LinkedHashMap(){{ put("status", "OK"); put("previouslyIndexed", timestamp); }}
+ *      }
+ *  }
+ *
+ *  ...johtaa tällaiseen healthcheck tulokseen...
+ *
+ *  {
+ *      "status": "OK",
+ *      "checks": {
+ *          "solrIndexed": {"status": "OK", "timestamp": [timestamp]}
+ *      }
+ *  }
+ *
+ * @see SpringAwareHealthCheckServlet (in other module)
+ */
+public interface HealthChecker {
+    /**
+     * @return something json-serializable that describes the state of this checker
+     * @throws Throwable if there is health check error
+     */
+    Object checkHealth() throws Throwable;
+}
diff --git a/legacy-cxf-cas/pom.xml b/legacy-cxf-cas/pom.xml
index fdf4f95b..86b59a73 100644
--- a/legacy-cxf-cas/pom.xml
+++ b/legacy-cxf-cas/pom.xml
@@ -15,11 +15,6 @@
     <dependencyManagement>
         <dependencies>
             <!-- Internal -->
-            <dependency>
-                <groupId>fi.vm.sade.java-utils</groupId>
-                <artifactId>opintopolku-healthcheck-api</artifactId>
-                <version>0.3.0-SNAPSHOT</version>
-            </dependency>
             <dependency>
                 <groupId>fi.vm.sade.java-utils</groupId>
                 <artifactId>java-legacy-cas</artifactId>
@@ -76,10 +71,6 @@
 
     <dependencies>
         <!-- Internal -->
-        <dependency>
-            <groupId>fi.vm.sade.java-utils</groupId>
-            <artifactId>opintopolku-healthcheck-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>fi.vm.sade.java-utils</groupId>
             <artifactId>java-legacy-cas</artifactId>
diff --git a/opintopolku-healthcheck-api/pom.xml b/opintopolku-healthcheck-api/pom.xml
deleted file mode 100644
index c86e13ef..00000000
--- a/opintopolku-healthcheck-api/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>fi.vm.sade.java-utils</groupId>
-        <artifactId>java-utils</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-
-    <artifactId>opintopolku-healthcheck-api</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-</project>
diff --git a/pom.xml b/pom.xml
index a30fdbbd..fcdd0249 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,6 @@
     <version>0.3.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <modules>
-        <module>opintopolku-healthcheck-api</module>
         <module>java-properties</module>
         <module>oid-generator</module>
         <module>tcp-utils</module>
diff --git a/spring-aware-health-check-servlet/pom.xml b/spring-aware-health-check-servlet/pom.xml
index d79c4bfe..e5956ed4 100644
--- a/spring-aware-health-check-servlet/pom.xml
+++ b/spring-aware-health-check-servlet/pom.xml
@@ -8,7 +8,7 @@
     <relativePath>..</relativePath>
   </parent>
   <artifactId>spring-aware-health-check-servlet</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.5.1-SNAPSHOT</version>
   <packaging>jar</packaging>
   <dependencyManagement>
     <dependencies>
@@ -73,11 +73,6 @@
         <artifactId>legacy-caching-rest-client</artifactId>
         <version>0.6.0-SNAPSHOT</version>
       </dependency>
-      <dependency>
-        <groupId>fi.vm.sade.java-utils</groupId>
-        <artifactId>opintopolku-healthcheck-api</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
-      </dependency>
       <dependency>
         <groupId>fi.vm.sade.java-utils</groupId>
         <artifactId>java-cache</artifactId>
@@ -137,10 +132,6 @@
       <groupId>fi.vm.sade.java-utils</groupId>
       <artifactId>legacy-caching-rest-client</artifactId>
     </dependency>
-    <dependency>
-      <groupId>fi.vm.sade.java-utils</groupId>
-      <artifactId>opintopolku-healthcheck-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>fi.vm.sade.java-utils</groupId>
       <artifactId>java-cache</artifactId>
diff --git a/opintopolku-healthcheck-api/src/main/java/fi/vm/sade/javautils/healthcheck/HealthChecker.java b/spring-aware-health-check-servlet/src/main/java/fi/vm/sade/javautils/healthcheck/HealthChecker.java
similarity index 100%
rename from opintopolku-healthcheck-api/src/main/java/fi/vm/sade/javautils/healthcheck/HealthChecker.java
rename to spring-aware-health-check-servlet/src/main/java/fi/vm/sade/javautils/healthcheck/HealthChecker.java
diff --git a/spring-aware-health-check-servlet/src/main/java/fi/vm/sade/javautils/healthcheck/SpringAwareHealthCheckServlet.java b/spring-aware-health-check-servlet/src/main/java/fi/vm/sade/javautils/healthcheck/SpringAwareHealthCheckServlet.java
index 08ca169e..a5c17be7 100644
--- a/spring-aware-health-check-servlet/src/main/java/fi/vm/sade/javautils/healthcheck/SpringAwareHealthCheckServlet.java
+++ b/spring-aware-health-check-servlet/src/main/java/fi/vm/sade/javautils/healthcheck/SpringAwareHealthCheckServlet.java
@@ -2,7 +2,6 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import fi.vm.sade.javautils.healthcheck.HealthChecker;
 import fi.vm.sade.security.SimpleCache;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;