Revert "Progress in ID stage"

This reverts commit f6dffb86dbd9d95cc4cc9d955707f0a005c88a0b.