Remove all unwanted aliases and add comments