Revert "Track CM Calculator"

This reverts commit eced9263ad89b711d1162f9d52dbceb507ecda07.