Revert "Calculator"

This reverts commit b57772ba4f7817cd3385c64981a1a9291930fb72.