Remove unused aliases
Remove unused aliases and add aliases to utilities