diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ProvisioningOperation.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ProvisioningOperation.java
index d1a8061797d..b21c3307dc3 100644
--- a/infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ProvisioningOperation.java
+++ b/infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ProvisioningOperation.java
@@ -12,7 +12,7 @@
 import java.util.Arrays;
 
 /**
- *
+ * TODO reconsider usefulness of this class
  */
 public enum ProvisioningOperation {
 
@@ -38,4 +38,8 @@ public static ProvisioningOperation find(String name) {
                 .findFirst()
                 .orElse(null);
     }
+
+    public String getName() {
+        return name;
+    }
 }
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ProvisioningStatistics.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ProvisioningStatistics.java
index 42027797919..0f95d2c3577 100644
--- a/infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ProvisioningStatistics.java
+++ b/infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ProvisioningStatistics.java
@@ -70,7 +70,7 @@ public synchronized void recordProvisioningOperation(String resourceOid, String
                 .resourceRef(resourceRef)
                 .objectClass(objectClassName)
                 .beginOperation()
-                .operation(operation.name())
+                .operation(operation.getName())
                    .status(success ? OperationResultStatusType.SUCCESS : OperationResultStatusType.FATAL_ERROR)
                     .count(count)
                     .totalTime(duration)
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ProvisioningStatisticsData.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ProvisioningStatisticsData.java
deleted file mode 100644
index 04381173d67..00000000000
--- a/infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ProvisioningStatisticsData.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2010-2015 Evolveum and contributors
- *
- * This work is dual-licensed under the Apache License 2.0
- * and European Union Public License. See LICENSE file for details.
- */
-
-package com.evolveum.midpoint.schema.statistics;
-
-/**
- * @author Pavol Mederly
- */
-public class ProvisioningStatisticsData extends GenericStatisticsData {
-
-    //private Deque<ObjectProcessed> lastObjectsProcessed;
-
-//    public static class ObjectProcessed {
-//        private Date timestamp;
-//        private String name;
-//    }
-
-}
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ProvisioningStatisticsKey.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ProvisioningStatisticsKey.java
deleted file mode 100644
index 9a051e10c53..00000000000
--- a/infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ProvisioningStatisticsKey.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2010-2015 Evolveum and contributors
- *
- * This work is dual-licensed under the Apache License 2.0
- * and European Union Public License. See LICENSE file for details.
- */
-
-package com.evolveum.midpoint.schema.statistics;
-
-import javax.xml.namespace.QName;
-
-/**
- * @author Pavol Mederly
- */
-public class ProvisioningStatisticsKey {
-
-    private String resourceOid;
-    private String resourceName;        // TODO normalize
-    private QName objectClass;
-    private ProvisioningOperation operation;
-    private ProvisioningStatusType statusType;
-
-    public ProvisioningStatisticsKey(String resourceOid, String resourceName, QName objectClass, ProvisioningOperation operation, boolean success) {
-        this.resourceOid = resourceOid;
-        this.resourceName = resourceName;
-        this.objectClass = objectClass;
-        this.operation = operation;
-        this.statusType = success ? ProvisioningStatusType.SUCCESS : ProvisioningStatusType.FAILURE;
-    }
-
-    public String getResourceOid() {
-        return resourceOid;
-    }
-
-    public String getResourceName() {
-        return resourceName;
-    }
-
-    public QName getObjectClass() {
-        return objectClass;
-    }
-
-    public ProvisioningOperation getOperation() {
-        return operation;
-    }
-
-    public ProvisioningStatusType getStatusType() {
-        return statusType;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        ProvisioningStatisticsKey that = (ProvisioningStatisticsKey) o;
-
-        if (resourceOid != null ? !resourceOid.equals(that.resourceOid) : that.resourceOid != null) return false;
-        if (resourceName != null ? !resourceName.equals(that.resourceName) : that.resourceName != null) return false;
-        if (objectClass != null ? !objectClass.equals(that.objectClass) : that.objectClass != null) return false;
-        if (operation != that.operation) return false;
-        return statusType == that.statusType;
-
-    }
-
-    @Override
-    public int hashCode() {
-        int result = resourceOid != null ? resourceOid.hashCode() : 0;
-        result = 31 * result + (resourceName != null ? resourceName.hashCode() : 0);
-        result = 31 * result + (objectClass != null ? objectClass.hashCode() : 0);
-        result = 31 * result + (operation != null ? operation.hashCode() : 0);
-        result = 31 * result + (statusType != null ? statusType.hashCode() : 0);
-        return result;
-    }
-}
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/StatisticsCollector.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/StatisticsCollector.java
index cb42b89925f..71a2e90856c 100644
--- a/infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/StatisticsCollector.java
+++ b/infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/StatisticsCollector.java
@@ -36,7 +36,8 @@ public interface StatisticsCollector {
 
     void recordState(String message);
 
-    void recordProvisioningOperation(String resourceOid, String resourceName, QName objectClassName, ProvisioningOperation operation, boolean success, int count, long duration);
+    void recordProvisioningOperation(String resourceOid, String resourceName, QName objectClassName,
+            ProvisioningOperation operation, boolean success, int count, long duration);
 
     void recordNotificationOperation(String transportName, boolean success, long duration);
 
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
index 9728e868fba..9b2013fcf1f 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
@@ -166,7 +166,7 @@ public void test110AddDummyGreenAccountMancomb() throws Exception {
             assertThat(provisioningStatistics.getEntry()).hasSize(1);
             assertThat(provisioningStatistics.getEntry().get(0).getResourceRef().getOid()).isEqualTo(RESOURCE_DUMMY_GREEN_OID);
             assertThat(getOrig(provisioningStatistics.getEntry().get(0).getResourceRef().getTargetName())).isEqualTo("Dummy Resource Green");
-            assertThat(provisioningStatistics.getEntry().get(0).getOperation()).hasSize(2); // get + search
+            assertThat(provisioningStatistics.getEntry().get(0).getOperation()).isNotEmpty(); // search and sometimes get
         }
 
         // notifications
diff --git a/repo/task-api/src/main/java/com/evolveum/midpoint/task/api/StateReporter.java b/repo/task-api/src/main/java/com/evolveum/midpoint/task/api/StateReporter.java
index 56f71a35b03..2df27af4014 100644
--- a/repo/task-api/src/main/java/com/evolveum/midpoint/task/api/StateReporter.java
+++ b/repo/task-api/src/main/java/com/evolveum/midpoint/task/api/StateReporter.java
@@ -161,7 +161,8 @@ public void recordIcfOperationEnd(ProvisioningOperation operation, ObjectClassCo
     }
 
     private void reportNoTask(String resourceOid, ProvisioningOperation operation) {
-        LOGGER.warn("Couldn't report execution of ICF operation {} on resource {} because there is no task assigned.", operation, resourceOid);
+        LOGGER.warn("Couldn't report execution of ICF operation {} on resource {} because there is no task assigned.",
+                operation, resourceOid);
     }
 
     private void recordState(String message) {
diff --git a/repo/task-api/src/main/java/com/evolveum/midpoint/task/api/test/NullTaskImpl.java b/repo/task-api/src/main/java/com/evolveum/midpoint/task/api/test/NullTaskImpl.java
index c89861a78c2..67242404237 100644
--- a/repo/task-api/src/main/java/com/evolveum/midpoint/task/api/test/NullTaskImpl.java
+++ b/repo/task-api/src/main/java/com/evolveum/midpoint/task/api/test/NullTaskImpl.java
@@ -544,7 +544,8 @@ public void recordState(String message) {
     }
 
     @Override
-    public void recordProvisioningOperation(String resourceOid, String resourceName, QName objectClassName, ProvisioningOperation operation, boolean success, int count, long duration) {
+    public void recordProvisioningOperation(String resourceOid, String resourceName, QName objectClassName,
+            ProvisioningOperation operation, boolean success, int count, long duration) {
     }
 
     @Override