Revert "Added new expression calculator ExpCalculator."

This reverts commit 38dae86c9cf237bd2cdf016bff3a01edc49e9ad9.