Revert "Calculator"

This reverts commit ec22d5d55d0fa8ca39f318e27e1ab8e77d20227f.