Revert "More adjustments for math support & testing"

This reverts commit f9f692d43ce15181a5f3509805c5f875ed298664.