Calc classes

Why was this removed?