Refactoring.

Remove useless elements and fix missing links.