Remove over-engineered code
Calc configuration and bindings