bring back calculator and remove algorithm until Algorithm fix

Change-Id: I3d701f58f7b06bf14a89934512824814f1fc8d8d