Excise some old code, restore math tests to proper state