Revert "Measurement logic"

This reverts commit 6ee5276054eac9464d344f0b54312ae1a7a3aa33.