Removed dynamic math classes and changed default ctors