diff --git a/libfprint/fp-image-device.c b/libfprint/fp-image-device.c
index 519ad754..ac88ffd9 100644
--- a/libfprint/fp-image-device.c
+++ b/libfprint/fp-image-device.c
@@ -89,7 +89,6 @@ fp_image_device_cancel_action (FpDevice *device)
   /* We can only cancel capture operations, in that case, deactivate and return
    * an error immediately. */
   if (action == FPI_DEVICE_ACTION_ENROLL ||
-      action == FPI_DEVICE_ACTION_VERIFY ||
       action == FPI_DEVICE_ACTION_IDENTIFY ||
       action == FPI_DEVICE_ACTION_CAPTURE)
     fpi_image_device_deactivate (self, TRUE);
@@ -217,7 +216,6 @@ fp_image_device_class_init (FpImageDeviceClass *klass)
   fp_device_class->open = fp_image_device_open;
   fp_device_class->close = fp_image_device_close;
   fp_device_class->enroll = fp_image_device_start_capture_action;
-  fp_device_class->verify = fp_image_device_start_capture_action;
   fp_device_class->identify = fp_image_device_start_capture_action;
   fp_device_class->capture = fp_image_device_start_capture_action;
 
diff --git a/libfprint/fpi-image-device.c b/libfprint/fpi-image-device.c
index 8184d3a6..011c0095 100644
--- a/libfprint/fpi-image-device.c
+++ b/libfprint/fpi-image-device.c
@@ -214,10 +214,6 @@ fp_image_device_maybe_complete_action (FpImageDevice *self, GError *error)
 
       fpi_device_enroll_complete (device, g_object_ref (enroll_print), NULL);
     }
-  else if (action == FPI_DEVICE_ACTION_VERIFY)
-    {
-      fpi_device_verify_complete (device, NULL);
-    }
   else if (action == FPI_DEVICE_ACTION_IDENTIFY)
     {
       fpi_device_identify_complete (device, NULL);
@@ -316,22 +312,6 @@ fpi_image_device_minutiae_detected (GObject *source_object, GAsyncResult *res, g
           fp_image_device_enroll_maybe_await_finger_on (FP_IMAGE_DEVICE (device));
         }
     }
-  else if (action == FPI_DEVICE_ACTION_VERIFY)
-    {
-      FpPrint *template;
-      FpiMatchResult result;
-
-      fpi_device_get_verify_data (device, &template);
-      if (print)
-        result = fpi_print_bz3_match (template, print, priv->bz3_threshold, &error);
-      else
-        result = FPI_MATCH_ERROR;
-
-      if (!error || error->domain == FP_DEVICE_RETRY)
-        fpi_device_verify_report (device, result, g_steal_pointer (&print), g_steal_pointer (&error));
-
-      fp_image_device_maybe_complete_action (self, g_steal_pointer (&error));
-    }
   else if (action == FPI_DEVICE_ACTION_IDENTIFY)
     {
       gint i;
@@ -486,7 +466,6 @@ fpi_image_device_image_captured (FpImageDevice *self, FpImage *image)
   g_return_if_fail (image != NULL);
   g_return_if_fail (priv->state == FPI_IMAGE_DEVICE_STATE_CAPTURE);
   g_return_if_fail (action == FPI_DEVICE_ACTION_ENROLL ||
-                    action == FPI_DEVICE_ACTION_VERIFY ||
                     action == FPI_DEVICE_ACTION_IDENTIFY ||
                     action == FPI_DEVICE_ACTION_CAPTURE);
 
@@ -527,7 +506,6 @@ fpi_image_device_retry_scan (FpImageDevice *self, FpDeviceRetry retry)
    * all but INACTIVE */
   g_return_if_fail (priv->state != FPI_IMAGE_DEVICE_STATE_INACTIVE);
   g_return_if_fail (action == FPI_DEVICE_ACTION_ENROLL ||
-                    action == FPI_DEVICE_ACTION_VERIFY ||
                     action == FPI_DEVICE_ACTION_IDENTIFY ||
                     action == FPI_DEVICE_ACTION_CAPTURE);
 
@@ -540,13 +518,6 @@ fpi_image_device_retry_scan (FpImageDevice *self, FpDeviceRetry retry)
 
       fp_image_device_change_state (self, FPI_IMAGE_DEVICE_STATE_AWAIT_FINGER_OFF);
     }
-  else if (action == FPI_DEVICE_ACTION_VERIFY)
-    {
-      fpi_device_verify_report (FP_DEVICE (self), FPI_MATCH_ERROR, NULL, error);
-      fp_image_device_maybe_complete_action (self, NULL);
-      fpi_image_device_deactivate (self, TRUE);
-
-    }
   else if (action == FPI_DEVICE_ACTION_IDENTIFY)
     {
       fpi_device_identify_report (FP_DEVICE (self), NULL, NULL, error);
@@ -639,7 +610,6 @@ fpi_image_device_activate_complete (FpImageDevice *self, GError *error)
   g_return_if_fail (priv->active == FALSE);
   g_return_if_fail (priv->state == FPI_IMAGE_DEVICE_STATE_ACTIVATING);
   g_return_if_fail (action == FPI_DEVICE_ACTION_ENROLL ||
-                    action == FPI_DEVICE_ACTION_VERIFY ||
                     action == FPI_DEVICE_ACTION_IDENTIFY ||
                     action == FPI_DEVICE_ACTION_CAPTURE);