Refactored and removed unused aliases