Re-work of math classes, removal of a lot