Revert "New Calculator Features"

This reverts commit 97fd6d59585971329ed9a36ef2978712f4bc0018.