Revert "New Calculator"

This reverts commit 7ddbf6051a78a0f7041061b8939947ef7fc9c0d3.