Revert CM Calculator

This reverts commit 30a7b13212781750ea1eb5612ed29f6d5c5bc87a.