removed no Calc cases