Revert "Version of calculator for show"

This reverts commit 22f39ad9376bd555197e44384cd6392abd74b5bf.