Remove unnecessary aliases.
Merge pull request #3000 from bar/3.0-aliases

Remove unnecessary aliases.