TipCalc cleanup - Touch will be broken