Removed unused aliases
Removed unused code