Removed some unnecessary aliases