Remove Calculator and rename CalculatorProxy