I would say, stop concentrating on calculation, and teach math. However, calculation is often a useful way to ensure you understand something. So, calculation will likely still be a part of learning math, but it shouldn't be the focus.