This is going to be the final patch.

- Only code nobody else is using is touched.
- I have to learn more about git to transform this in only two commit.