Remove calculator, doesn't work correctly