diff --git a/src/libimcv/plugins/imv_attestation/imv_attestation_state.h b/src/libimcv/plugins/imv_attestation/imv_attestation_state.h
index b76598c3a..2e83e8216 100644
--- a/src/libimcv/plugins/imv_attestation/imv_attestation_state.h
+++ b/src/libimcv/plugins/imv_attestation/imv_attestation_state.h
@@ -34,15 +34,10 @@ typedef enum imv_attestation_handshake_state_t imv_attestation_handshake_state_t
  */
 enum imv_attestation_handshake_state_t {
 	IMV_ATTESTATION_STATE_INIT,
-	IMV_ATTESTATION_STATE_PROTO_CAPS,
-	IMV_ATTESTATION_STATE_MEAS_ALGO,
-	IMV_ATTESTATION_STATE_TPM_INFO,
-	IMV_ATTESTATION_STATE_AIK,
-	IMV_ATTESTATION_STATE_SIMPLE_COMP_EVID,
-	IMV_ATTESTATION_STATE_SIMPLE_EVID_FINAL,
-	IMV_ATTESTATION_STATE_FILE_METADATA,
-	IMV_ATTESTATION_STATE_FILE_MEAS,
+	IMV_ATTESTATION_STATE_MEAS,
+	IMV_ATTESTATION_STATE_COMP_EVID,
 	IMV_ATTESTATION_STATE_IML,
+	IMV_ATTESTATION_STATE_END,
 };
 
 /**