Remove computation

Removed a lot of code for computations.
There is still a lot of work to do.