Remove useless code.
Improve new syntax for alternative formulas and add test.