Fix the horrible redirects
Remove these aliases