Re-arranged unused aliases.
Removed commented aliases.