Delete all encapsulation traces.

It fixing some bugs but not all. I'm still working at them. In this week
I will have A LOT OF time to do that. Look careful for new commits.