remove Calculator for change

Change-Id: I49506f03de1594c5206a734627061b984823ac92