Remove CalculatorData
Calculator now works perfectly!