Revert "Calculator RAW version"

This reverts commit bccaceeba33fa2fcb3728759042b578a336c5e09.